Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 03:37:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify Chinese PinYin support configuration

Browse Source 
Removed manual toggle for Chinese PinYin support in settings and UI.
PinYin support is now automatically enabled based on the system's
UI culture (Simplified Chinese). Updated `MatchOption` and
`FuzzyStringMatcher` to include culture-based detection logic.
Removed related properties, UI elements, and resource strings.
This commit is contained in:
Yu Leng
2025-12-05 11:42:40 +08:00
parent ceb554a738
commit 9db2ebee68
6 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/Common.Search/FuzzSearch/MatchOption.cs
View File

@@ -2,6 +2,8 @@
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Globalization;
namespace Common.Search.FuzzSearch;
public class MatchOption
@@ -9,7 +11,16 @@ public class MatchOption
public bool IgnoreCase { get; set; } = true;
/// <summary>
/// Gets or sets a value indicating whether to support Chinese PinYin
/// Gets or sets a value indicating whether to support Chinese PinYin.
/// Defaults to true when the system UI culture is Simplified Chinese.
/// </summary>
public bool ChinesePinYinSupport { get; set; }
public bool ChinesePinYinSupport { get; set; } = IsSimplifiedChinese();
private static bool IsSimplifiedChinese()
{
var culture = CultureInfo.CurrentUICulture;
// Detect Simplified Chinese: zh-CN, zh-Hans, zh-Hans-*
return culture.Name.StartsWith("zh-CN", StringComparison.OrdinalIgnoreCase)
|| culture.Name.StartsWith("zh-Hans", StringComparison.OrdinalIgnoreCase);
}
}

12
src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsModel.cs
View File

@@ -46,18 +46,6 @@ public partial class SettingsModel : ObservableObject
public bool AllowExternalReload { get; set; }
public bool EnableChinesePinYinSupport
{
get => field;
set
{
if (SetProperty(ref field, value))
{
FuzzyStringMatcher.ChinesePinYinSupport = value;
}
}
}
public Dictionary<string, ProviderSettings> ProviderSettings { get; set; } = [];
public Dictionary<string, CommandAlias> Aliases { get; set; } = [];

9
src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsViewModel.cs
View File

@@ -141,15 +141,6 @@ public partial class SettingsViewModel : INotifyPropertyChanged
}
}
public bool EnableChinesePinYinSupport
{
get => _settings.EnableChinesePinYinSupport;
set
{
_settings.EnableChinesePinYinSupport = value;
Save();
}
}
public int AutoGoBackIntervalIndex
{

3
src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml
View File

@@ -51,9 +51,6 @@
</controls:SettingsCard>
</controls:SettingsExpander.Items>
</controls:SettingsExpander>
<controls:SettingsCard x:Uid="Settings_GeneralPage_EnableChinesePinYinSupport_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE98A;}">
<ToggleSwitch IsOn="{x:Bind viewModel.EnableChinesePinYinSupport, Mode=TwoWay}" />
</controls:SettingsCard>
<controls:SettingsCard x:Uid="Settings_GeneralPage_AutoGoHome_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE80F;}">
<ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind viewModel.AutoGoBackIntervalIndex, Mode=TwoWay}">
<ComboBoxItem x:Uid="Settings_GeneralPage_AutoGoHome_Item_Never" />

6
src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
View File

@@ -344,12 +344,6 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
<data name="Settings_GeneralPage_IgnoreShortcutWhenFullscreen_SettingsCard.Description" xml:space="preserve">
<value>Preventing disruption of the program running in fullscreen by unintentional activation of shortcut</value>
</data>
<data name="Settings_GeneralPage_EnableChinesePinYinSupport_SettingsCard.Header" xml:space="preserve">
<value>PinYin Support for Chinese</value>
</data>
<data name="Settings_GeneralPage_EnableChinesePinYinSupport_SettingsCard.Description" xml:space="preserve">
<value>Search Chinese contents with PinYin</value>
</data>
<data name="Settings_GeneralPage_HighlightSearch_SettingsCard.Header" xml:space="preserve">
<value>Highlight search on activate</value>
</data>

15
src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/FuzzyStringMatcher.cs
View File

@@ -2,6 +2,8 @@
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Globalization;
using ToolGood.Words.Pinyin;
namespace Microsoft.CommandPalette.Extensions.Toolkit;
@@ -12,9 +14,18 @@ public static class FuzzyStringMatcher
private const int NOMATCH = 0;
/// <summary>
/// Gets or sets a value indicating whether to support Chinese PinYin
/// Gets a value indicating whether to support Chinese PinYin.
/// Automatically enabled when the system UI culture is Simplified Chinese.
/// </summary>
public static bool ChinesePinYinSupport { get; set; }
public static bool ChinesePinYinSupport { get; } = IsSimplifiedChinese();
private static bool IsSimplifiedChinese()
{
var culture = CultureInfo.CurrentUICulture;
// Detect Simplified Chinese: zh-CN, zh-Hans, zh-Hans-*
return culture.Name.StartsWith("zh-CN", StringComparison.OrdinalIgnoreCase)
|| culture.Name.StartsWith("zh-Hans", StringComparison.OrdinalIgnoreCase);
}
public static int ScoreFuzzy(string needle, string haystack, bool allowNonContiguousMatches = true)
{