From e52dd68fe43db195cfb0769835d39fb6a45ea0c9 Mon Sep 17 00:00:00 2001
From: Jaime Bernardo <jaime@janeasystems.com>
Date: Thu, 20 Mar 2025 20:37:33 +0000
Subject: [PATCH] [OOBE]Show actual CmdPal hotkey (#38067)

<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request

Update OOBE's CmdPal page to show the actual hotkey and style it similar to other OOBE pages.

![image](https://github.com/user-attachments/assets/c92beafc-52c2-4896-90bb-c4a8252f9768)


<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
Open OOBE and verify it looks like other OOBE pages.
---
 .../Settings.UI/SettingsXAML/OOBE/Views/OobeCmdPal.xaml         | 2 +-
 .../Settings.UI/SettingsXAML/OOBE/Views/OobeCmdPal.xaml.cs      | 2 ++
 src/settings-ui/Settings.UI/Strings/en-us/Resources.resw        | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCmdPal.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCmdPal.xaml
index b6889a5060..16ae58e1fc 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCmdPal.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCmdPal.xaml
@@ -13,7 +13,7 @@
             <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_CmdPal_HowToUse" Background="Transparent" />
+                <controls:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_CmdPal_HowToUse" />
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCmdPal.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCmdPal.xaml.cs
index 45298e85fa..ab68213a32 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCmdPal.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCmdPal.xaml.cs
@@ -35,6 +35,8 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             ViewModel.LogOpeningModuleEvent();
+            var hotkey = new CmdPalProperties().Hotkey;
+            HotkeyControl.Keys = hotkey.GetKeysList();
         }
 
         protected override void OnNavigatedFrom(NavigationEventArgs e)
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 9e209f89a7..a95cdb86cd 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -4960,7 +4960,7 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
     <comment>"Command Palette" is a product name</comment>
   </data>
   <data name="Oobe_CmdPal_HowToUse.Text" xml:space="preserve">
-    <value>Select Win+Alt+Space and start typing!</value>
+    <value>and start typing!</value>
   </data>
   <data name="Oobe_CmdPal_TipsAndTricks.Text" xml:space="preserve">
     <value>For this utility to work, the Command Palette must be enabled and running in the background. The Command Palette has a ton of extensions to try out to make your launching experience even better. You can search for available extensions within the palette itself!</value>