diff --git a/Directory.Packages.props b/Directory.Packages.props index b1ac031408..75b2399c8a 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,6 +7,7 @@ + diff --git a/NOTICE.md b/NOTICE.md index a0d87d429c..6ca3cbfceb 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1498,6 +1498,7 @@ SOFTWARE. - CoenM.ImageSharp.ImageHash - CommunityToolkit.Common - CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock +- CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView - CommunityToolkit.Mvvm - CommunityToolkit.WinUI.Animations - CommunityToolkit.WinUI.Collections diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/CmdPal_Background.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/CmdPal_Background.png new file mode 100644 index 0000000000..929a637d34 Binary files /dev/null and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/CmdPal_Background.png differ diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/CmdPal_Hero.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/CmdPal_Hero.png new file mode 100644 index 0000000000..a8889dcc05 Binary files /dev/null and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/CmdPal_Hero.png differ diff --git a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj index 057413a408..a6751adb98 100644 --- a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj +++ b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj @@ -28,6 +28,8 @@ + + @@ -71,6 +73,7 @@ + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml index 765cd88ff0..9574094e77 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml @@ -30,6 +30,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + - - - - - - + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs index 145fc9b592..f295bdd655 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs @@ -63,12 +63,20 @@ namespace Microsoft.PowerToys.Settings.UI.Views } } - private void CmdPalSettingsDeeplink_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e) + private void SettingsCard_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e) { // Launch CmdPal settings window as normal user using explorer string launchPath = "explorer.exe"; string launchArgs = "x-cmdpal://settings"; LaunchApp(launchPath, launchArgs); } + + private void LaunchCard_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e) + { + // Launch CmdPal window as normal user using explorer + string launchPath = "explorer.exe"; + string launchArgs = "x-cmdpal"; + LaunchApp(launchPath, launchArgs); + } } } diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw index 3bb86ea7f1..e50cd477c9 100644 --- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw +++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw @@ -5159,25 +5159,12 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m System Tools - - Command Palette - - - A better quick launcher - - - Open Command Palette - Enable Command Palette - "Command Palette" is the name of the utility. - - - A fully extensible quick launcher with a richer display and additional capabilities without sacrificing performance. + Command Palette is a product name, do not loc - Learn more about Command Palette - Command Palette is a product name, do not loc + Learn more Command Palette @@ -5185,11 +5172,11 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m A fully extensible quick launcher with a richer display and additional capabilities without sacrificing performance. - "Command Palette" is a product name + Command Palette is a product name, do not loc Command Palette - "Command Palette" is a product name + Command Palette is a product name, do not loc and start typing! @@ -5222,14 +5209,8 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m Retry - - Activation - - - Activation shortcut - - - Open Command Palette settings to customize the activation shortcut + + Settings chroma (CIE LCh) @@ -5753,4 +5734,51 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m Display a preview of the current clipboard content + + Learn more + + + Foundry Local is still in public preview + Do not loc "Foundry Local" + + + Configure the activation shortcut, extensions, behavior and much more + + + Open Command Palette + Command Palette is a product name, do not loc + + + A better quick launcher + + + Find files, launch apps, and do so much more with the most extensible quick launcher. + + + Command Palette + Command Palette is a product name, do not loc + + + Open Command Palette + Command Palette is a product name, do not loc + + + Powerful extensions help you do more + + + Extensible + + + Find files and launch apps in an instant + + + Fast + + + Beautiful + + + A modern UI built with Fluent Design + Fluent Design is a product name, do not loc + \ No newline at end of file