Merge branch 'dev' into fix-english-only-hotkey-registration-message

onesounds · web-flow · commit 81c816b87398 · 2024-05-28T10:14:13.000+09:00
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -177,32 +177,16 @@ public CustomBrowserViewModel CustomBrowser
         public bool AlwaysPreview { get; set; } = false;
         public bool AlwaysStartEn { get; set; } = false;
 
+        private SearchPrecisionScore _querySearchPrecision = SearchPrecisionScore.Regular;
         [JsonInclude, JsonConverter(typeof(JsonStringEnumConverter))]
-        public SearchPrecisionScore QuerySearchPrecision { get; private set; } = SearchPrecisionScore.Regular;
-
-        [JsonIgnore]
-        public string QuerySearchPrecisionString
+        public SearchPrecisionScore QuerySearchPrecision
         {
-            get { return QuerySearchPrecision.ToString(); }
+            get => _querySearchPrecision;
             set
             {
-                try
-                {
-                    var precisionScore = (SearchPrecisionScore)Enum
-                        .Parse(typeof(SearchPrecisionScore), value);
-
-                    QuerySearchPrecision = precisionScore;
-                    StringMatcher.Instance.UserSettingSearchPrecision = precisionScore;
-                }
-                catch (ArgumentException e)
-                {
-                    Logger.Log.Exception(nameof(Settings), "Failed to load QuerySearchPrecisionString value from Settings file", e);
-
-                    QuerySearchPrecision = SearchPrecisionScore.Regular;
-                    StringMatcher.Instance.UserSettingSearchPrecision = SearchPrecisionScore.Regular;
-
-                    throw;
-                }
+                _querySearchPrecision = value;
+                if (StringMatcher.Instance != null)
+                    StringMatcher.Instance.UserSettingSearchPrecision = value;
             }
         }
 
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
@@ -77,6 +77,9 @@
     <system:String x:Key="hideNotifyIconToolTip">When the icon is hidden from the tray, the Settings menu can be opened by right-clicking on the search window.</system:String>
     <system:String x:Key="querySearchPrecision">Query Search Precision</system:String>
     <system:String x:Key="querySearchPrecisionToolTip">Changes minimum match score required for results.</system:String>
+    <system:String x:Key="SearchPrecisionNone">None</system:String>
+    <system:String x:Key="SearchPrecisionLow">Low</system:String>
+    <system:String x:Key="SearchPrecisionRegular">Regular</system:String>
     <system:String x:Key="ShouldUsePinyin">Search with Pinyin</system:String>
     <system:String x:Key="ShouldUsePinyinToolTip">Allows using Pinyin to search. Pinyin is the standard system of romanized spelling for translating Chinese.</system:String>
     <system:String x:Key="AlwaysPreview">Always Preview</system:String>
diff --git a/Flow.Launcher/Languages/ru.xaml b/Flow.Launcher/Languages/ru.xaml
@@ -1,5 +1,8 @@
-﻿<?xml version="1.0"?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
+﻿<?xml version="1.0" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
     <!--  MainWindow  -->
     <system:String x:Key="registerHotkeyFailed">Не удалось зарегистрировать сочетание клавиш &quot;{0}&quot;. Возможно, оно используется другой программой. Измените сочетание клавиш или закройте другую программу.</system:String>
     <system:String x:Key="MessageBoxTitle">Flow Launcher</system:String>
@@ -75,6 +78,9 @@
     <system:String x:Key="hideNotifyIconToolTip">Когда значок скрыт в трее, меню настройки можно открыть, щёлкнув правой кнопкой мыши на окне поиска.</system:String>
     <system:String x:Key="querySearchPrecision">Точность поиска запросов</system:String>
     <system:String x:Key="querySearchPrecisionToolTip">Изменение минимального количества совпадений при поиске, необходимого для получения результатов.</system:String>
