Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'shawn/quickAccessImprove' of https://github.com/microsoft/PowerToys into shawn/quickAccessImprove

Browse Source
This commit is contained in:
Shawn Yuan (from Dev Box)
2025-12-10 10:49:31 +08:00
parent e038a09357 f6e6fe676a
commit d6ae07c040
3 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/settings-ui/QuickAccess.UI/QuickAccessXAML/MainWindow.xaml
View File

@@ -7,16 +7,17 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:winuiEx="using:WinUIEx" xmlns:winuiEx="using:WinUIEx"
Title="PowerToys Quick Access (Preview)" Title="PowerToys Quick Access (Preview)"
Width="420" Width="386"
Height="268" Height="486"
MinWidth="420" MinWidth="386"
MinHeight="268" MinHeight="486"
IsAlwaysOnTop="True" IsAlwaysOnTop="True"
IsMaximizable="False" IsMaximizable="False"
IsMinimizable="False" IsMinimizable="False"
IsResizable="False" IsResizable="False"
IsShownInSwitchers="False"
IsTitleBarVisible="False"
mc:Ignorable="d"> mc:Ignorable="d">
<winuiEx:WindowEx.Backdrop> <winuiEx:WindowEx.Backdrop>
<winuiEx:AcrylicSystemBackdrop <winuiEx:AcrylicSystemBackdrop
DarkFallbackColor="#1c1c1c" DarkFallbackColor="#1c1c1c"

48
src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
View File

@@ -273,32 +273,6 @@
</ComboBox> </ComboBox>
</tkcontrols:SettingsCard> </tkcontrols:SettingsCard>
<tkcontrols:SettingsExpander
Name="GeneralPageEnableQuickAccess"
x:Uid="GeneralPage_EnableQuickAccess"
HeaderIcon="{ui:FontIcon Glyph=&#xE71D;}"
IsExpanded="True">
<ToggleSwitch
x:Uid="ToggleSwitch"
AutomationProperties.Name="{Binding ElementName=GeneralPageEnableQuickAccess, Path=Header}"
IsOn="{x:Bind ViewModel.EnableQuickAccess, Mode=TwoWay}" />
<tkcontrols:SettingsExpander.Items>
<!-- HACK: For some weird reason, a ShortcutControl does not work correctly if it's the first or last item in the expander, so we add an invisible card. -->
<tkcontrols:SettingsCard Visibility="Collapsed" />
<tkcontrols:SettingsCard
Name="QuickAccessShortcut"
x:Uid="GeneralPage_QuickAccessShortcut"
IsEnabled="{x:Bind ViewModel.EnableQuickAccess, Mode=OneWay}">
<tkcontrols:SettingsCard.Description>
<TextBlock x:Uid="GeneralPage_QuickAccessShortcut_Description" />
</tkcontrols:SettingsCard.Description>
<controls:ShortcutControl
HotkeySettings="{x:Bind ViewModel.QuickAccessShortcut, Mode=TwoWay}" />
</tkcontrols:SettingsCard>
<tkcontrols:SettingsCard Visibility="Collapsed" />
</tkcontrols:SettingsExpander.Items>
</tkcontrols:SettingsExpander>
<tkcontrols:SettingsCard <tkcontrols:SettingsCard
Name="GeneralPageRunAtStartUp" Name="GeneralPageRunAtStartUp"
x:Uid="GeneralPage_RunAtStartUp" x:Uid="GeneralPage_RunAtStartUp"
@@ -317,6 +291,28 @@
Toggled="ShowSystemTrayIcon_Toggled" /> Toggled="ShowSystemTrayIcon_Toggled" />
</tkcontrols:SettingsCard> </tkcontrols:SettingsCard>
</controls:GPOInfoControl> </controls:GPOInfoControl>
<tkcontrols:SettingsExpander
Name="GeneralPageEnableQuickAccess"
x:Uid="GeneralPage_EnableQuickAccess"
HeaderIcon="{ui:FontIcon Glyph=&#xE91C;}"
IsExpanded="True">
<ToggleSwitch
x:Uid="ToggleSwitch"
AutomationProperties.Name="{Binding ElementName=GeneralPageEnableQuickAccess, Path=Header}"
IsOn="{x:Bind ViewModel.EnableQuickAccess, Mode=TwoWay}" />
<tkcontrols:SettingsExpander.Items>
<!-- HACK: For some weird reason, a ShortcutControl does not work correctly if it's the first or last item in the expander, so we add an invisible card. -->
<tkcontrols:SettingsCard Visibility="Collapsed" />
<tkcontrols:SettingsCard
Name="QuickAccessShortcut"
x:Uid="GeneralPage_QuickAccessShortcut"
IsEnabled="{x:Bind ViewModel.EnableQuickAccess, Mode=OneWay}">
<controls:ShortcutControl HotkeySettings="{x:Bind ViewModel.QuickAccessShortcut, Mode=TwoWay}" />
</tkcontrols:SettingsCard>
<tkcontrols:SettingsCard Visibility="Collapsed" />
</tkcontrols:SettingsExpander.Items>
</tkcontrols:SettingsExpander>
</controls:SettingsGroup> </controls:SettingsGroup>
<controls:SettingsGroup x:Uid="General_SettingsBackupAndRestoreTitle" Visibility="Visible"> <controls:SettingsGroup x:Uid="General_SettingsBackupAndRestoreTitle" Visibility="Visible">

9
src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
View File

@@ -5764,16 +5764,13 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
<comment>Fluent Design is a product name, do not loc</comment> <comment>Fluent Design is a product name, do not loc</comment>
</data> </data>
<data name="GeneralPage_EnableQuickAccess.Header" xml:space="preserve"> <data name="GeneralPage_EnableQuickAccess.Header" xml:space="preserve">
<value>Enable Quick Access flyout</value> <value>Quick Access flyout</value>
</data> </data>
<data name="GeneralPage_EnableQuickAccess.Description" xml:space="preserve"> <data name="GeneralPage_EnableQuickAccess.Description" xml:space="preserve">
<value>Keep the Quick Access process in memory for easy access to your favorite tools</value> <value>Fast access to quick actions and module toggles</value>
</data> </data>
<data name="GeneralPage_QuickAccessShortcut.Header" xml:space="preserve"> <data name="GeneralPage_QuickAccessShortcut.Header" xml:space="preserve">
<value>Activation Shortcut</value> <value>Activation shortcut</value>
</data>
<data name="GeneralPage_QuickAccessShortcut_Description.Text" xml:space="preserve">
<value>Change the activation shortcut for Quick Access</value>
</data> </data>
</root> </root>