Merge branch 'robin840211-master' into master

jonaskohl · Jul 6, 2021 · 910e621 · 910e621
2 parents 423f7ef + ae4ae43
commit 910e621
Show file tree

Hide file tree

Showing 7 changed files with 356 additions and 11 deletions.
diff --git a/CapsLockIndicatorV3/CapsLockIndicatorV3.csproj b/CapsLockIndicatorV3/CapsLockIndicatorV3.csproj
@@ -211,6 +211,7 @@
     <EmbeddedResource Include="strings.ru.resx" />
     <EmbeddedResource Include="strings.tr-TR.resx" />
     <EmbeddedResource Include="strings.zh-CN.resx" />
+    <EmbeddedResource Include="strings.zh-TW.resx" />
     <EmbeddedResource Include="UpdateDialog.resx">
       <DependentUpon>UpdateDialog.cs</DependentUpon>
     </EmbeddedResource>

diff --git a/CapsLockIndicatorV3/MColorPicker.cs b/CapsLockIndicatorV3/MColorPicker.cs
@@ -200,15 +200,15 @@ protected override IntPtr HookProc(IntPtr hWnd, int msg, IntPtr wparam, IntPtr l
 
         private void PrepareDarkMode(IntPtr hWnd)
         {
-            if (!SettingsManager.Get<bool>("beta_enableDarkMode"))
+            if (!SettingsManager.Get<bool>("darkMode"))
                 return;
 
             Native.UseImmersiveDarkModeColors(hWnd, true);
         }
 
         private void DarkMode()
         {
-            if (!SettingsManager.Get<bool>("beta_enableDarkMode"))
+            if (!SettingsManager.Get<bool>("darkMode"))
                 return;
 
             Native.SetDarkMode(hWndOK, true);

diff --git a/CapsLockIndicatorV3/MainForm.cs b/CapsLockIndicatorV3/MainForm.cs
@@ -230,10 +230,10 @@ private void AddCultures()
                 else
                 {
                     localeComboBox.Items.Add(new DropDownLocale(c.Name, c.NativeName));
-
-                    if (c.TwoLetterISOLanguageName == Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName)
+                    
+                    if (c.Name.Length > 2 ? c.Name == Thread.CurrentThread.CurrentUICulture.Name : c.TwoLetterISOLanguageName == Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName)
                         selectIndex = index;
-
+                    // if (c.TwoLetterISOLanguageName == Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName)
                     index++;
                 }
             }
@@ -252,7 +252,7 @@ private void AddCultures()
                 selectIndex = legacySelectedUICulture;
             }
 
-            var cultureCodes = cultures.Select(c => c.TwoLetterISOLanguageName);
+            var cultureCodes = cultures.Select(c => c.Name.Length > 2 ? c.Name : c.TwoLetterISOLanguageName);
             var selLang = SettingsManager.Get<string>("selectedLanguage");
 
             if (selLang == "")

diff --git a/CapsLockIndicatorV3/Properties/AssemblyInfo.cs b/CapsLockIndicatorV3/Properties/AssemblyInfo.cs
@@ -24,6 +24,6 @@
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("3.11.1.0")]
-[assembly: AssemblyFileVersion("3.11.1.0")]
+[assembly: AssemblyVersion("3.11.1.1")]
+[assembly: AssemblyFileVersion("3.11.1.1")]
 [assembly: Guid ("6f54c357-0542-4d7d-9225-338bc3cd7834")]
diff --git a/CapsLockIndicatorV3/Resources/defaultSettings.txt b/CapsLockIndicatorV3/Resources/defaultSettings.txt
@@ -22,10 +22,9 @@ c:indFgColourInactive=255;255;255;255
 c:indBdColourInactive=255;180;52;77
 f:indFont=Segoe UI; 12pt
 i:indDisplayTime=500
-i:selectedUICulture=0
 i:indOpacity=100
 i:bdSize=4
-s:versionNo=3.10.0.0
+s:versionNo=3.11.1.1
 s:overlayPosition=BottomRight
 s:customMessageCapsOn=
 s:customMessageCapsOff=

diff --git a/CapsLockIndicatorV3/app.config b/CapsLockIndicatorV3/app.config
@@ -50,7 +50,7 @@
             <value>77, 180, 52</value>
         </setting>
         <setting name="versionNo" serializeAs="String">
-            <value>3.8.0.1</value>
+            <value>3.11.1.1</value>
         </setting>
         <setting name="hideOnStartup" serializeAs="String">
             <value>False</value>