Merge branch 'LanguageStart' of https://github.com/onesounds/Flow.Launcher into LanguageStart

Author: onesounds

Flow.Launcher.Test/Flow.Launcher.Test.csproj

@@ -49,7 +49,7 @@
 
   <ItemGroup>
     <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="nunit" Version="3.13.2" />
+    <PackageReference Include="nunit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Flow.Launcher/Languages/en.xaml

@@ -55,8 +55,8 @@
     <system:String x:Key="defaultFileManagerToolTip">Select the file manager to use when opening the folder.</system:String>
     <system:String x:Key="defaultBrowser">Default Web Browser</system:String>
     <system:String x:Key="defaultBrowserToolTip">Setting for New Tab, New Window, Private Mode.</system:String>
-    <system:String x:Key="typingStartEn">Always Start in English Layout</system:String>
-    <system:String x:Key="typingStartEnTooltip">If you are using both native language and English keyboard layouts, start the flow in English layout state.</system:String>
+    <system:String x:Key="typingStartEn">Always Start Typing in English Mode</system:String>
+    <system:String x:Key="typingStartEnTooltip">Automatically change your input method to English mode when activating Flow.</system:String>
     <system:String x:Key="pythonDirectory">Python Directory</system:String>
     <system:String x:Key="autoUpdates">Auto Update</system:String>
     <system:String x:Key="selectPythonDirectory">Select</system:String>

Flow.Launcher/ViewModel/SettingWindowViewModel.cs

@@ -775,8 +775,12 @@ public bool EditSelectedCustomShortcut()
             var shortcutSettingWindow = new CustomShortcutSetting(item.Key, item.Value, this);
             if (shortcutSettingWindow.ShowDialog() == true)
             {
+                // Fix un-selectable shortcut item after the first selection
+                // https://stackoverflow.com/questions/16789360/wpf-listbox-items-with-changing-hashcode
+                SelectedCustomShortcut = null;
                 item.Key = shortcutSettingWindow.Key;
                 item.Value = shortcutSettingWindow.Value;
+                SelectedCustomShortcut = item;
                 return true;
             }
             return false;

Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs

@@ -620,7 +620,7 @@ public static Win32[] All(Settings settings)
                     autoIndexPrograms = autoIndexPrograms.Concat(startMenu);
                 }
 
-                if (settings.EnablePATHSource)
+                if (settings.EnablePathSource)
                 {
                     var path = PATHPrograms(settings.GetSuffixes(), protocols, commonParents);
                     programs = programs.Concat(path);

Plugins/Flow.Launcher.Plugin.Program/Settings.cs

@@ -118,7 +118,7 @@ private void RemoveRedundantSuffixes()
         public bool EnableDescription { get; set; } = false;
         public bool HideAppsPath { get; set; } = true;
         public bool EnableRegistrySource { get; set; } = true;
-        public bool EnablePATHSource { get; set; } = true;
+        public bool EnablePathSource { get; set; } = false;
 
         public string CustomizedExplorer { get; set; } = Explorer;
         public string CustomizedArgs { get; set; } = ExplorerArgs;

Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs

@@ -69,10 +69,10 @@ public bool EnableStartMenuSource
 
         public bool EnablePATHSource
         {
-            get => _settings.EnablePATHSource;
+            get => _settings.EnablePathSource;
             set
             {
-                _settings.EnablePATHSource = value;
+                _settings.EnablePathSource = value;
                 ReIndexing();
             }
         }

Plugins/Flow.Launcher.Plugin.Program/plugin.json

@@ -4,7 +4,7 @@
   "Name": "Program",
   "Description": "Search programs in Flow.Launcher",
   "Author": "qianlifeng",
-  "Version": "2.0.0",
+  "Version": "2.0.1",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Program.dll",