Fix Theme selector

FalconNL93 · Jan 17, 2022 · 0516559 · 0516559
1 parent 5df93de
commit 0516559
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 13 deletions.
diff --git a/WslToolbox.Gui/Collections/Settings/GeneralSettingsGenericCollection.cs b/WslToolbox.Gui/Collections/Settings/GeneralSettingsGenericCollection.cs
@@ -109,10 +109,10 @@ private CompositeCollection AppearanceControls()
             return new CompositeCollection
             {
                 ElementHelper.ComboBox(
-                    nameof(DefaultConfiguration.AppearanceConfiguration.SelectedStyle),
+                    nameof(_generalConfiguration.SelectedStyle),
                     ThemeConfiguration.GetValues(),
-                    nameof(DefaultConfiguration.AppearanceConfiguration.SelectedStyle),
-                    Source)
+                    nameof(_generalConfiguration.SelectedStyle),
+                    _generalConfiguration)
             };
         }
 

diff --git a/WslToolbox.Gui/Configurations/DefaultConfiguration.cs b/WslToolbox.Gui/Configurations/DefaultConfiguration.cs
@@ -24,7 +24,6 @@ public DefaultConfiguration()
         public GeneralConfiguration GeneralConfiguration { get; set; } = new();
         public LogEventLevel MinimumLogLevel { get; set; } = LogConfiguration.MinimumLevel;
         public GridConfiguration GridConfiguration { get; set; } = new();
-        public AppearanceConfiguration AppearanceConfiguration { get; set; } = new();
         public NotificationConfiguration NotificationConfiguration { get; set; } = new();
         public KeyboardShortcutConfiguration KeyboardShortcutConfiguration { get; set; } = new();
     }

diff --git a/WslToolbox.Gui/Configurations/Sections/AppearanceConfiguration.cs b/WslToolbox.Gui/Configurations/Sections/AppearanceConfiguration.cs
diff --git a/WslToolbox.Gui/Configurations/Sections/GeneralConfiguration.cs b/WslToolbox.Gui/Configurations/Sections/GeneralConfiguration.cs
@@ -26,6 +26,7 @@ public bool EnableSystemTray
         public bool MinimizeOnClose { get; set; }
         public bool HideDockerDistributions { get; set; } = true;
 
+        public ThemeConfiguration.Styles SelectedStyle { get; set; } = ThemeConfiguration.Styles.Auto;
         public bool ImportCreateFolder { get; set; } = true;
 
         public bool ImportStartDistribution

diff --git a/WslToolbox.Gui/Views/MainView.xaml.cs b/WslToolbox.Gui/Views/MainView.xaml.cs
@@ -106,7 +106,7 @@ public void HandleConfiguration()
 
         private void HandleTheme()
         {
-            var selectedStyle = _viewModel.Config.Configuration.AppearanceConfiguration.SelectedStyle;
+            var selectedStyle = _viewModel.Config.Configuration.GeneralConfiguration.SelectedStyle;
 
             ThemeManager.Current.ApplicationTheme = selectedStyle switch
             {

diff --git a/WslToolbox.Gui/WslToolbox.Gui.csproj b/WslToolbox.Gui/WslToolbox.Gui.csproj
@@ -41,7 +41,7 @@
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0"/>
         <PackageReference Include="ModernWpfUI" Version="0.9.4"/>
         <PackageReference Include="Serilog" Version="2.11.0-dev-01377"/>
-        <PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0"/>
+        <PackageReference Include="Serilog.Settings.Configuration" Version="3.3.1-dev-00296"/>
         <PackageReference Include="Serilog.Sinks.File" Version="5.0.1-dev-00947"/>
     </ItemGroup>