fix: settings params init & feat: 0.4.3

lacmus-foundation · Aug 12, 2020 · 92888d7 · 92888d7
1 parent 74f8f63
commit 92888d7
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/src/LacmusApp.csproj b/src/LacmusApp.csproj
@@ -3,8 +3,8 @@
     <OutputType>Exe</OutputType>
     <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <Company>Lacmus Foundation</Company>
-    <AssemblyVersion>0.4.2.0</AssemblyVersion>
-    <FileVersion>0.4.2.0</FileVersion>
+    <AssemblyVersion>0.4.3.0</AssemblyVersion>
+    <FileVersion>0.4.3.0</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <Compile Update="**\*.xaml.cs">

diff --git a/src/ViewModels/SettingsWindowViewModel.cs b/src/ViewModels/SettingsWindowViewModel.cs
@@ -48,6 +48,7 @@ public SettingsWindowViewModel(SettingsWindow window, LocalizationContext contex
             _config = config;
             _newConfig = AppConfig.DeepCopy(_config);
             _applicationStatusManager = manager;
+            InitView();
 
             this.WhenAnyValue(x => x.ThemeIndex)
                 .Skip(1)
@@ -80,6 +81,38 @@ private void SetupCommands()
             UpdateModelStatusCommand = ReactiveCommand.Create(UpdateModelStatus);
             OpenModelMnagerCommand = ReactiveCommand.Create(OpenModelManager);
         }
+
+        private void InitView()
+        {
+            switch (LocalizationContext.Language)
+            {
+                case Language.English:
+                    LanguageIndex = 0;
+                    break;
+                case Language.Russian:
+                    LanguageIndex = 1;
+                    break;
+            }
+
+            switch (_settingsThemeManager.CurrentTheme)
+            {
+                case ThemeManager.Theme.Citrus:
+                    ThemeIndex = 0;
+                    break;
+                case ThemeManager.Theme.Rust:
+                    ThemeIndex = 1;
+                    break;
+                case ThemeManager.Theme.Sea:
+                    ThemeIndex = 2;
+                    break;
+                case ThemeManager.Theme.Candy:
+                    ThemeIndex = 3;
+                    break;
+                case ThemeManager.Theme.Magma:
+                    ThemeIndex = 4;
+                    break;
+            }
+        }
 
         private async void Apply()
         {