Skip to content

[CmdPal] Open CmdPal settings from PT settings #39262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Shawn Yuan (shuaiyuanxx) merged 8 commits into from
May 7, 2025
Merged

[CmdPal] Open CmdPal settings from PT settings #39262

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9d4b65e
Turning description into a hyperlink
niels9001 May 6, 2025
e49f6d6
Update expect.txt
niels9001 May 6, 2025
aa9da87
Update CmdPalPage.xaml.cs
niels9001 May 6, 2025
6c9498e
update xaml format.
shuaiyuanxx May 7, 2025
1df4725
Merge branch 'main' into niels9001/cmdpal-deeplink
shuaiyuanxx May 7, 2025
a9bc2ac
update.
shuaiyuanxx May 7, 2025
3004feb
Added logger
shuaiyuanxx May 7, 2025
09a38e7
update
shuaiyuanxx May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/actions/spell-check/expect.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@ debugbreak
declatory
decryptor
Dedup
Deeplink
DEFAULTBOOTSTRAPPERINSTALLFOLDER
DEFAULTCOLOR
DEFAULTFLAGS
Expand Down
4 changes: 3 additions & 1 deletion src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@
Severity="Informational" />

<controls:SettingsGroup x:Uid="CmdPal_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">

<tkcontrols:SettingsCard x:Uid="CmdPal_ActivationShortcut" HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
<controls:ShortcutControl
MinWidth="{StaticResource SettingActionControlMinWidth}"
HotkeySettings="{x:Bind Path=ViewModel.Hotkey, Mode=OneWay}"
IsEnabled="False" />
<tkcontrols:SettingsCard.Description>
<HyperlinkButton x:Name="CmdPalSettingsDeeplink" x:Uid="CmdPal_DeeplinkContent" Click="CmdPalSettingsDeeplink_Click" />
Comment thread Fixed
Comment thread Fixed
Comment thread Fixed
</tkcontrols:SettingsCard.Description>
</tkcontrols:SettingsCard>
</controls:SettingsGroup>
</StackPanel>
Expand Down
5 changes: 5 additions & 0 deletions src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,10 @@ public void RefreshEnabledState()
{
ViewModel.RefreshEnabledState();
}

private void CmdPalSettingsDeeplink_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
Comment thread Fixed
{
// TO DO: Launch CmdPal settings window
}
}
}
4 changes: 2 additions & 2 deletions src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4996,8 +4996,8 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
<data name="CmdPal_ActivationShortcut.Header" xml:space="preserve">
<value>Activation shortcut</value>
</data>
<data name="CmdPal_ActivationShortcut.Description" xml:space="preserve">
<value>Go to Command Palette settings to customize the activation shortcut.</value>
<data name="CmdPal_DeeplinkContent.Content" xml:space="preserve">
Comment thread Fixed
<value>Open Command Palette settings to customize the activation shortcut</value>
</data>
<data name="Help_chromaCIE" xml:space="preserve">
<value>chroma (CIE LCh)</value>
Expand Down