Skip to content

Commit be1968a

Browse files
niels9001niels9001
authored
[CmdPal] Minor tweaks to the General settingspage (#38120)
Minor tweaks to the General settingspage
1 parent 33cc612 commit be1968a

File tree

2 files changed

+32
-28
lines changed

2 files changed

+32
-28
lines changed

‎src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml

+20-22
Original file line numberDiff line numberDiff line change
@@ -33,30 +33,28 @@
3333
<EntranceThemeTransition FromVerticalOffset="50" />
3434
<RepositionThemeTransition IsStaggeringEnabled="False" />
3535
</StackPanel.ChildrenTransitions>-->
36-
<controls:SettingsExpander
37-
x:Uid="Settings_GeneralPage_ActivationKey_SettingsExpander"
38-
HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}"
39-
IsExpanded="True">
40-
<ptControls:ShortcutControl HotkeySettings="{x:Bind viewModel.Hotkey, Mode=TwoWay}" />
4136

42-
<controls:SettingsExpander.Items>
43-
<controls:SettingsCard x:Uid="Settings_GeneralPage_GoHome_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE80F;}">
44-
<ToggleSwitch IsOn="{x:Bind viewModel.HotkeyGoesHome, Mode=TwoWay}" />
45-
</controls:SettingsCard>
46-
<controls:SettingsCard x:Uid="Settings_GeneralPage_HighlightSearch_SettingsCard">
47-
<ToggleSwitch IsOn="{x:Bind viewModel.HighlightSearchOnActivate, Mode=TwoWay}" />
48-
</controls:SettingsCard>
49-
<controls:SettingsCard x:Uid="Run_PositionHeader" HeaderIcon="{ui:FontIcon Glyph=&#xe78b;}">
50-
<ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind viewModel.MonitorPositionIndex, Mode=TwoWay}">
51-
<ComboBoxItem x:Uid="Run_Radio_Position_Cursor" />
52-
<ComboBoxItem x:Uid="Run_Radio_Position_Primary_Monitor" />
53-
<ComboBoxItem x:Uid="Run_Radio_Position_Focus" />
54-
<ComboBoxItem x:Uid="Run_Radio_Position_In_Place" />
55-
</ComboBox>
56-
</controls:SettingsCard>
37+
<TextBlock x:Uid="ActivationSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
5738

58-
</controls:SettingsExpander.Items>
59-
</controls:SettingsExpander>
39+
<controls:SettingsCard x:Uid="Settings_GeneralPage_ActivationKey_SettingsExpander" HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
40+
<ptControls:ShortcutControl HotkeySettings="{x:Bind viewModel.Hotkey, Mode=TwoWay}" />
41+
</controls:SettingsCard>
42+
<controls:SettingsCard x:Uid="Settings_GeneralPage_GoHome_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE80F;}">
43+
<ToggleSwitch IsOn="{x:Bind viewModel.HotkeyGoesHome, Mode=TwoWay}" />
44+
</controls:SettingsCard>
45+
<controls:SettingsCard x:Uid="Settings_GeneralPage_HighlightSearch_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE933;}">
46+
<ToggleSwitch IsOn="{x:Bind viewModel.HighlightSearchOnActivate, Mode=TwoWay}" />
47+
</controls:SettingsCard>
48+
<controls:SettingsCard x:Uid="Run_PositionHeader" HeaderIcon="{ui:FontIcon Glyph=&#xe78b;}">
49+
<ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind viewModel.MonitorPositionIndex, Mode=TwoWay}">
50+
<ComboBoxItem x:Uid="Run_Radio_Position_Cursor" />
51+
<ComboBoxItem x:Uid="Run_Radio_Position_Primary_Monitor" />
52+
<ComboBoxItem x:Uid="Run_Radio_Position_Focus" />
53+
<ComboBoxItem x:Uid="Run_Radio_Position_In_Place" />
54+
</ComboBox>
55+
</controls:SettingsCard>
56+
57+
<TextBlock x:Uid="BehaviorSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
6058

6159
<controls:SettingsCard x:Uid="Settings_GeneralPage_ShowAppDetails_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE8A0;}">
6260
<ToggleSwitch IsOn="{x:Bind viewModel.ShowAppDetails, Mode=TwoWay}" />

‎src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw

+12-6
Original file line numberDiff line numberDiff line change
@@ -326,13 +326,13 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
326326
<value>Go home when activated</value>
327327
</data>
328328
<data name="Settings_GeneralPage_GoHome_SettingsCard.Description" xml:space="preserve">
329-
<value>If enabled, the Command Palette will return to the home page when activated.</value>
329+
<value>Automatically opens the home page upon activation</value>
330330
</data>
331331
<data name="Settings_GeneralPage_HighlightSearch_SettingsCard.Header" xml:space="preserve">
332332
<value>Highlight search on activate</value>
333333
</data>
334334
<data name="Settings_GeneralPage_HighlightSearch_SettingsCard.Description" xml:space="preserve">
335-
<value>When enabled, the previous search text will be selected when the app is opened.</value>
335+
<value>Selects the previous search text at launch</value>
336336
</data>
337337
<data name="Settings_GeneralPage_ShowAppDetails_SettingsCard.Header" xml:space="preserve">
338338
<value>Show app details</value>
@@ -344,13 +344,13 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
344344
<value>Backspace goes back</value>
345345
</data>
346346
<data name="Settings_GeneralPage_BackspaceGoesBack_SettingsCard.Description" xml:space="preserve">
347-
<value>When enabled, pressing backspace when the search text is empty will take you back.</value>
347+
<value>If the search field is empty, backspace returns to the previous page</value>
348348
</data>
349349
<data name="Settings_GeneralPage_SingleClickActivation_SettingsCard.Header" xml:space="preserve">
350-
<value>Single-click activates</value>
350+
<value>Single-click activation</value>
351351
</data>
352352
<data name="Settings_GeneralPage_SingleClickActivation_SettingsCard.Description" xml:space="preserve">
353-
<value>When enabled, single click activates list items. When disabled, single click selects and double click activates.</value>
353+
<value>Choose how to interact with list items: single-click to activate, or single-click to select and double-click to activate</value>
354354
</data>
355355
<data name="Settings_GeneralPage_About_SettingsExpander.Header" xml:space="preserve">
356356
<value>Windows Command Palette</value>
@@ -359,7 +359,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
359359
<value>© 2025. All rights reserved.</value>
360360
</data>
361361
<data name="Settings_GeneralPage_About_GithubLink_Hyperlink.Content" xml:space="preserve">
362-
<value>View GitHub Repo</value>
362+
<value>View GitHub repository</value>
363363
</data>
364364
<data name="Settings_GeneralPage_About_SDKDocs_Hyperlink.Content" xml:space="preserve">
365365
<value>Extension SDK docs</value>
@@ -379,4 +379,10 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
379379
<data name="SettingsButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
380380
<value>Open Command Palette settings</value>
381381
</data>
382+
<data name="ActivationSettingsHeader.Text" xml:space="preserve">
383+
<value>Activation</value>
384+
</data>
385+
<data name="BehaviorSettingsHeader.Text" xml:space="preserve">
386+
<value>Behavior</value>
387+
</data>
382388
</root>

0 commit comments

Comments
 (0)