diff --git a/PowerToys/src/Version.props b/PowerToys/src/Version.props index 910572d..82325d0 100644 --- a/PowerToys/src/Version.props +++ b/PowerToys/src/Version.props @@ -1,6 +1,6 @@ - 0.73.0 + 0.74.0 diff --git a/PowerToys/src/common/interop/keyboard_layout.cpp b/PowerToys/src/common/interop/keyboard_layout.cpp index f066b97..da9ae12 100644 --- a/PowerToys/src/common/interop/keyboard_layout.cpp +++ b/PowerToys/src/common/interop/keyboard_layout.cpp @@ -145,6 +145,7 @@ void LayoutMap::LayoutMapImpl::UpdateLayout() keyboardLayoutMap[VK_RETURN | numpadOriginBit] = L"Enter (С¼üÅÌ)"; keyboardLayoutMap[VK_DIVIDE | numpadOriginBit] = L"/ (С¼üÅÌ)"; + keyboardLayoutMap[VK_SUBTRACT] = L"- (С¼üÅÌ)"; keyboardLayoutMap[VK_SELECT] = L"Select"; keyboardLayoutMap[VK_PRINT] = L"Print"; keyboardLayoutMap[VK_EXECUTE] = L"Execute"; diff --git a/PowerToys/src/modules/FileLocksmith/FileLocksmithUI/Strings/en-us/Resources.resw b/PowerToys/src/modules/FileLocksmith/FileLocksmithUI/Strings/en-us/Resources.resw index 4d9aab5..21f5044 100644 --- a/PowerToys/src/modules/FileLocksmith/FileLocksmithUI/Strings/en-us/Resources.resw +++ b/PowerToys/src/modules/FileLocksmith/FileLocksmithUI/Strings/en-us/Resources.resw @@ -117,11 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 文件师傅 - - + 文件师傅 + Title of the window when running as user. æ— å ç”¨ @@ -162,4 +160,8 @@ 用户 + + 管ç†å‘˜æƒé™: 文件师傅 + Title of the window when running as administrator. + \ No newline at end of file diff --git a/PowerToys/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml b/PowerToys/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml deleted file mode 100644 index fff8c27..0000000 --- a/PowerToys/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PowerToys/src/modules/Hosts/Hosts/Strings/en-us/Resources.resw b/PowerToys/src/modules/Hosts/Hosts/Strings/en-us/Resources.resw index 5c67716..c2de95b 100644 --- a/PowerToys/src/modules/Hosts/Hosts/Strings/en-us/Resources.resw +++ b/PowerToys/src/modules/Hosts/Hosts/Strings/en-us/Resources.resw @@ -216,10 +216,18 @@ 域å表文件被其他软件改动。 "Hosts" refers to the system hosts file, do not loc - + + 无法ä¿å­˜åŸŸå表文件，因为文件被其他软件所å ç”¨ã€‚ + "Hosts" refers to the system hosts file, do not loc + + 无法ä¿å­˜åŸŸå表文件。 "Hosts" refers to the system hosts file, do not loc + + 无法ä¿å­˜åŸŸå表文件，需è¦ç®¡ç†å‘˜æƒé™ã€‚ + "Hosts" refers to the system hosts file, do not loc + 筛选 @@ -300,8 +308,12 @@ 警告 + + 管ç†å‘˜æƒé™: 域å表编辑器 + Title of the window when running as administrator. "Hosts File Editor" is the name of the utility. "Hosts" refers to the system hosts file, do not loc + 域å表编辑器 - "Hosts File Editor" is the name of the utility. "Hosts" refers to the system hosts file, do not loc + Title of the window when running as user. "Hosts File Editor" is the name of the utility. "Hosts" refers to the system hosts file, do not loc \ No newline at end of file diff --git a/PowerToys/src/modules/MouseWithoutBorders/App/Class/Common.Log.cs b/PowerToys/src/modules/MouseWithoutBorders/App/Class/Common.Log.cs index 2b0ce8a..3a6eede 100644 --- a/PowerToys/src/modules/MouseWithoutBorders/App/Class/Common.Log.cs +++ b/PowerToys/src/modules/MouseWithoutBorders/App/Class/Common.Log.cs @@ -90,7 +90,19 @@ internal static void SuspendAllThreadsBut(int threadId) lock (ThreadsLock) { #pragma warning disable 618 // Temporary - threads.Where(t => t.IsAlive && t.ManagedThreadId != threadId).ToList().ForEach(t => t.Suspend()); + threads.Where(t => t.IsAlive && t.ManagedThreadId != threadId).ToList().ForEach( + t => + { + try + { + t.Suspend(); + } + catch (Exception) + { + // This method is suspending every thread so that it can kill the process right after restarting. + // Makes no sense to crash on a thread suspension fail, since we're killing the process afterwards, anyway. + } + }); #pragma warning restore 618 } } diff --git a/PowerToys/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Main.cs b/PowerToys/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Main.cs index 77b282a..7c9cf42 100644 --- a/PowerToys/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Main.cs +++ b/PowerToys/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Main.cs @@ -47,6 +47,21 @@ public class Main : IPlugin, IPluginI18n, ISettingProvider, IContextMenu, ISavab DisplayLabel = Resources.wox_leave_shell_open, Value = _settings.LeaveShellOpen, }, + + new PluginAdditionalOption() + { + Key = "ShellCommandExecution", + DisplayLabel = Resources.wox_shell_command_execution, + PluginOptionType = PluginAdditionalOption.AdditionalOptionType.Combobox, + ComboBoxOptions = new List + { + Resources.run_command_in_command_prompt, + Resources.run_command_in_powershell, + Resources.find_executable_file_and_run_it, + Resources.run_command_in_windows_terminal, + }, + ComboBoxValue = (int)_settings.Shell, + }, }; private PluginInitContext _context; @@ -418,12 +433,17 @@ public List LoadContextMenus(Result selectedResult) public void UpdateSettings(PowerLauncherPluginSettings settings) { var leaveShellOpen = false; + var shellOption = 2; if (settings != null && settings.AdditionalOptions != null) { var optionLeaveShellOpen = settings.AdditionalOptions.FirstOrDefault(x => x.Key == "LeaveShellOpen"); leaveShellOpen = optionLeaveShellOpen?.Value ?? leaveShellOpen; _settings.LeaveShellOpen = leaveShellOpen; + + var optionShell = settings.AdditionalOptions.FirstOrDefault(x => x.Key == "ShellCommandExecution"); + shellOption = optionShell?.ComboBoxValue ?? shellOption; + _settings.Shell = (ExecutionShell)shellOption; } Save(); diff --git a/PowerToys/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Properties/Resources.resx b/PowerToys/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Properties/Resources.resx index 4c225cb..d2e7724 100644 --- a/PowerToys/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Properties/Resources.resx +++ b/PowerToys/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Properties/Resources.resx @@ -144,4 +144,19 @@ ä¿æŒç»ˆç«¯çª—å£æ‰“å¼€ + + å‘½ä»¤æ‰§è¡Œæ–¹å¼ + + + 命令æ示符 (cmd.exe) + + + PowerShell (PowerShell.exe) + + + 寻找并执行å¯æ‰§è¡Œæ–‡ä»¶ + + + Windows Terminal (wt.exe) + \ No newline at end of file diff --git a/PowerToys/src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewXAML/MainWindow.xaml.cs b/PowerToys/src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewXAML/MainWindow.xaml.cs index 66be8b9..9032885 100644 --- a/PowerToys/src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewXAML/MainWindow.xaml.cs +++ b/PowerToys/src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewXAML/MainWindow.xaml.cs @@ -97,6 +97,8 @@ internal MainWindow() UpdateToolBarAndUI(false); UpdateWindowTitle(resourceLoader.GetString("FileNotFound")); } + + ManagedCommon.WindowHelpers.BringToForeground(windowHandle); } private void MainWindow_Activated(object sender, WindowActivatedEventArgs args) diff --git a/PowerToys/src/modules/registrypreview/RegistryPreviewUI/Strings/en-US/Resources.resw b/PowerToys/src/modules/registrypreview/RegistryPreviewUI/Strings/en-US/Resources.resw index 490b0cf..14d4836 100644 --- a/PowerToys/src/modules/registrypreview/RegistryPreviewUI/Strings/en-US/Resources.resw +++ b/PowerToys/src/modules/registrypreview/RegistryPreviewUI/Strings/en-US/Resources.resw @@ -138,6 +138,12 @@ 注册表文件 (*.reg) + + (无效二进制值) + + + (无效 DWORD (32 ä½) 值) + (无效 QWORD (64 ä½) 值) @@ -147,6 +153,9 @@ éžæ³¨å†Œè¡¨æ–‡ä»¶ + + (无效字符串值) + 大于 10MB，注册表预览工具无法打开该文件。 diff --git a/PowerToys/src/runner/Resources.resx b/PowerToys/src/runner/Resources.resx index b77074d..679c866 100644 --- a/PowerToys/src/runner/Resources.resx +++ b/PowerToys/src/runner/Resources.resx @@ -126,4 +126,7 @@ PowerToys 新版本安装完æˆï¼Œç”±äºŽç¨‹åºæ–‡ä»¶è·¯å¾„å˜æ›´ï¼Œéœ€è¦é‡å¯ç”µè„‘，æ¥é‡æ–°åŠ è½½ç³»ç»Ÿé›†æˆåŠŸèƒ½ã€‚ File Explorer refers to the Windows File Explorer application. - + + 管ç†å‘˜æƒé™ + + \ No newline at end of file diff --git a/PowerToys/src/runner/main.cpp b/PowerToys/src/runner/main.cpp index 767bf9b..ff29167 100644 --- a/PowerToys/src/runner/main.cpp +++ b/PowerToys/src/runner/main.cpp @@ -100,7 +100,7 @@ int runner(bool isProcessElevated, bool openSettings, std::string settingsWindow //init_global_error_handlers(); #endif Trace::RegisterProvider(); - start_tray_icon(); + start_tray_icon(isProcessElevated); CentralizedKeyboardHook::Start(); int result = -1; diff --git a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs index bd18499..aecb066 100644 --- a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs +++ b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs @@ -288,6 +288,7 @@ public static void HandleThemeChange() { var hWnd = WinRT.Interop.WindowNative.GetWindowHandle(oobeWindow); ThemeHelpers.SetImmersiveDarkMode(hWnd, isDark); + oobeWindow.SetTheme(isDark); SetContentTheme(isDark, oobeWindow); } diff --git a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml index dd466c2..0446853 100644 --- a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml +++ b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml @@ -2,10 +2,10 @@ x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeShellPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:animations="using:CommunityToolkit.WinUI.UI.Animations" + xmlns:animations="using:CommunityToolkit.WinUI.Animations" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + xmlns:ui="using:CommunityToolkit.WinUI" HighContrastAdjustment="None" Loaded="ShellPage_Loaded" mc:Ignorable="d"> @@ -171,7 +171,7 @@ diff --git a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml index 1cbdd2f..3c7bed1 100644 --- a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml +++ b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml @@ -2,12 +2,12 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.AwakePage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + xmlns:ui="using:CommunityToolkit.WinUI" xmlns:viewmodels="using:Microsoft.PowerToys.Settings.UI.ViewModels" d:DataContext="{d:DesignInstance Type=viewmodels:AwakeViewModel}" AutomationProperties.LandmarkType="Main" @@ -17,20 +17,18 @@ - - - - + + - - + + - + - - + + - + - - - - - - - - - - + HeaderIcon="{ui:FontIcon Glyph=}" + IsExpanded="True" + Visibility="{x:Bind ViewModel.IsExpirationConfigurationEnabled, Mode=OneWay}"> + + + + + + + + + - - + - + - - - - + + + - + - - - - - - - + + + + + + + diff --git a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml index e61d52d..d307325 100644 --- a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml +++ b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml @@ -2,13 +2,13 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.ColorPickerPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" - xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:converters="using:CommunityToolkit.WinUI.Converters" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:models="using:Microsoft.PowerToys.Settings.UI.Library" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + xmlns:ui="using:CommunityToolkit.WinUI" xmlns:viewmodels="using:Microsoft.PowerToys.Settings.UI.ViewModels" x:Name="RootPage" d:DataContext="{d:DesignInstance Type=viewmodels:ColorPickerViewModel}" @@ -19,19 +19,19 @@ - - + + - - + - - - - + + + + - + - + - + - - + + - + - + - + - + - - + + HeaderIcon="{ui:FontIcon Glyph=}"> - + - + + Closed="ColorFormatDialog_Closed"> - - + - - - - - - - - + + + + + + + + diff --git a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml index 8742529..ccec498 100644 --- a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml +++ b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml @@ -2,14 +2,14 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.ImageResizerPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:models="using:Microsoft.PowerToys.Settings.UI.Library" xmlns:toolkitconverters="using:CommunityToolkit.WinUI.UI.Converters" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + xmlns:ui="using:CommunityToolkit.WinUI" x:Name="RootPage" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> @@ -21,15 +21,15 @@ FalseValue="1" TrueValue="0" /> - - + + - - + - - + + - + - + - - + + @@ -191,25 +191,25 @@ - + - + - + - + - + - + @@ -219,11 +219,11 @@ - - + + - - + + - + - + - - + + - + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml index 62bf940..95e819e 100644 --- a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml +++ b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml @@ -2,52 +2,51 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.MouseUtilsPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:converters="using:CommunityToolkit.WinUI.Converters" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:localConverters="using:Microsoft.PowerToys.Settings.UI.Converters" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - + + - - - - - + + + + - - + + - - + + + - - + + - - - - - - + + + + + + + + + - - - + + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - + + + + - - + + - - - - + + + + - - + - - + + - - - - - - - - - + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - + + - - - - + + + + - - + - - + + - - - - - + + + + - + - - + + - - + - - + + - - - - - - - - + + + + + + + - - - - - - + + + + + - + - + - + - + - + - - - + + + - + - - - - - + + + + + - - - + + + - + - - - - + + + + - - - - - - - - - + + + + + + + + + diff --git a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml index c13049d..fcb80d5 100644 --- a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml +++ b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml @@ -2,27 +2,26 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.MouseWithoutBordersPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" - xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:toolkitConverters="using:CommunityToolkit.WinUI.UI.Converters" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + - - + + - - + @@ -30,28 +29,27 @@ x:Uid="ToggleSwitch" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.CanBeEnabled}" IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.IsEnabled}" /> - + - - - + + - - + + + x:Uid="MWB_SecurityKeyLabel" + Width="248" /> - - + + - - - - + + + @@ -125,10 +123,10 @@ Width="136" Height="90" Margin="4" - BorderThickness="2" AllowDrop="{Binding Mode=OneWay, Path=Item.CanDragDrop}" Background="{ThemeResource SolidBackgroundFillColorBaseAltBrush}" BorderBrush="{Binding Item.StatusBrush}" + BorderThickness="2" CanDrag="{Binding Mode=OneWay, Path=Item.CanDragDrop}" CornerRadius="4" DataContext="{Binding}" @@ -161,14 +159,14 @@ - + + - - - - + + + + - + - - - - + IsClickEnabled="{x:Bind Mode=OneWay, Path=ViewModel.CanUninstallService}" + IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.CanUninstallService}" /> + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - + - - - - - - + + + + + + - - - - - - + + + + + + - + - - + + - - - - - - - - - + + + + + + + + + diff --git a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml index 3ad16b0..8dc9dcd 100644 --- a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml +++ b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml @@ -2,28 +2,26 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerAccentPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - - - + + - - + + - - - + + + - - + + - - - - + + + + @@ -91,19 +75,12 @@ - - + + - - - + + + @@ -114,25 +91,20 @@ - - + + - - + + - - + + - - + + - - + + - + - - - + + + - - - - + + + + - + - - - - - - - + + + + + + + diff --git a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml index 4b4cbe7..a6e16e8 100644 --- a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml +++ b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml @@ -3,30 +3,26 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:ViewModels="using:Microsoft.PowerToys.Settings.UI.ViewModels" - xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:i="using:Microsoft.Xaml.Interactivity" xmlns:ic="using:Microsoft.Xaml.Interactions.Core" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - + + - - + - - - - - - - - - - - + + + + + + + + + + + - - + - - + + - - + + - - - + + + - - - - - - - + + + + + + - - - + + - - - - - - + + + + + + - - - + + + - + - + IsOn="{x:Bind ViewModel.UsePinyin, Mode=TwoWay}" /> + - + + + + + - - - + + + - + - - - - - + + + + + - - + + - + - + - - + + - + - + - + @@ -302,9 +250,7 @@ IsTabStop="{x:Bind ViewModel.ShowAllPluginsDisabledWarning, Mode=OneWay}" Severity="Error" /> - + - + - + - - + + - - + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - + - - - + + + - + - - - - - - - - - - + + + + + + + + + + diff --git a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml index 5a1e53d..2b24337 100644 --- a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml +++ b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml @@ -2,28 +2,26 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerOcrPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - - - + + + - - + + - + - - - - - + + + + + - - - + SelectedIndex="{x:Bind Path=ViewModel.LanguageIndex, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" + SelectedValue="{Binding SelectedColorRepresentationValue, Mode=TwoWay}" /> + + - + - - - - - - - + + + + + + + diff --git a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml index a3a4f3a..2ceef15 100644 --- a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml +++ b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml @@ -2,59 +2,55 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerPreviewPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - - - + + + + - - - - - + + + + - - - + + + + + - - - + SelectedIndex="{x:Bind Path=ViewModel.SVGRenderBackgroundCheckeredShade, Mode=TwoWay}"> - - - + + + - - - + + - - - - - - - - + + + + + + - - + + - - - + + + - - - + + - - - + + - + - + - - - + + - - - + + - - - + + - - - - - - - - + + + + + + + - + - + - - - - - - - - + + + + + + + + diff --git a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml index 8961e60..f51048f 100644 --- a/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml +++ b/PowerToys/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml @@ -2,115 +2,84 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerRenamePage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - - + + - - - + + + - - - - - - + + + + + + - + - - - - - + + + + + - - - + + + - - - - - - - - - + + + + + + + + + - + - - - - - - - + + + + + + + diff --git a/PowerToys/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/PowerToys/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw index ddb0930..a8f8e44 100644 --- a/PowerToys/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw +++ b/PowerToys/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw @@ -1,4 +1,4 @@ - +