+    <system:String x:Key="SearchPrecisionNone">Нет</system:String>
+    <system:String x:Key="SearchPrecisionLow">Низкая</system:String>
+    <system:String x:Key="SearchPrecisionRegular">Обычная</system:String>
     <system:String x:Key="ShouldUsePinyin">Поиск с использованием пиньинь</system:String>
     <system:String x:Key="ShouldUsePinyinToolTip">Позволяет использовать пиньинь для поиска. Пиньинь - это стандартная система латинизированной орфографии для перевода китайского языка.</system:String>
     <system:String x:Key="AlwaysPreview">Всегда предпросмотр</system:String>
diff --git a/Flow.Launcher/SettingPages/ViewModels/DropdownDataGeneric.cs b/Flow.Launcher/SettingPages/ViewModels/DropdownDataGeneric.cs
@@ -8,7 +8,8 @@ namespace Flow.Launcher.SettingPages.ViewModels;
 public class DropdownDataGeneric<TValue> : BaseModel where TValue : Enum
 {
     public string Display { get; set; }
-    public TValue Value { get; set; }
+    public TValue Value { get; private init; }
+    private string LocalizationKey { get; init; }
 
     public static List<TR> GetValues<TR>(string keyPrefix) where TR : DropdownDataGeneric<TValue>, new()
     {
@@ -19,9 +20,17 @@ public class DropdownDataGeneric<TValue> : BaseModel where TValue : Enum
         {
             var key = keyPrefix + value;
             var display = InternationalizationManager.Instance.GetTranslation(key);
-            data.Add(new TR { Display = display, Value = value });
+            data.Add(new TR { Display = display, Value = value, LocalizationKey = key });
         }
 
         return data;
     }
+
+    public static void UpdateLabels<TR>(List<TR> options) where TR : DropdownDataGeneric<TValue>
+    {
+        foreach (var item in options)
+        {
+            item.Display = InternationalizationManager.Instance.GetTranslation(item.LocalizationKey);
+        }
+    }
 }
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -24,13 +24,13 @@ public SettingsPaneGeneralViewModel(Settings settings, Updater updater, IPortabl
         Settings = settings;
         _updater = updater;
         _portable = portable;
-        UpdateLastQueryModeDisplay();
+        UpdateEnumDropdownLocalizations();
     }
 
-    public class SearchWindowScreen : DropdownDataGeneric<SearchWindowScreens> { }
-    public class SearchWindowAlign : DropdownDataGeneric<SearchWindowAligns> { }
-    // todo a better name?
-    public class LastQueryMode : DropdownDataGeneric<Infrastructure.UserSettings.LastQueryMode> { }
+    public class SearchWindowScreenData : DropdownDataGeneric<SearchWindowScreens> { }
+    public class SearchWindowAlignData : DropdownDataGeneric<SearchWindowAligns> { }
+    public class SearchPrecisionData : DropdownDataGeneric<SearchPrecisionScore> { }
+    public class LastQueryModeData : DropdownDataGeneric<LastQueryMode> { }
 
     public bool StartFlowLauncherOnSystemStartup
     {
@@ -55,11 +55,14 @@ public bool StartFlowLauncherOnSystemStartup
     }
 
 
-    public List<SearchWindowScreen> SearchWindowScreens =>
-        DropdownDataGeneric<SearchWindowScreens>.GetValues<SearchWindowScreen>("SearchWindowScreen");
+    public List<SearchWindowScreenData> SearchWindowScreens { get; } =
+        DropdownDataGeneric<SearchWindowScreens>.GetValues<SearchWindowScreenData>("SearchWindowScreen");
 
-    public List<SearchWindowAlign> SearchWindowAligns =>
-        DropdownDataGeneric<SearchWindowAligns>.GetValues<SearchWindowAlign>("SearchWindowAlign");
+    public List<SearchWindowAlignData> SearchWindowAligns { get; } =
+        DropdownDataGeneric<SearchWindowAligns>.GetValues<SearchWindowAlignData>("SearchWindowAlign");
+
+    public List<SearchPrecisionData> SearchPrecisionScores { get; } =
+        DropdownDataGeneric<SearchPrecisionScore>.GetValues<SearchPrecisionData>("SearchPrecision");
 
     public List<int> ScreenNumbers
     {
@@ -98,29 +101,15 @@ public bool PortableMode
         }
     }
 
