Add UI for double pinyin options

VictoriousRaptor · VictoriousRaptor · commit 130202108c24 · 2025-07-13T19:09:40.000+08:00
diff --git a/Flow.Launcher.Infrastructure/PinyinAlphabet.cs b/Flow.Launcher.Infrastructure/PinyinAlphabet.cs
@@ -45,7 +45,8 @@ public void Reload()
         private void CreateDoublePinyinTableFromStream(Stream jsonStream)
         {
             Dictionary<string, Dictionary<string, string>> table = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string>>>(jsonStream);
-            if (!table.TryGetValue(_settings.DoublePinyinSchema, out var value))
+            string schemaKey = _settings.DoublePinyinSchema.ToString(); // Convert enum to string  
+            if (!table.TryGetValue(schemaKey, out var value))
             {
                 throw new InvalidOperationException("DoublePinyinSchema is invalid or double pinyin table is broken.");
             }
@@ -104,18 +105,13 @@ public bool ShouldTranslate(string stringToTranslate)
                 if (content[i] >= 0x3400 && content[i] <= 0x9FD5)
                 {
                     string translated = _settings.UseDoublePinyin ? ToDoublePin(resultList[i]) : resultList[i];
-                    if (previousIsChinese)
+                    if (i > 0)
                     {
                         resultBuilder.Append(' ');
-                        map.AddNewIndex(resultBuilder.Length, translated.Length);
-                        resultBuilder.Append(translated);
-                    }
-                    else
-                    {
-                        map.AddNewIndex(resultBuilder.Length, translated.Length);
-                        resultBuilder.Append(translated);
-                        previousIsChinese = true;
                     }
+                    map.AddNewIndex(resultBuilder.Length, translated.Length);
+                    resultBuilder.Append(translated);
+                    previousIsChinese = true;
                 }
                 else
                 {
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -87,7 +87,7 @@ public string Theme
             }
         }
         public bool UseDropShadowEffect { get; set; } = true;
-        public BackdropTypes BackdropType{ get; set; } = BackdropTypes.None;
+        public BackdropTypes BackdropType { get; set; } = BackdropTypes.None;
         public string ReleaseNotesVersion { get; set; } = string.Empty;
 
         /* Appearance Settings. It should be separated from the setting later.*/
@@ -200,7 +200,7 @@ public bool ShowHistoryResultsForHomePage
                 }
             }
         }
-        
+
         public int MaxHistoryResultsToShowForHomePage { get; set; } = 5;
 
         public int CustomExplorerIndex { get; set; } = 0;
@@ -313,8 +313,10 @@ public bool UseDoublePinyin
             }
         }
 
-        private string _doublePinyinSchema = "XiaoHe";
-        public string DoublePinyinSchema
+        private DoublePinyinSchemas _doublePinyinSchema = DoublePinyinSchemas.XiaoHe;
+
+        [JsonInclude, JsonConverter(typeof(JsonStringEnumConverter))]
+        public DoublePinyinSchemas DoublePinyinSchema
         {
             get => _doublePinyinSchema;
             set
@@ -489,7 +491,7 @@ public List<RegisteredHotkeyData> RegisteredHotkeys
                 if (!string.IsNullOrEmpty(SettingWindowHotkey))
                     list.Add(new(SettingWindowHotkey, "SettingWindowHotkey", () => SettingWindowHotkey = ""));
                 if (!string.IsNullOrEmpty(OpenHistoryHotkey))
-                    list.Add(new(OpenHistoryHotkey, "OpenHistoryHotkey", () => OpenHistoryHotkey = ""));                
+                    list.Add(new(OpenHistoryHotkey, "OpenHistoryHotkey", () => OpenHistoryHotkey = ""));
                 if (!string.IsNullOrEmpty(OpenContextMenuHotkey))
                     list.Add(new(OpenContextMenuHotkey, "OpenContextMenuHotkey", () => OpenContextMenuHotkey = ""));
                 if (!string.IsNullOrEmpty(SelectNextPageHotkey))
@@ -595,9 +597,22 @@ public enum AnimationSpeeds
 
     public enum BackdropTypes
     {
-        None,    
+        None,
         Acrylic,
         Mica,
         MicaAlt
     }
+
+    public enum DoublePinyinSchemas
+    {
+        XiaoHe,
+        ZiRanMa,
+        WeiRuan,
+        ZhiNengABC,
+        ZiGuangPinYin,
+        PinYinJiaJia,
+        XingKongJianDao,
+        DaNiu,
+        XiaoLang
+    }
 }
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
@@ -105,6 +105,19 @@
     <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="ShouldUseDoublePinyin">Use Double Pinyin</system:String>
