mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-12 02:09:24 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

[Settings]Peek settings UX consistency (#26012)

Browse Source
This commit is contained in:
Niels Laute 2023-05-15 18:22:10 +02:00 committed by GitHub
parent d50f092403
commit 5aa58bf922
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2428,6 +2428,9 @@ From there, simply click on one of the supported files in the File Explorer and
<data name="AlwaysOnTop_Activation_GroupSettings.Header" xml:space="preserve"> <data name="AlwaysOnTop_Activation_GroupSettings.Header" xml:space="preserve">
<value>Activation</value> <value>Activation</value>
</data> </data>
<data name="Peek_Activation_GroupSettings.Header" xml:space="preserve">
<value>Activation</value>
</data>
<data name="AlwaysOnTop_EnableToggleControl_HeaderText.Header" xml:space="preserve"> <data name="AlwaysOnTop_EnableToggleControl_HeaderText.Header" xml:space="preserve">
<value>Enable Always On Top</value> <value>Enable Always On Top</value>
<comment>"Always On Top" is the name of the utility</comment> <comment>"Always On Top" is the name of the utility</comment>

17
src/settings-ui/Settings.UI/Views/PeekPage.xaml
View File

@ -14,9 +14,10 @@
<controls:SettingsPageControl x:Uid="Peek" ModuleImageSource="ms-appx:///Assets/Modules/Peek.png"> <controls:SettingsPageControl x:Uid="Peek" ModuleImageSource="ms-appx:///Assets/Modules/Peek.png">
<controls:SettingsPageControl.ModuleContent> <controls:SettingsPageControl.ModuleContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<labs:SettingsCard x:Uid="Peek_EnablePeek" <labs:SettingsCard
HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsPeek.png}" x:Uid="Peek_EnablePeek"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}"> HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsPeek.png}"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
<ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" /> <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
</labs:SettingsCard> </labs:SettingsCard>
<InfoBar <InfoBar
@ -26,11 +27,11 @@
IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}" IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
Severity="Informational" /> Severity="Informational" />
<labs:SettingsCard x:Uid="Shortcut" <controls:SettingsGroup x:Uid="Peek_Activation_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}" <labs:SettingsCard x:Uid="Activation_Shortcut" HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEDA7;}">
HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEDA7;}"> <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.ActivationShortcut, Mode=TwoWay}" />
<controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.ActivationShortcut, Mode=TwoWay}" /> </labs:SettingsCard>
</labs:SettingsCard> </controls:SettingsGroup>
</StackPanel> </StackPanel>
</controls:SettingsPageControl.ModuleContent> </controls:SettingsPageControl.ModuleContent>
</controls:SettingsPageControl> </controls:SettingsPageControl>