From d6765904a19baa6f3ca73731aac1dec853e95065 Mon Sep 17 00:00:00 2001 From: BONNEVILLE Geoffroy Date: Tue, 24 Jul 2018 16:26:58 +0200 Subject: [PATCH] Slider control now uses Accent Color ComboBox enter key now uses Accent Color Some code cleanup Updated release notes --- ModernKeePass/ModernKeePass.App.csproj | 1 + .../ResourceDictionaries/Globals.xaml | 4 +- .../ListViewLeftIndicatorStyle.xaml | 8 +- .../ResourceDictionaries/Styles.xaml | 813 +++++++++++++++++- .../Services/SingletonServiceBase.cs | 2 - .../Views/BasePages/LayoutAwarePageBase.cs | 4 +- ModernKeePass/Views/EntryDetailPage.xaml | 6 +- .../SettingsDatabasePage.xaml | 6 +- .../SettingsNewDatabasePage.xaml | 2 +- .../UserControls/ColorPickerUserControl.xaml | 2 +- .../UserControls/CompositeKeyUserControl.xaml | 2 +- .../UserControls/SymbolPickerUserControl.xaml | 2 +- .../en-us/baselisting/releaseNotes.txt | 3 +- .../fr-fr/baselisting/releaseNotes.txt | 3 +- 14 files changed, 800 insertions(+), 58 deletions(-) diff --git a/ModernKeePass/ModernKeePass.App.csproj b/ModernKeePass/ModernKeePass.App.csproj index 163b6c1..28a1fc5 100644 --- a/ModernKeePass/ModernKeePass.App.csproj +++ b/ModernKeePass/ModernKeePass.App.csproj @@ -29,6 +29,7 @@ DEBUG;TRACE;NETFX_CORE;WINDOWS_APP prompt 4 + true AnyCPU diff --git a/ModernKeePass/ResourceDictionaries/Globals.xaml b/ModernKeePass/ResourceDictionaries/Globals.xaml index cdf69bb..19aa3b0 100644 --- a/ModernKeePass/ResourceDictionaries/Globals.xaml +++ b/ModernKeePass/ResourceDictionaries/Globals.xaml @@ -3,6 +3,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> 60 60 - - + + diff --git a/ModernKeePass/ResourceDictionaries/ListViewLeftIndicatorStyle.xaml b/ModernKeePass/ResourceDictionaries/ListViewLeftIndicatorStyle.xaml index c55cb40..dc2e1e1 100644 --- a/ModernKeePass/ResourceDictionaries/ListViewLeftIndicatorStyle.xaml +++ b/ModernKeePass/ResourceDictionaries/ListViewLeftIndicatorStyle.xaml @@ -191,7 +191,7 @@ To="1" /> - + @@ -358,13 +358,13 @@ - + diff --git a/ModernKeePass/ResourceDictionaries/Styles.xaml b/ModernKeePass/ResourceDictionaries/Styles.xaml index 64532a5..ff40132 100644 --- a/ModernKeePass/ResourceDictionaries/Styles.xaml +++ b/ModernKeePass/ResourceDictionaries/Styles.xaml @@ -30,8 +30,8 @@ - + Storyboard.TargetProperty="Foreground"> + @@ -143,7 +143,7 @@ - + @@ -175,7 +175,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -260,7 +260,7 @@ - + @@ -329,13 +329,11 @@ + Margin="{TemplateBinding BorderThickness}" /> + BorderThickness="{TemplateBinding BorderThickness}" /> + Fill="{StaticResource MainColor}" /> - + @@ -592,7 +590,7 @@ Height="{ThemeResource SearchBoxResultSuggestionImageThemeHeight}" Margin="{ThemeResource SearchBoxSuggestionSubcomponentThemeMargin}"/> - + @@ -676,7 +674,7 @@ - + @@ -868,7 +866,7 @@ HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" AutomationProperties.AccessibilityView="Raw" /> - @@ -961,11 +959,11 @@ - + - + @@ -985,7 +983,7 @@ Duration="0" /> - + @@ -996,11 +994,11 @@ - + - + @@ -1008,11 +1006,11 @@ - + - + @@ -1032,11 +1030,11 @@ - + - + @@ -1044,11 +1042,11 @@ - + - + @@ -1073,7 +1071,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ModernKeePass/Services/SingletonServiceBase.cs b/ModernKeePass/Services/SingletonServiceBase.cs index 65ee330..21e8758 100644 --- a/ModernKeePass/Services/SingletonServiceBase.cs +++ b/ModernKeePass/Services/SingletonServiceBase.cs @@ -4,8 +4,6 @@ namespace ModernKeePass.Services { public abstract class SingletonServiceBase where T : new() { - protected SingletonServiceBase() { } - private static readonly Lazy LazyInstance = new Lazy(() => new T()); diff --git a/ModernKeePass/Views/BasePages/LayoutAwarePageBase.cs b/ModernKeePass/Views/BasePages/LayoutAwarePageBase.cs index 88e33d8..a225a6c 100644 --- a/ModernKeePass/Views/BasePages/LayoutAwarePageBase.cs +++ b/ModernKeePass/Views/BasePages/LayoutAwarePageBase.cs @@ -16,7 +16,7 @@ namespace ModernKeePass.Views.BasePages /// public NavigationHelper NavigationHelper { get; } - public virtual ListView ListView { get; set; } + public ListView ListView { get; set; } public virtual CollectionViewSource ListViewSource { get; set; } public virtual IHasSelectableObject Model { get; set; } @@ -29,7 +29,7 @@ namespace ModernKeePass.Views.BasePages // Setup the logical page navigation components that allow // the page to only show one pane at a time. - NavigationHelper.GoBackCommand = new RelayCommand(() => GoBack(), () => CanGoBack()); + NavigationHelper.GoBackCommand = new RelayCommand(GoBack, CanGoBack); // Start listening for Window size changes // to change from showing two panes to showing a single pane diff --git a/ModernKeePass/Views/EntryDetailPage.xaml b/ModernKeePass/Views/EntryDetailPage.xaml index 4c56f90..c07f3c3 100644 --- a/ModernKeePass/Views/EntryDetailPage.xaml +++ b/ModernKeePass/Views/EntryDetailPage.xaml @@ -27,7 +27,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -348,7 +348,7 @@ - + diff --git a/ModernKeePass/Views/SettingsPageFrames/SettingsDatabasePage.xaml b/ModernKeePass/Views/SettingsPageFrames/SettingsDatabasePage.xaml index 6defab2..be9acd0 100644 --- a/ModernKeePass/Views/SettingsPageFrames/SettingsDatabasePage.xaml +++ b/ModernKeePass/Views/SettingsPageFrames/SettingsDatabasePage.xaml @@ -27,10 +27,10 @@ - + - + - + diff --git a/ModernKeePass/Views/SettingsPageFrames/SettingsNewDatabasePage.xaml b/ModernKeePass/Views/SettingsPageFrames/SettingsNewDatabasePage.xaml index 42d1b05..722681b 100644 --- a/ModernKeePass/Views/SettingsPageFrames/SettingsNewDatabasePage.xaml +++ b/ModernKeePass/Views/SettingsPageFrames/SettingsNewDatabasePage.xaml @@ -22,7 +22,7 @@ - +