-    private List<LastQueryMode> _lastQueryModes = new();
+    public List<LastQueryModeData> LastQueryModes { get; } =
+        DropdownDataGeneric<LastQueryMode>.GetValues<LastQueryModeData>("LastQuery");
 
-    public List<LastQueryMode> LastQueryModes
+    private void UpdateEnumDropdownLocalizations()
     {
-        get
-        {
-            if (_lastQueryModes.Count == 0)
-            {
-                _lastQueryModes =
-                    DropdownDataGeneric<Infrastructure.UserSettings.LastQueryMode>
-                        .GetValues<LastQueryMode>("LastQuery");
-            }
-
-            return _lastQueryModes;
-        }
-    }
-
-    private void UpdateLastQueryModeDisplay()
-    {
-        foreach (var item in LastQueryModes)
-        {
-            item.Display = InternationalizationManager.Instance.GetTranslation($"LastQuery{item.Value}");
-        }
+        DropdownDataGeneric<SearchWindowScreens>.UpdateLabels(SearchWindowScreens);
+        DropdownDataGeneric<SearchWindowAligns>.UpdateLabels(SearchWindowAligns);
+        DropdownDataGeneric<SearchPrecisionScore>.UpdateLabels(SearchPrecisionScores);
+        DropdownDataGeneric<LastQueryMode>.UpdateLabels(LastQueryModes);
     }
 
     public string Language
@@ -133,7 +122,7 @@ public string Language
             if (InternationalizationManager.Instance.PromptShouldUsePinyin(value))
                 ShouldUsePinyin = true;
 
-            UpdateLastQueryModeDisplay();
+            UpdateEnumDropdownLocalizations();
         }
     }
 
@@ -143,12 +132,6 @@ public bool ShouldUsePinyin
         set => Settings.ShouldUsePinyin = value;
     }
 
-    public List<string> QuerySearchPrecisionStrings => Enum
-        .GetValues(typeof(SearchPrecisionScore))
-        .Cast<SearchPrecisionScore>()
-        .Select(v => v.ToString())
-        .ToList();
-
     public List<Language> Languages => InternationalizationManager.Instance.LoadAvailableLanguages();
     public IEnumerable<int> MaxResultsRange => Enumerable.Range(2, 16);
 
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -30,19 +30,31 @@
                 TextAlignment="left" />
 
             <cc:Card Title="{DynamicResource startFlowLauncherOnSystemStartup}" Icon="&#xe8fc;">
-                <ui:ToggleSwitch IsOn="{Binding StartFlowLauncherOnSystemStartup}" />
+                <ui:ToggleSwitch
+                    IsOn="{Binding StartFlowLauncherOnSystemStartup}"
+                    OffContent="{DynamicResource disable}"
+                    OnContent="{DynamicResource enable}" />
             </cc:Card>
 
             <cc:Card Title="{DynamicResource hideOnStartup}" Icon="&#xed1a;">
-                <ui:ToggleSwitch IsOn="{Binding Settings.HideOnStartup}" />
+                <ui:ToggleSwitch
+                    IsOn="{Binding Settings.HideOnStartup}"
+                    OffContent="{DynamicResource disable}"
+                    OnContent="{DynamicResource enable}" />
             </cc:Card>
 
             <cc:Card Title="{DynamicResource hideFlowLauncherWhenLoseFocus}" Margin="0 30 0 0">
-                <ui:ToggleSwitch IsOn="{Binding Settings.HideWhenDeactivated}" />
+                <ui:ToggleSwitch
+                    IsOn="{Binding Settings.HideWhenDeactivated}"
+                    OffContent="{DynamicResource disable}"
+                    OnContent="{DynamicResource enable}" />
             </cc:Card>
 
             <cc:Card Title="{DynamicResource hideNotifyIcon}" Sub="{DynamicResource hideNotifyIconToolTip}">
