diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index d83c767dd44..9261834e949 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -178,8 +178,7 @@ public CustomBrowserViewModel CustomBrowser
public bool AlwaysStartEn { get; set; } = false;
[JsonInclude, JsonConverter(typeof(JsonStringEnumConverter))]
- public SearchPrecisionScore QuerySearchPrecision { get; private set; } = SearchPrecisionScore.Regular;
-
+ public SearchPrecisionScore QuerySearchPrecision { get; set; } = SearchPrecisionScore.Regular;
[JsonIgnore]
public string QuerySearchPrecisionString
{
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 070c290cdfb..3d5bd99c78c 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -77,6 +77,9 @@
When the icon is hidden from the tray, the Settings menu can be opened by right-clicking on the search window.
Query Search Precision
Changes minimum match score required for results.
+ None
+ Low
+ Regular
Search with Pinyin
Allows using Pinyin to search. Pinyin is the standard system of romanized spelling for translating Chinese.
Always Preview
diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml
index c3bb574b9dd..0cca398a2cf 100644
--- a/Flow.Launcher/Languages/ko.xaml
+++ b/Flow.Launcher/Languages/ko.xaml
@@ -1,5 +1,8 @@
-
-
+
+
Failed to register hotkey "{0}". The hotkey may be in use by another program. Change to a different hotkey, or exit another program.
Flow Launcher
@@ -75,6 +78,9 @@
트레이에서 아이콘을 숨길 경우, 검색창 우클릭으로 설정창을 열 수 있습니다.
쿼리 검색 정밀도
검색 결과에 필요한 최소 매치 점수를 변경합니다.
+ 없음
+ 낮음
+ 일반
항상 Pinyin 사용
Pinyin을 사용하여 검색할 수 있습니다. Pinyin (병음) 은 로마자 중국어 입력 방식입니다.
항상 미리보기
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
index a9718a0ac19..a05c658c195 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -143,12 +143,26 @@ public bool ShouldUsePinyin
set => Settings.ShouldUsePinyin = value;
}
- public List QuerySearchPrecisionStrings => Enum
- .GetValues(typeof(SearchPrecisionScore))
- .Cast()
- .Select(v => v.ToString())
- .ToList();
-
+ public class SearchPrecisionScoreItem
+ {
+ public string Display { get; set; }
+ public SearchPrecisionScore Value { get; set; }
+ }
+ public List QuerySearchPrecisionItems
+ {
+ get
+ {
+ var items = new List();
+ var values = (SearchPrecisionScore[])Enum.GetValues(typeof(SearchPrecisionScore));
+ foreach (var value in values)
+ {
+ var key = $"SearchPrecision{value}";
+ var display = InternationalizationManager.Instance.GetTranslation(key);
+ items.Add(new SearchPrecisionScoreItem { Display = display, Value = value });
+ }
+ return items;
+ }
+ }
public List Languages => InternationalizationManager.Instance.LoadAvailableLanguages();
public IEnumerable MaxResultsRange => Enumerable.Range(2, 16);
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index c13f7f86947..1d57c3ad7b3 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -4,11 +4,11 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:ext="clr-namespace:Flow.Launcher.Resources.MarkupExtensions"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:settingsViewModels="clr-namespace:Flow.Launcher.SettingPages.ViewModels"
xmlns:ui="http://schemas.modernwpf.com/2019"
xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
- xmlns:ext="clr-namespace:Flow.Launcher.Resources.MarkupExtensions"
Title="General"
d:DataContext="{d:DesignInstance settingsViewModels:SettingsPaneGeneralViewModel}"
d:DesignHeight="450"
@@ -58,58 +58,62 @@
-
+
+ SelectedValue="{Binding Settings.SearchWindowScreen}"
+ SelectedValuePath="Value" />
+ Visibility="{ext:VisibleWhen {Binding Settings.SearchWindowScreen},
+ IsEqualTo={x:Static userSettings:SearchWindowScreens.Custom}}" />
+ Icon=""
+ Visibility="{ext:CollapsedWhen {Binding Settings.SearchWindowScreen},
+ IsEqualTo={x:Static userSettings:SearchWindowScreens.RememberLastLaunchLocation}}">
+ SelectedValue="{Binding Settings.SearchWindowAlign}"
+ SelectedValuePath="Value" />
-
-
-
+ Orientation="Horizontal"
+ Visibility="{ext:VisibleWhen {Binding Settings.SearchWindowAlign},
+ IsEqualTo={x:Static userSettings:SearchWindowAligns.Custom}}">
+
+
+
@@ -158,24 +162,27 @@
-
+
+ DisplayMemberPath="Display"
+ ItemsSource="{Binding QuerySearchPrecisionItems}"
+ SelectedValue="{Binding Settings.QuerySearchPrecision, Mode=TwoWay}"
+ SelectedValuePath="Value" />
+ SelectedValue="{Binding Settings.LastQueryMode}"
+ SelectedValuePath="Value" />
-
+