+    <system:String x:Key="ShouldUseDoublePinyinToolTip">Allows using Double Pinyin to search. Double Pinyin is a variation of Pinyin that uses two characters.</system:String>
+    <system:String x:Key="DoublePinyinSchema">Double Pinyin Schema</system:String>
+    <system:String x:Key="DoublePinyinSchemasXiaoHe">Xiao He</system:String>
+    <system:String x:Key="DoublePinyinSchemasZiRanMa">Zi Ran Ma</system:String>
+    <system:String x:Key="DoublePinyinSchemasWeiRuan">Wei Ruan</system:String>
+    <system:String x:Key="DoublePinyinSchemasZhiNengABC">Zhi Neng ABC</system:String>
+    <system:String x:Key="DoublePinyinSchemasZiGuangPinYin">Zi Guang Pin Yin</system:String>
+    <system:String x:Key="DoublePinyinSchemasPinYinJiaJia">Pin Yin Jia Jia</system:String>
+    <system:String x:Key="DoublePinyinSchemasXingKongJianDao">Xing Kong Jian Dao</system:String>
+    <system:String x:Key="DoublePinyinSchemasDaNiu">Da Niu</system:String>
+    <system:String x:Key="DoublePinyinSchemasXiaoLang">Xiao Lang</system:String>
+    
     <system:String x:Key="AlwaysPreview">Always Preview</system:String>
     <system:String x:Key="AlwaysPreviewToolTip">Always open preview panel when Flow activates. Press {0} to toggle preview.</system:String>
     <system:String x:Key="shadowEffectNotAllowed">Shadow effect is not allowed while current theme has blur effect enabled</system:String>
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -35,6 +35,7 @@ public class SearchWindowScreenData : DropdownDataGeneric<SearchWindowScreens> {
     public class SearchWindowAlignData : DropdownDataGeneric<SearchWindowAligns> { }
     public class SearchPrecisionData : DropdownDataGeneric<SearchPrecisionScore> { }
     public class LastQueryModeData : DropdownDataGeneric<LastQueryMode> { }
+    public class DoublePinyinSchemaData : DropdownDataGeneric<DoublePinyinSchemas> { }
 
     public bool StartFlowLauncherOnSystemStartup
     {
@@ -177,6 +178,7 @@ private void UpdateEnumDropdownLocalizations()
         DropdownDataGeneric<SearchWindowAligns>.UpdateLabels(SearchWindowAligns);
         DropdownDataGeneric<SearchPrecisionScore>.UpdateLabels(SearchPrecisionScores);
         DropdownDataGeneric<LastQueryMode>.UpdateLabels(LastQueryModes);
+        DropdownDataGeneric<DoublePinyinSchemas>.UpdateLabels(DoublePinyinSchemas);
         // Since we are using Binding instead of DynamicResource, we need to manually trigger the update
         OnPropertyChanged(nameof(AlwaysPreviewToolTip));
     }
@@ -262,9 +264,25 @@ private void OpenImeSettings()
     public bool ShouldUsePinyin
     {
         get => Settings.ShouldUsePinyin;
-        set => Settings.ShouldUsePinyin = value;
+        set
+        {
+            if (value == false && UseDoublePinyin == true)
+            {
+                UseDoublePinyin = false;
+            }
+            Settings.ShouldUsePinyin = value;
+        }
     }
 
+    public bool UseDoublePinyin
+    {
+        set => Settings.UseDoublePinyin = value;
+        get => Settings.UseDoublePinyin;
+    }
+
+    public List<DoublePinyinSchemaData> DoublePinyinSchemas { get; } =
+        DropdownDataGeneric<DoublePinyinSchemas>.GetValues<DoublePinyinSchemaData>("DoublePinyinSchemas");
+
     public List<Language> Languages => _translater.LoadAvailableLanguages();
 
     public string AlwaysPreviewToolTip => string.Format(
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -347,16 +347,44 @@
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
-            <cc:Card
-                Title="{DynamicResource ShouldUsePinyin}"
-                Icon="&#xe98a;"
-                Sub="{DynamicResource ShouldUsePinyinToolTip}">
-                <ui:ToggleSwitch
-                    IsOn="{Binding Settings.ShouldUsePinyin}"
-                    OffContent="{DynamicResource disable}"
-                    OnContent="{DynamicResource enable}"
-                    ToolTip="{DynamicResource ShouldUsePinyinToolTip}" />
-            </cc:Card>
+            <cc:CardGroup Margin="0 4 0 0">
+                <cc:Card                
+                    Title="{DynamicResource ShouldUsePinyin}"
+                    Icon="&#xe98a;"
+                    Sub="{DynamicResource ShouldUsePinyinToolTip}"
+                    Type="First">
+                    <ui:ToggleSwitch
+                        IsOn="{Binding ShouldUsePinyin}"
+                        OffContent="{DynamicResource disable}"
+                        OnContent="{DynamicResource enable}"
+                        ToolTip="{DynamicResource ShouldUsePinyinToolTip}" />
+                </cc:Card>
+                <cc:Card
+                    Visibility="{ext:VisibleWhen {Binding ShouldUsePinyin},
+                                    IsEqualToBool=True}"
+                    Title="{DynamicResource ShouldUseDoublePinyin}"
+                    Icon="&#xf085;"
+                    Sub="{DynamicResource ShouldUseDoublePinyinToolTip}"
+                    Type="Middle">
+                    <ui:ToggleSwitch
+                        IsOn="{Binding UseDoublePinyin}"
+                        OffContent="{DynamicResource disable}"
+                        OnContent="{DynamicResource enable}"
+                        ToolTip="{DynamicResource ShouldUseDoublePinyinToolTip}" />
+                </cc:Card>
+                <cc:Card
+                    Visibility="{ext:VisibleWhen {Binding UseDoublePinyin},
+                                                        IsEqualToBool=True}"
+                    Title="{DynamicResource DoublePinyinSchema}"
+                    Sub="{DynamicResource DoublePinyinSchemaToolTip}"
+                    Type="Last">
+                    <ComboBox
+                        DisplayMemberPath="Display"
+                        ItemsSource="{Binding DoublePinyinSchemas}"
+                        SelectedValue="{Binding Settings.DoublePinyinSchema}"
+                        SelectedValuePath="Value" />
+                </cc:Card>
+            </cc:CardGroup>
 
             <cc:Card
                 Title="{DynamicResource language}"

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@ public void Reload()`
`45`	`45`	`private void CreateDoublePinyinTableFromStream(Stream jsonStream)`
`46`	`46`	`{`
`47`	`47`	`Dictionary<string, Dictionary<string, string>> table = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string>>>(jsonStream);`
`48`		`- if (!table.TryGetValue(_settings.DoublePinyinSchema, out var value))`
	`48`	`+ string schemaKey = _settings.DoublePinyinSchema.ToString(); // Convert enum to string`
	`49`	`+ if (!table.TryGetValue(schemaKey, out var value))`
`49`	`50`	`{`
`50`	`51`	`throw new InvalidOperationException("DoublePinyinSchema is invalid or double pinyin table is broken.");`
`51`	`52`	`}`
`@@ -104,18 +105,13 @@ public bool ShouldTranslate(string stringToTranslate)`
`104`	`105`	`if (content[i] >= 0x3400 && content[i] <= 0x9FD5)`
`105`	`106`	`{`
`106`	`107`	`string translated = _settings.UseDoublePinyin ? ToDoublePin(resultList[i]) : resultList[i];`
`107`		`- if (previousIsChinese)`
	`108`	`+ if (i > 0)`
`108`	`109`	`{`
`109`	`110`	`resultBuilder.Append(' ');`
`110`		`- map.AddNewIndex(resultBuilder.Length, translated.Length);`
`111`		`- resultBuilder.Append(translated);`
`112`		`- }`
`113`		`- else`
`114`		`- {`
`115`		`- map.AddNewIndex(resultBuilder.Length, translated.Length);`
`116`		`- resultBuilder.Append(translated);`
`117`		`- previousIsChinese = true;`
`118`	`111`	`}`
	`112`	`+ map.AddNewIndex(resultBuilder.Length, translated.Length);`
	`113`	`+ resultBuilder.Append(translated);`
	`114`	`+ previousIsChinese = true;`
`119`	`115`	`}`
`120`	`116`	`else`
`121`	`117`	`{`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public string Theme`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`	`public bool UseDropShadowEffect { get; set; } = true;`
`90`		`- public BackdropTypes BackdropType{ get; set; } = BackdropTypes.None;`
	`90`	`+ public BackdropTypes BackdropType { get; set; } = BackdropTypes.None;`
`91`	`91`	`public string ReleaseNotesVersion { get; set; } = string.Empty;`
`92`	`92`
`93`	`93`	`/* Appearance Settings. It should be separated from the setting later.*/`
`@@ -200,7 +200,7 @@ public bool ShowHistoryResultsForHomePage`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`	`}`
`203`		`-`
	`203`	`+`
`204`	`204`	`public int MaxHistoryResultsToShowForHomePage { get; set; } = 5;`
`205`	`205`
`206`	`206`	`public int CustomExplorerIndex { get; set; } = 0;`
`@@ -313,8 +313,10 @@ public bool UseDoublePinyin`
`313`	`313`	`}`
`314`	`314`	`}`
`315`	`315`
`316`		`- private string _doublePinyinSchema = "XiaoHe";`
`317`		`- public string DoublePinyinSchema`
	`316`	`+ private DoublePinyinSchemas _doublePinyinSchema = DoublePinyinSchemas.XiaoHe;`
	`317`	`+`
	`318`	`+ [JsonInclude, JsonConverter(typeof(JsonStringEnumConverter))]`
	`319`	`+ public DoublePinyinSchemas DoublePinyinSchema`
`318`	`320`	`{`
`319`	`321`	`get => _doublePinyinSchema;`
`320`	`322`	`set`
`@@ -489,7 +491,7 @@ public List<RegisteredHotkeyData> RegisteredHotkeys`
`489`	`491`	`if (!string.IsNullOrEmpty(SettingWindowHotkey))`
`490`	`492`	`list.Add(new(SettingWindowHotkey, "SettingWindowHotkey", () => SettingWindowHotkey = ""));`
`491`	`493`	`if (!string.IsNullOrEmpty(OpenHistoryHotkey))`
`492`		`- list.Add(new(OpenHistoryHotkey, "OpenHistoryHotkey", () => OpenHistoryHotkey = ""));`
	`494`	`+ list.Add(new(OpenHistoryHotkey, "OpenHistoryHotkey", () => OpenHistoryHotkey = ""));`
`493`	`495`	`if (!string.IsNullOrEmpty(OpenContextMenuHotkey))`
`494`	`496`	`list.Add(new(OpenContextMenuHotkey, "OpenContextMenuHotkey", () => OpenContextMenuHotkey = ""));`
`495`	`497`	`if (!string.IsNullOrEmpty(SelectNextPageHotkey))`
`@@ -595,9 +597,22 @@ public enum AnimationSpeeds`
`595`	`597`
`596`	`598`	`public enum BackdropTypes`
`597`	`599`	`{`
`598`		`- None,`
	`600`	`+ None,`
`599`	`601`	`Acrylic,`
`600`	`602`	`Mica,`
`601`	`603`	`MicaAlt`
`602`	`604`	`}`
	`605`	`+`
	`606`	`+ public enum DoublePinyinSchemas`
	`607`	`+ {`
	`608`	`+ XiaoHe,`
	`609`	`+ ZiRanMa,`
	`610`	`+ WeiRuan,`
	`611`	`+ ZhiNengABC,`
	`612`	`+ ZiGuangPinYin,`
	`613`	`+ PinYinJiaJia,`
	`614`	`+ XingKongJianDao,`
	`615`	`+ DaNiu,`
	`616`	`+ XiaoLang`
	`617`	`+ }`
`603`	`618`	`}`