-                <ui:ToggleSwitch IsOn="{Binding Settings.HideNotifyIcon}" />
+                <ui:ToggleSwitch
+                    IsOn="{Binding Settings.HideNotifyIcon}"
+                    OffContent="{DynamicResource disable}"
+                    OnContent="{DynamicResource enable}" />
             </cc:Card>
 
             <cc:CardGroup Margin="0 30 0 0">
@@ -107,38 +119,53 @@
                 Title="{DynamicResource ignoreHotkeysOnFullscreen}"
                 Icon="&#xe7fc;"
                 Sub="{DynamicResource ignoreHotkeysOnFullscreenToolTip}">
-                <ui:ToggleSwitch IsOn="{Binding Settings.IgnoreHotkeysOnFullscreen}" />
+                <ui:ToggleSwitch
+                    IsOn="{Binding Settings.IgnoreHotkeysOnFullscreen}"
+                    OffContent="{DynamicResource disable}"
+                    OnContent="{DynamicResource enable}" />
             </cc:Card>
 
             <cc:Card
                 Title="{DynamicResource AlwaysPreview}"
                 Margin="0 30 0 0"
                 Icon="&#xe8a1;"
                 Sub="{DynamicResource AlwaysPreviewToolTip}">
-                <ui:ToggleSwitch IsOn="{Binding Settings.AlwaysPreview}" ToolTip="{Binding AlwaysPreviewToolTip}" />
+                <ui:ToggleSwitch
+                    IsOn="{Binding Settings.AlwaysPreview}"
+                    OffContent="{DynamicResource disable}"
+                    OnContent="{DynamicResource enable}"
+                    ToolTip="{Binding AlwaysPreviewToolTip}" />
             </cc:Card>
 
             <cc:Card
                 Title="{DynamicResource autoUpdates}"
                 Margin="0 30 0 0"
                 Icon="&#xecc5;">
-                <ui:ToggleSwitch IsOn="{Binding AutoUpdates}" />
+                <ui:ToggleSwitch
+                    IsOn="{Binding AutoUpdates}"
+                    OffContent="{DynamicResource disable}"
+                    OnContent="{DynamicResource enable}" />
             </cc:Card>
 
             <cc:Card
                 Title="{DynamicResource portableMode}"
                 Icon="&#xe88e;"
                 Sub="{DynamicResource portableModeToolTIp}">
-                <ui:ToggleSwitch IsOn="{Binding PortableMode}" />
+                <ui:ToggleSwitch
+                    IsOn="{Binding PortableMode}"
+                    OffContent="{DynamicResource disable}"
+                    OnContent="{DynamicResource enable}" />
             </cc:Card>
 
             <cc:CardGroup Margin="0 30 0 0">
                 <cc:Card Title="{DynamicResource querySearchPrecision}"
                          Sub="{DynamicResource querySearchPrecisionToolTip}">
                     <ComboBox
                         MaxWidth="200"
-                        ItemsSource="{Binding QuerySearchPrecisionStrings}"
-                        SelectedItem="{Binding Settings.QuerySearchPrecisionString}" />
+                        DisplayMemberPath="Display"
+                        ItemsSource="{Binding SearchPrecisionScores}"
+                        SelectedValue="{Binding Settings.QuerySearchPrecision}"
+                        SelectedValuePath="Value" />
                 </cc:Card>
 
                 <cc:Card Title="{DynamicResource lastQueryMode}" Sub="{DynamicResource lastQueryModeToolTip}">
@@ -216,15 +243,21 @@
                 Margin="0 30 0 0"
                 Icon="&#xe8d3;"
                 Sub="{DynamicResource typingStartEnTooltip}">
