From be1968aaa5cedf759bd1b30cb846d5cd122a586a Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 24 Mar 2025 21:13:24 +0100
Subject: [PATCH] [CmdPal] Minor tweaks to the General settingspage (#38120)

Minor tweaks to the General settingspage
---
 .../Settings/GeneralPage.xaml                 | 42 +++++++++----------
 .../Strings/en-us/Resources.resw              | 18 +++++---
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml
index 4dafd75622..e8a36e618a 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml
@@ -33,30 +33,28 @@
                   <EntranceThemeTransition FromVerticalOffset="50" />
                   <RepositionThemeTransition IsStaggeringEnabled="False" />
               </StackPanel.ChildrenTransitions>-->
-                    <controls:SettingsExpander
-                        x:Uid="Settings_GeneralPage_ActivationKey_SettingsExpander"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}"
-                        IsExpanded="True">
+
+                    <TextBlock x:Uid="ActivationSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
+                    <controls:SettingsCard x:Uid="Settings_GeneralPage_ActivationKey_SettingsExpander" HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
                         <ptControls:ShortcutControl HotkeySettings="{x:Bind viewModel.Hotkey, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+                    <controls:SettingsCard x:Uid="Settings_GeneralPage_GoHome_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE80F;}">
+                        <ToggleSwitch IsOn="{x:Bind viewModel.HotkeyGoesHome, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+                    <controls:SettingsCard x:Uid="Settings_GeneralPage_HighlightSearch_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE933;}">
+                        <ToggleSwitch IsOn="{x:Bind viewModel.HighlightSearchOnActivate, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+                    <controls:SettingsCard x:Uid="Run_PositionHeader" HeaderIcon="{ui:FontIcon Glyph=&#xe78b;}">
+                        <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind viewModel.MonitorPositionIndex, Mode=TwoWay}">
+                            <ComboBoxItem x:Uid="Run_Radio_Position_Cursor" />
+                            <ComboBoxItem x:Uid="Run_Radio_Position_Primary_Monitor" />
+                            <ComboBoxItem x:Uid="Run_Radio_Position_Focus" />
+                            <ComboBoxItem x:Uid="Run_Radio_Position_In_Place" />
+                        </ComboBox>
+                    </controls:SettingsCard>
 
-                        <controls:SettingsExpander.Items>
-                            <controls:SettingsCard x:Uid="Settings_GeneralPage_GoHome_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE80F;}">
-                                <ToggleSwitch IsOn="{x:Bind viewModel.HotkeyGoesHome, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-                            <controls:SettingsCard x:Uid="Settings_GeneralPage_HighlightSearch_SettingsCard">
-                                <ToggleSwitch IsOn="{x:Bind viewModel.HighlightSearchOnActivate, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-                            <controls:SettingsCard x:Uid="Run_PositionHeader" HeaderIcon="{ui:FontIcon Glyph=&#xe78b;}">
-                                <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind viewModel.MonitorPositionIndex, Mode=TwoWay}">
-                                    <ComboBoxItem x:Uid="Run_Radio_Position_Cursor" />
-                                    <ComboBoxItem x:Uid="Run_Radio_Position_Primary_Monitor" />
-                                    <ComboBoxItem x:Uid="Run_Radio_Position_Focus" />
-                                    <ComboBoxItem x:Uid="Run_Radio_Position_In_Place" />
-                                </ComboBox>
-                            </controls:SettingsCard>
-
-                        </controls:SettingsExpander.Items>
-                    </controls:SettingsExpander>
+                    <TextBlock x:Uid="BehaviorSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
                     <controls:SettingsCard x:Uid="Settings_GeneralPage_ShowAppDetails_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE8A0;}">
                         <ToggleSwitch IsOn="{x:Bind viewModel.ShowAppDetails, Mode=TwoWay}" />
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw b/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
index 1e80c38dd3..03e8c40eaa 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
@@ -326,13 +326,13 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>Go home when activated</value>
   </data>
   <data name="Settings_GeneralPage_GoHome_SettingsCard.Description" xml:space="preserve">
-    <value>If enabled, the Command Palette will return to the home page when activated.</value>
+    <value>Automatically opens the home page upon activation</value>
   </data>
   <data name="Settings_GeneralPage_HighlightSearch_SettingsCard.Header" xml:space="preserve">
     <value>Highlight search on activate</value>
   </data>
   <data name="Settings_GeneralPage_HighlightSearch_SettingsCard.Description" xml:space="preserve">
-    <value>When enabled, the previous search text will be selected when the app is opened.</value>
+    <value>Selects the previous search text at launch</value>
   </data>
   <data name="Settings_GeneralPage_ShowAppDetails_SettingsCard.Header" xml:space="preserve">
     <value>Show app details</value>
@@ -344,13 +344,13 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>Backspace goes back</value>
   </data>
   <data name="Settings_GeneralPage_BackspaceGoesBack_SettingsCard.Description" xml:space="preserve">
-    <value>When enabled, pressing backspace when the search text is empty will take you back.</value>
+    <value>If the search field is empty, backspace returns to the previous page</value>
   </data>
   <data name="Settings_GeneralPage_SingleClickActivation_SettingsCard.Header" xml:space="preserve">
-    <value>Single-click activates</value>
+    <value>Single-click activation</value>
   </data>
   <data name="Settings_GeneralPage_SingleClickActivation_SettingsCard.Description" xml:space="preserve">
-    <value>When enabled, single click activates list items. When disabled, single click selects and double click activates.</value>
+    <value>Choose how to interact with list items: single-click to activate, or single-click to select and double-click to activate</value>
   </data>
   <data name="Settings_GeneralPage_About_SettingsExpander.Header" xml:space="preserve">
     <value>Windows Command Palette</value>
@@ -359,7 +359,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>© 2025. All rights reserved.</value>
   </data>
   <data name="Settings_GeneralPage_About_GithubLink_Hyperlink.Content" xml:space="preserve">
-    <value>View GitHub Repo</value>
+    <value>View GitHub repository</value>
   </data>
   <data name="Settings_GeneralPage_About_SDKDocs_Hyperlink.Content" xml:space="preserve">
     <value>Extension SDK docs</value>
@@ -379,4 +379,10 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="SettingsButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Open Command Palette settings</value>
   </data>
+  <data name="ActivationSettingsHeader.Text" xml:space="preserve">
+    <value>Activation</value>
+  </data>
+  <data name="BehaviorSettingsHeader.Text" xml:space="preserve">
+    <value>Behavior</value>
+  </data>
 </root>
\ No newline at end of file