-                <ui:ToggleSwitch IsOn="{Binding Settings.AlwaysStartEn}" />
+                <ui:ToggleSwitch
+                    IsOn="{Binding Settings.AlwaysStartEn}"
+                    OffContent="{DynamicResource disable}"
+                    OnContent="{DynamicResource enable}" />
             </cc:Card>
 
             <cc:Card
                 Title="{DynamicResource ShouldUsePinyin}"
                 Icon="&#xe98a;"
                 Sub="{DynamicResource ShouldUsePinyinToolTip}">
-                <ui:ToggleSwitch IsOn="{Binding Settings.ShouldUsePinyin}"
-                                 ToolTip="{DynamicResource ShouldUsePinyinToolTip}" />
+                <ui:ToggleSwitch
+                    IsOn="{Binding Settings.ShouldUsePinyin}"
+                    OffContent="{DynamicResource disable}"
+                    OnContent="{DynamicResource enable}"
+                    ToolTip="{DynamicResource ShouldUsePinyinToolTip}" />
             </cc:Card>
 
             <cc:Card
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml
@@ -63,10 +63,11 @@
                         SelectedValue="{Binding Settings.OpenResultModifiers}" />
                 </cc:Card>
 
-                <cc:Card
-                    Title="{DynamicResource showOpenResultHotkey}"
-                    Sub="{DynamicResource showOpenResultHotkeyToolTip}">
-                    <ui:ToggleSwitch IsOn="{Binding Settings.ShowOpenResultHotkey}" />
+                <cc:Card Title="{DynamicResource showOpenResultHotkey}" Sub="{DynamicResource showOpenResultHotkeyToolTip}">
+                    <ui:ToggleSwitch
+                        IsOn="{Binding Settings.ShowOpenResultHotkey}"
+                        OffContent="{DynamicResource disable}"
+                        OnContent="{DynamicResource enable}" />
                 </cc:Card>
             </cc:CardGroup>
 
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml
@@ -33,7 +33,10 @@
 
             <cc:CardGroup>
                 <cc:Card Title="{DynamicResource enableProxy}">
-                    <ui:ToggleSwitch IsOn="{Binding Settings.Proxy.Enabled}" />
+                    <ui:ToggleSwitch
+                        IsOn="{Binding Settings.Proxy.Enabled}"
+                        OffContent="{DynamicResource disable}"
+                        OnContent="{DynamicResource enable}" />
                 </cc:Card>
 
                 <cc:Card Title="{DynamicResource server}">

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@ namespace Flow.Launcher.SettingPages.ViewModels;`
`8`	`8`	`public class DropdownDataGeneric<TValue> : BaseModel where TValue : Enum`
`9`	`9`	`{`
`10`	`10`	`public string Display { get; set; }`
`11`		`- public TValue Value { get; set; }`
	`11`	`+ public TValue Value { get; private init; }`
	`12`	`+ private string LocalizationKey { get; init; }`
`12`	`13`
`13`	`14`	`public static List<TR> GetValues<TR>(string keyPrefix) where TR : DropdownDataGeneric<TValue>, new()`
`14`	`15`	`{`
`@@ -19,9 +20,17 @@ public class DropdownDataGeneric<TValue> : BaseModel where TValue : Enum`
`19`	`20`	`{`
`20`	`21`	`var key = keyPrefix + value;`
`21`	`22`	`var display = InternationalizationManager.Instance.GetTranslation(key);`
`22`		`- data.Add(new TR { Display = display, Value = value });`
	`23`	`+ data.Add(new TR { Display = display, Value = value, LocalizationKey = key });`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`return data;`
`26`	`27`	`}`
	`28`	`+`
	`29`	`+ public static void UpdateLabels<TR>(List<TR> options) where TR : DropdownDataGeneric<TValue>`
	`30`	`+ {`
	`31`	`+ foreach (var item in options)`
	`32`	`+ {`
	`33`	`+ item.Display = InternationalizationManager.Instance.GetTranslation(item.LocalizationKey);`
	`34`	`+ }`
	`35`	`+ }`
`27`	`36`	`}`