Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-08 12:18:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated pages

Browse Source
This commit is contained in:
Niels Laute
2021-07-22 11:01:34 +02:00
parent 37110dd470
commit 4bac5d2ae3
15 changed files with 125 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SidePanel/SettingsPageControl.xaml
View File

@@ -6,14 +6,13 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters" xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
mc:Ignorable="d" mc:Ignorable="d">
>
<UserControl.Resources> <UserControl.Resources>
<converters:DoubleToVisibilityConverter x:Name="doubleToVisibilityConverter" GreaterThan="0" TrueValue="Visible" FalseValue="Collapsed" /> <converters:DoubleToVisibilityConverter x:Name="doubleToVisibilityConverter" GreaterThan="0" TrueValue="Visible" FalseValue="Collapsed" />
</UserControl.Resources> </UserControl.Resources>
<Grid RowSpacing="{StaticResource DefaultRowSpacing}"> <Grid RowSpacing="{StaticResource DefaultRowSpacing}" Margin="0">
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="LayoutVisualStates"> <VisualStateGroup x:Name="LayoutVisualStates">
<VisualState x:Name="WideLayout"> <VisualState x:Name="WideLayout">
@@ -29,13 +28,14 @@
<VisualState.Setters> <VisualState.Setters>
<Setter Target="SidePanel.(Grid.Column)" Value="0"/> <Setter Target="SidePanel.(Grid.Column)" Value="0"/>
<Setter Target="SidePanel.Width" Value="Auto"/> <Setter Target="SidePanel.Width" Value="Auto"/>
<Setter Target="ModuleContentPresenter.(Grid.Row)" Value="1" /> <Setter Target="SidePanel.Margin" Value="24,0,24,0"/>
<Setter Target="ModuleContentPresenter.Margin" Value="0" /> <Setter Target="ModuleContentPresenter.(Grid.Row)" Value="2" />
<Setter Target="ModuleContentPresenter.Margin" Value="24,0,0,0" />
<Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage" /> <Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage" />
<Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage" /> <Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage" />
<Setter Target="LinksPanel.Margin" Value="0,12,0,0" /> <Setter Target="LinksPanel.Margin" Value="0,12,0,0" />
<Setter Target="AboutImage.Margin" Value="0,12,12,0" /> <Setter Target="AboutImage.Margin" Value="-12,12,12,0" />
<Setter Target="AboutTitle.Visibility" Value="Collapsed" /> <Setter Target="Header.Margin" Value="24,44,0,0" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
@@ -45,34 +45,43 @@
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock x:Name="Header"
Text="{x:Bind ModuleTitle}"
FontWeight="SemiBold"
FontSize="28"
Margin="48,44,0,0"
VerticalAlignment="Stretch"/>
<ContentPresenter x:Name="ModuleContentPresenter" <ContentPresenter x:Name="ModuleContentPresenter"
Content="{x:Bind ModuleContent}" Content="{x:Bind ModuleContent}"
Margin="0,0,48,0" Margin="48,12,48,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Grid.Row="1"
MaxWidth="{StaticResource MaxContentWidth}"/> MaxWidth="{StaticResource MaxContentWidth}"/>
<RelativePanel Grid.Column="1" x:Name="SidePanel" Width="{StaticResource SidePanelWidth}"> <RelativePanel Grid.Column="1"
<StackPanel x:Name="DescriptionPanel"> Grid.Row="1"
<TextBlock x:Name="AboutTitle" x:Name="SidePanel"
Text="{x:Bind ModuleTitle}" Width="{StaticResource SidePanelWidth}"
Style="{StaticResource SettingsGroupTitleStyle}" Margin="0,12,48,0">
Margin="{StaticResource XSmallBottomMargin}"/>
<TextBlock Text="{x:Bind ModuleDescription}" <TextBlock x:Name="AboutDescription"
TextWrapping="Wrap"> Text="{x:Bind ModuleDescription}"
</TextBlock> Foreground="{StaticResource TextFillColorSecondaryBrush}"
</StackPanel> TextWrapping="Wrap"/>
<HyperlinkButton x:Name="AboutImage" <HyperlinkButton x:Name="AboutImage"
RelativePanel.Below="DescriptionPanel" RelativePanel.Below="AboutDescription"
MaxWidth="240" MaxWidth="240"
CornerRadius="4" CornerRadius="4"
x:Uid="Learn_More_Description" x:Uid="Learn_More_Description"
NavigateUri="{x:Bind ModuleImageLink}" NavigateUri="{x:Bind ModuleImageLink}"
Margin="{StaticResource SmallTopBottomMargin}"> Margin="-12, 12, 0, 12">
<Image> <Image>
<Image.Source> <Image.Source>
<BitmapImage UriSource="{x:Bind ModuleImageSource}" /> <BitmapImage UriSource="{x:Bind ModuleImageSource}" />
@@ -89,7 +98,7 @@
<ItemsControl ItemsSource="{x:Bind ModuleLinks}"> <ItemsControl ItemsSource="{x:Bind ModuleLinks}">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate x:DataType="local:SidePanelLink"> <DataTemplate x:DataType="local:SidePanelLink">
<HyperlinkButton NavigateUri="{x:Bind Link}" Margin="0,-3,0,0"> <HyperlinkButton NavigateUri="{x:Bind Link}" Margin="-12,-3,0,0">
<TextBlock Text="{x:Bind Label}" TextWrapping="Wrap" /> <TextBlock Text="{x:Bind Label}" TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</DataTemplate> </DataTemplate>
@@ -105,7 +114,7 @@
<ItemsControl x:Name="AttributionLinksItemControl" ItemsSource="{x:Bind AttributionLinks}"> <ItemsControl x:Name="AttributionLinksItemControl" ItemsSource="{x:Bind AttributionLinks}">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate x:DataType="local:SidePanelLink"> <DataTemplate x:DataType="local:SidePanelLink">
<HyperlinkButton NavigateUri="{x:Bind Link}" Margin="0,-3,0,0"> <HyperlinkButton NavigateUri="{x:Bind Link}" Margin="-12,-3,0,0">
<TextBlock Text="{x:Bind Label}" TextWrapping="Wrap" /> <TextBlock Text="{x:Bind Label}" TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</DataTemplate> </DataTemplate>

21
src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SidePanel/SettingsPageControl.xaml.cs
View File

@@ -30,18 +30,10 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
AttributionLinks = new ObservableCollection<SidePanelLink>(); AttributionLinks = new ObservableCollection<SidePanelLink>();
} }
public object ModuleContent
{
get { return (object)GetValue(ModuleContentProperty); }
set { SetValue(ModuleContentProperty, value); }
}
public static readonly DependencyProperty ModuleContentProperty = DependencyProperty.Register("Content", typeof(object), typeof(SettingsPageControl), new PropertyMetadata(new Grid()));
public string ModuleTitle public string ModuleTitle
{ {
get => (string)GetValue(ModuleTitleProperty); get { return (string)GetValue(ModuleTitleProperty); }
set => SetValue(ModuleTitleProperty, value); set { SetValue(ModuleTitleProperty, value); }
} }
public string ModuleDescription public string ModuleDescription
@@ -78,11 +70,18 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
set => SetValue(AttributionLinksProperty, value); set => SetValue(AttributionLinksProperty, value);
} }
public static readonly DependencyProperty ModuleTitleProperty = DependencyProperty.Register("ModuleTitle", typeof(string), typeof(SettingsPageControl), new PropertyMetadata(default(string))); public object ModuleContent
{
get { return (object)GetValue(ModuleContentProperty); }
set { SetValue(ModuleContentProperty, value); }
}
public static readonly DependencyProperty ModuleTitleProperty = DependencyProperty.Register("Title", typeof(string), typeof(SettingsPageControl), new PropertyMetadata(default(string)));
public static readonly DependencyProperty ModuleDescriptionProperty = DependencyProperty.Register("ModuleDescription", typeof(string), typeof(SettingsPageControl), new PropertyMetadata(default(string))); public static readonly DependencyProperty ModuleDescriptionProperty = DependencyProperty.Register("ModuleDescription", typeof(string), typeof(SettingsPageControl), new PropertyMetadata(default(string)));
public static readonly DependencyProperty ModuleImageSourceProperty = DependencyProperty.Register("ModuleImageSource", typeof(string), typeof(SettingsPageControl), new PropertyMetadata(default(string))); public static readonly DependencyProperty ModuleImageSourceProperty = DependencyProperty.Register("ModuleImageSource", typeof(string), typeof(SettingsPageControl), new PropertyMetadata(default(string)));
public static readonly DependencyProperty ModuleImageLinkProperty = DependencyProperty.Register("ModuleImageLink", typeof(string), typeof(SettingsPageControl), new PropertyMetadata(default(string))); public static readonly DependencyProperty ModuleImageLinkProperty = DependencyProperty.Register("ModuleImageLink", typeof(string), typeof(SettingsPageControl), new PropertyMetadata(default(string)));
public static readonly DependencyProperty ModuleLinksProperty = DependencyProperty.Register("ModuleLinks", typeof(ObservableCollection<SidePanelLink>), typeof(SettingsPageControl), new PropertyMetadata(new ObservableCollection<SidePanelLink>())); public static readonly DependencyProperty ModuleLinksProperty = DependencyProperty.Register("ModuleLinks", typeof(ObservableCollection<SidePanelLink>), typeof(SettingsPageControl), new PropertyMetadata(new ObservableCollection<SidePanelLink>()));
public static readonly DependencyProperty AttributionLinksProperty = DependencyProperty.Register("AttributionLinks", typeof(ObservableCollection<SidePanelLink>), typeof(SettingsPageControl), new PropertyMetadata(new ObservableCollection<SidePanelLink>())); public static readonly DependencyProperty AttributionLinksProperty = DependencyProperty.Register("AttributionLinks", typeof(ObservableCollection<SidePanelLink>), typeof(SettingsPageControl), new PropertyMetadata(new ObservableCollection<SidePanelLink>()));
public static readonly DependencyProperty ModuleContentProperty = DependencyProperty.Register("Content", typeof(object), typeof(SettingsPageControl), new PropertyMetadata(new Grid()));
} }
} }

76
src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
View File

@@ -124,7 +124,7 @@
<data name="VideoConference_Enable.Header" xml:space="preserve"> <data name="VideoConference_Enable.Header" xml:space="preserve">
<value>Enable Video Conference</value> <value>Enable Video Conference</value>
</data> </data>
<data name="About_VideoConference.ModuleDescription" xml:space="preserve"> <data name="VideoConference.ModuleDescription" xml:space="preserve">
<value>Video Conference Mute is a quick and easy way to do an global "mute" of both your microphone and webcam. <value>Video Conference Mute is a quick and easy way to do an global "mute" of both your microphone and webcam.
Disabling this module or closing PowerToys will unmute the microphone and camera.</value> Disabling this module or closing PowerToys will unmute the microphone and camera.</value>
</data> </data>
@@ -185,8 +185,9 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
<data name="VideoConference_HideToolbarWhenUnmuted.Content" xml:space="preserve"> <data name="VideoConference_HideToolbarWhenUnmuted.Content" xml:space="preserve">
<value>Hide toolbar when both camera and microphone are unmuted</value> <value>Hide toolbar when both camera and microphone are unmuted</value>
</data> </data>
<data name="About_VideoConference.ModuleTitle" xml:space="preserve"> <data name="VideoConference.ModuleTitle" xml:space="preserve">
<value>About Video Conference</value> <value>Video Conference</value>
<comment>do not loc the product name</comment>
</data> </data>
<data name="VideoConference_Camera.Text" xml:space="preserve"> <data name="VideoConference_Camera.Text" xml:space="preserve">
<value>Camera</value> <value>Camera</value>
@@ -253,7 +254,7 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
<value>Current configuration</value> <value>Current configuration</value>
<comment>Keyboard Manager current configuration header</comment> <comment>Keyboard Manager current configuration header</comment>
</data> </data>
<data name="About_KeyboardManager.ModuleDescription" xml:space="preserve"> <data name="KeyboardManager.ModuleDescription" xml:space="preserve">
<value>Reconfigure your keyboard by remapping keys and shortcuts.</value> <value>Reconfigure your keyboard by remapping keys and shortcuts.</value>
<comment>Keyboard Manager page description</comment> <comment>Keyboard Manager page description</comment>
</data> </data>
@@ -311,7 +312,7 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
<value>Keyboard Manager</value> <value>Keyboard Manager</value>
<comment>do not loc, product name</comment> <comment>do not loc, product name</comment>
</data> </data>
<data name="About_ColorPicker.ModuleDescription" xml:space="preserve"> <data name="ColorPicker.ModuleDescription" xml:space="preserve">
<value>Quick and simple system-wide color picker.</value> <value>Quick and simple system-wide color picker.</value>
</data> </data>
<data name="ColorPicker_EnableColorPicker.Header" xml:space="preserve"> <data name="ColorPicker_EnableColorPicker.Header" xml:space="preserve">
@@ -325,7 +326,7 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
<value>Activate Color Picker</value> <value>Activate Color Picker</value>
<comment>do not loc product name</comment> <comment>do not loc product name</comment>
</data> </data>
<data name="About_PowerLauncher.ModuleDescription" xml:space="preserve"> <data name="PowerLauncher.ModuleDescription" xml:space="preserve">
<value>A quick launcher that has additional capabilities without sacrificing performance.</value> <value>A quick launcher that has additional capabilities without sacrificing performance.</value>
</data> </data>
<data name="PowerLauncher_EnablePowerLauncher.Header" xml:space="preserve"> <data name="PowerLauncher_EnablePowerLauncher.Header" xml:space="preserve">
@@ -401,7 +402,7 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
<value>FancyZones windows</value> <value>FancyZones windows</value>
<comment>do not loc the Product name</comment> <comment>do not loc the Product name</comment>
</data> </data>
<data name="About_FancyZones.ModuleDescription" xml:space="preserve"> <data name="FancyZones.ModuleDescription" xml:space="preserve">
<value>Create window layouts to help make multi-tasking easy.</value> <value>Create window layouts to help make multi-tasking easy.</value>
<comment>windows refers to application windows</comment> <comment>windows refers to application windows</comment>
</data> </data>
@@ -484,8 +485,9 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
<value>Attribution</value> <value>Attribution</value>
<comment>giving credit to the projects this utility was based on</comment> <comment>giving credit to the projects this utility was based on</comment>
</data> </data>
<data name="About_PowerToys.ModuleTitle" xml:space="preserve"> <data name="PowerToys.ModuleTitle" xml:space="preserve">
<value>About PowerToys</value> <value>PowerToys</value>
<comment>do not loc the product name</comment>
</data> </data>
<data name="GeneralPage_CheckForUpdates.Content" xml:space="preserve"> <data name="GeneralPage_CheckForUpdates.Content" xml:space="preserve">
<value>Check for updates</value> <value>Check for updates</value>
@@ -511,7 +513,7 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
<data name="GeneralPage_ToggleSwitch_RunAtStartUp.Header" xml:space="preserve"> <data name="GeneralPage_ToggleSwitch_RunAtStartUp.Header" xml:space="preserve">
<value>Run at startup</value> <value>Run at startup</value>
</data> </data>
<data name="About_PowerRename.ModuleDescription" xml:space="preserve"> <data name="PowerRename.ModuleDescription" xml:space="preserve">
<value>A Windows Shell extension for more advanced bulk renaming using search and replace or regular expressions.</value> <value>A Windows Shell extension for more advanced bulk renaming using search and replace or regular expressions.</value>
</data> </data>
<data name="PowerRename_ShellIntegration.Text" xml:space="preserve"> <data name="PowerRename_ShellIntegration.Text" xml:space="preserve">
@@ -549,7 +551,7 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
<value>Enable SVG (.svg) thumbnails</value> <value>Enable SVG (.svg) thumbnails</value>
<comment>Do you want this feature on / off</comment> <comment>Do you want this feature on / off</comment>
</data> </data>
<data name="About_FileExplorerPreview.ModuleDescription" xml:space="preserve"> <data name="FileExplorerPreview.ModuleDescription" xml:space="preserve">
<value>These settings allow you to manage your Windows File Explorer custom preview handlers.</value> <value>These settings allow you to manage your Windows File Explorer custom preview handlers.</value>
</data> </data>
<data name="PowerRename_AutoCompleteHeader.Text" xml:space="preserve"> <data name="PowerRename_AutoCompleteHeader.Text" xml:space="preserve">
@@ -567,7 +569,7 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
<data name="FancyZones_InActiveColor.Text" xml:space="preserve"> <data name="FancyZones_InActiveColor.Text" xml:space="preserve">
<value>Zone inactive color</value> <value>Zone inactive color</value>
</data> </data>
<data name="About_ShortcutGuide.ModuleDescription" xml:space="preserve"> <data name="ShortcutGuide.ModuleDescription" xml:space="preserve">
<value>Shows a help overlay with Windows shortcuts when the Windows key is pressed.</value> <value>Shows a help overlay with Windows shortcuts when the Windows key is pressed.</value>
</data> </data>
<data name="ShortcutGuide_PressTime.Header" xml:space="preserve"> <data name="ShortcutGuide_PressTime.Header" xml:space="preserve">
@@ -597,7 +599,7 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
<data name="ImageResizer_CustomSizes.Text" xml:space="preserve"> <data name="ImageResizer_CustomSizes.Text" xml:space="preserve">
<value>Image sizes</value> <value>Image sizes</value>
</data> </data>
<data name="About_ImageResizer.ModuleDescription" xml:space="preserve"> <data name="ImageResizer.ModuleDescription" xml:space="preserve">
<value>Lets you resize images by right-clicking.</value> <value>Lets you resize images by right-clicking.</value>
</data> </data>
<data name="ImageResizer_EnableToggle.Header" xml:space="preserve"> <data name="ImageResizer_EnableToggle.Header" xml:space="preserve">
@@ -753,41 +755,48 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
<data name="GeneralSettings_RunningAsAdminText" xml:space="preserve"> <data name="GeneralSettings_RunningAsAdminText" xml:space="preserve">
<value>Running as administrator</value> <value>Running as administrator</value>
</data> </data>
<data name="About_FancyZones.ModuleTitle" xml:space="preserve"> <data name="FancyZones.ModuleTitle" xml:space="preserve">
<value>About FancyZones</value> <value>FancyZones</value>
<comment>do not loc the product name</comment>
</data> </data>
<data name="About_FileExplorerPreview.ModuleTitle" xml:space="preserve"> <data name="FileExplorerPreview.ModuleTitle" xml:space="preserve">
<value>About File Explorer</value> <value>File Explorer</value>
<comment>do not loc the product name</comment>
</data> </data>
<data name="FileExplorerPreview_Image.AutomationProperties.Name" xml:space="preserve"> <data name="FileExplorerPreview_Image.AutomationProperties.Name" xml:space="preserve">
<value>File Explorer</value> <value>File Explorer</value>
<comment>Use same translation as Windows does for File Explorer</comment> <comment>Use same translation as Windows does for File Explorer</comment>
</data> </data>
<data name="About_ImageResizer.ModuleTitle" xml:space="preserve"> <data name="ImageResizer.ModuleTitle" xml:space="preserve">
<value>About Image Resizer</value> <value>Image Resizer</value>
<comment>do not loc the product name</comment>
</data> </data>
<data name="About_KeyboardManager.ModuleTitle" xml:space="preserve"> <data name="KeyboardManager.ModuleTitle" xml:space="preserve">
<value>About Keyboard Manager</value> <value>Keyboard Manager</value>
<comment>do not loc the product name</comment>
</data> </data>
<data name="About_ColorPicker.ModuleTitle" xml:space="preserve"> <data name="ColorPicker.ModuleTitle" xml:space="preserve">
<value>About Color Picker</value> <value>Color Picker</value>
<comment>do not loc the product name</comment>
</data> </data>
<data name="About_PowerLauncher.ModuleTitle" xml:space="preserve"> <data name="PowerLauncher.ModuleTitle" xml:space="preserve">
<value>About PowerToys Run</value> <value>PowerToys Run</value>
<comment>do not loc the product name</comment>
</data> </data>
<data name="PowerToys_Run_Image.AutomationProperties.Name" xml:space="preserve"> <data name="PowerToys_Run_Image.AutomationProperties.Name" xml:space="preserve">
<value>PowerToys Run</value> <value>PowerToys Run</value>
</data> </data>
<data name="About_PowerRename.ModuleTitle" xml:space="preserve"> <data name="PowerRename.ModuleTitle" xml:space="preserve">
<value>About PowerRename</value> <value>PowerRename</value>
<comment>do not loc the product name</comment> <comment>do not loc the product name</comment>
</data> </data>
<data name="PowerRename_Image.AutomationProperties.Name" xml:space="preserve"> <data name="PowerRename_Image.AutomationProperties.Name" xml:space="preserve">
<value>PowerRename</value> <value>PowerRename</value>
<comment>do not loc</comment> <comment>do not loc</comment>
</data> </data>
<data name="About_ShortcutGuide.ModuleTitle" xml:space="preserve"> <data name="ShortcutGuide.ModuleTitle" xml:space="preserve">
<value>About Shortcut Guide</value> <value>Shortcut Guide</value>
<comment>do not loc the product name</comment>
</data> </data>
<data name="Shortcut_Guide_Image.AutomationProperties.Name" xml:space="preserve"> <data name="Shortcut_Guide_Image.AutomationProperties.Name" xml:space="preserve">
<value>Shortcut Guide</value> <value>Shortcut Guide</value>
@@ -841,7 +850,7 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
<data name="KeyboardManager_RemapShortcutsSubtitle.Text" xml:space="preserve"> <data name="KeyboardManager_RemapShortcutsSubtitle.Text" xml:space="preserve">
<value>Remap shortcuts to other shortcuts or keys. Additionally, mappings can be targeted to specific applications as well.</value> <value>Remap shortcuts to other shortcuts or keys. Additionally, mappings can be targeted to specific applications as well.</value>
</data> </data>
<data name="About_PowerToys.ModuleDescription" xml:space="preserve"> <data name="PowerToys.ModuleDescription" xml:space="preserve">
<value>Microsoft PowerToys is a set of utilities for power users to tune and streamline their Windows experience for greater productivity. <value>Microsoft PowerToys is a set of utilities for power users to tune and streamline their Windows experience for greater productivity.
Made with 💗 by Microsoft and the PowerToys community.</value> Made with 💗 by Microsoft and the PowerToys community.</value>
@@ -1256,10 +1265,11 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
<data name="SettingsWindow_Title" xml:space="preserve"> <data name="SettingsWindow_Title" xml:space="preserve">
<value>PowerToys Settings</value> <value>PowerToys Settings</value>
</data> </data>
<data name="About_Awake.ModuleTitle" xml:space="preserve"> <data name="Awake.ModuleTitle" xml:space="preserve">
<value>About Awake</value> <value>Awake</value>
<comment>do not loc the product name</comment>
</data> </data>
<data name="About_Awake.ModuleDescription" xml:space="preserve"> <data name="Awake.ModuleDescription" xml:space="preserve">
<value>A convenient way to keep your PC awake on-demand.</value> <value>A convenient way to keep your PC awake on-demand.</value>
</data> </data>
<data name="Awake_EnableAwake.Header" xml:space="preserve"> <data name="Awake_EnableAwake.Header" xml:space="preserve">

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/AwakePage.xaml
View File

@@ -14,7 +14,7 @@
<c:AwakeModeToBoolConverter x:Key="AwakeModeToBoolConverter" /> <c:AwakeModeToBoolConverter x:Key="AwakeModeToBoolConverter" />
</Page.Resources> </Page.Resources>
<controls:SettingsPageControl x:Uid="About_Awake" <controls:SettingsPageControl x:Uid="Awake"
ModuleImageSource="ms-appx:///Assets/Modules/Awake.png" ModuleImageSource="ms-appx:///Assets/Modules/Awake.png"
ModuleImageLink="https://aka.ms/PowerToysOverview_Awake"> ModuleImageLink="https://aka.ms/PowerToysOverview_Awake">
<controls:SettingsPageControl.ModuleContent> <controls:SettingsPageControl.ModuleContent>

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
View File

@@ -10,7 +10,7 @@
mc:Ignorable="d" mc:Ignorable="d"
AutomationProperties.LandmarkType="Main"> AutomationProperties.LandmarkType="Main">
<controls:SettingsPageControl x:Uid="About_ColorPicker" <controls:SettingsPageControl x:Uid="ColorPicker"
ModuleImageSource="ms-appx:///Assets/Modules/ColorPicker.png" ModuleImageSource="ms-appx:///Assets/Modules/ColorPicker.png"
ModuleImageLink="https://aka.ms/PowerToysOverview_ColorPicker"> ModuleImageLink="https://aka.ms/PowerToysOverview_ColorPicker">
<controls:SettingsPageControl.ModuleContent> <controls:SettingsPageControl.ModuleContent>

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
View File

@@ -14,7 +14,7 @@
<converters:StringFormatConverter x:Key="StringFormatConverter"/> <converters:StringFormatConverter x:Key="StringFormatConverter"/>
</Page.Resources> </Page.Resources>
<controls:SettingsPageControl x:Uid="About_FancyZones" <controls:SettingsPageControl x:Uid="FancyZones"
ModuleImageSource="ms-appx:///Assets/Modules/FancyZones.png" ModuleImageSource="ms-appx:///Assets/Modules/FancyZones.png"
ModuleImageLink="https://aka.ms/PowerToysOverview_FancyZones"> ModuleImageLink="https://aka.ms/PowerToysOverview_FancyZones">
<controls:SettingsPageControl.ModuleContent> <controls:SettingsPageControl.ModuleContent>

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
View File

@@ -19,7 +19,7 @@
<localConverters:UpdatingStateReadyToInstallToVisibilityConverter x:Key="UpdatingStateReadyToInstallToVisibilityConverter" /> <localConverters:UpdatingStateReadyToInstallToVisibilityConverter x:Key="UpdatingStateReadyToInstallToVisibilityConverter" />
</Page.Resources> </Page.Resources>
<controls:SettingsPageControl x:Uid="About_PowerToys" <controls:SettingsPageControl x:Uid="PowerToys"
ModuleImageSource="ms-appx:///Assets/Modules/PT.png" ModuleImageSource="ms-appx:///Assets/Modules/PT.png"
ModuleImageLink="https://aka.ms/powertoys"> ModuleImageLink="https://aka.ms/powertoys">
<controls:SettingsPageControl.ModuleContent> <controls:SettingsPageControl.ModuleContent>

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
View File

@@ -10,7 +10,7 @@
mc:Ignorable="d" mc:Ignorable="d"
AutomationProperties.LandmarkType="Main"> AutomationProperties.LandmarkType="Main">
<controls:SettingsPageControl x:Uid="About_ImageResizer" <controls:SettingsPageControl x:Uid="ImageResizer"
ModuleImageSource="ms-appx:///Assets/Modules/ImageResizer.png" ModuleImageSource="ms-appx:///Assets/Modules/ImageResizer.png"
ModuleImageLink="https://aka.ms/PowerToysOverview_ImageResizer"> ModuleImageLink="https://aka.ms/PowerToysOverview_ImageResizer">
<controls:SettingsPageControl.ModuleContent> <controls:SettingsPageControl.ModuleContent>

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
View File

@@ -187,7 +187,7 @@
</DataTemplate> </DataTemplate>
</Page.Resources> </Page.Resources>
<controls:SettingsPageControl x:Uid="About_KeyboardManager" <controls:SettingsPageControl x:Uid="KeyboardManager"
ModuleImageSource="ms-appx:///Assets/Modules/KBM.png" ModuleImageSource="ms-appx:///Assets/Modules/KBM.png"
ModuleImageLink="https://aka.ms/PowerToysOverview_KeyboardManage"> ModuleImageLink="https://aka.ms/PowerToysOverview_KeyboardManage">
<controls:SettingsPageControl.ModuleContent> <controls:SettingsPageControl.ModuleContent>

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
View File

@@ -16,7 +16,7 @@
<converters:BoolNegationConverter x:Key="BoolNegationConverter"/> <converters:BoolNegationConverter x:Key="BoolNegationConverter"/>
</Page.Resources> </Page.Resources>
<controls:SettingsPageControl x:Uid="About_PowerLauncher" <controls:SettingsPageControl x:Uid="PowerLauncher"
ModuleImageSource="ms-appx:///Assets/Modules/PowerLauncher.png" ModuleImageSource="ms-appx:///Assets/Modules/PowerLauncher.png"
ModuleImageLink="https://aka.ms/PowerToysOverview_PowerToysRun"> ModuleImageLink="https://aka.ms/PowerToysOverview_PowerToysRun">
<controls:SettingsPageControl.ModuleContent> <controls:SettingsPageControl.ModuleContent>

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml
View File

@@ -13,7 +13,7 @@
<converters:BoolToObjectConverter x:Key="BoolToVisibilityConverter" TrueValue="Collapsed" FalseValue="Visible"/> <converters:BoolToObjectConverter x:Key="BoolToVisibilityConverter" TrueValue="Collapsed" FalseValue="Visible"/>
</Page.Resources> </Page.Resources>
<controls:SettingsPageControl x:Uid="About_FileExplorerPreview" <controls:SettingsPageControl x:Uid="FileExplorerPreview"
ModuleImageSource="ms-appx:///Assets/Modules/PowerPreview.png" ModuleImageSource="ms-appx:///Assets/Modules/PowerPreview.png"
ModuleImageLink="https://aka.ms/PowerToysOverview_FileExplorerAddOns"> ModuleImageLink="https://aka.ms/PowerToysOverview_FileExplorerAddOns">
<controls:SettingsPageControl.ModuleContent> <controls:SettingsPageControl.ModuleContent>

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
View File

@@ -9,7 +9,7 @@
mc:Ignorable="d" mc:Ignorable="d"
AutomationProperties.LandmarkType="Main"> AutomationProperties.LandmarkType="Main">
<controls:SettingsPageControl x:Uid="About_PowerRename" <controls:SettingsPageControl x:Uid="PowerRename"
ModuleImageSource="ms-appx:///Assets/Modules/PowerRename.png" ModuleImageSource="ms-appx:///Assets/Modules/PowerRename.png"
ModuleImageLink="https://aka.ms/PowerToysOverview_PowerRename"> ModuleImageLink="https://aka.ms/PowerToysOverview_PowerRename">
<controls:SettingsPageControl.ModuleContent> <controls:SettingsPageControl.ModuleContent>

54
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
View File

@@ -11,30 +11,16 @@
xmlns:ic="using:Microsoft.Xaml.Interactions.Core" xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
xmlns:i="using:Microsoft.Xaml.Interactivity" xmlns:i="using:Microsoft.Xaml.Interactivity"
winui:BackdropMaterial.ApplyToRootOrPageBackground="True" winui:BackdropMaterial.ApplyToRootOrPageBackground="True"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
mc:Ignorable="d"> mc:Ignorable="d">
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <DataTemplate x:Key="HeaderSmallTemplate">
<ResourceDictionary.MergedDictionaries> <TextBlock x:Name="HeaderText"
<ResourceDictionary> Text="{Binding}"
<ResourceDictionary.ThemeDictionaries> Margin="-36,0,0,0"
<ResourceDictionary x:Key="Light"> AutomationProperties.HeadingLevel="Level1" />
<StaticResource x:Key="NavigationViewContentBackground" ResourceKey="LayerFillColorDefaultBrush"/> </DataTemplate>
<SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="Transparent"/>
</ResourceDictionary>
<ResourceDictionary x:Key="Dark">
<StaticResource x:Key="NavigationViewContentBackground" ResourceKey="LayerFillColorDefaultBrush"/>
<SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="Transparent"/>
</ResourceDictionary>
<ResourceDictionary x:Key="HighContrast">
<SolidColorBrush x:Key="NavigationViewContentBackground" Color="{ThemeResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="{ThemeResource SystemColorWindowColor}" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
</ResourceDictionary>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
@@ -43,15 +29,35 @@
</ic:EventTriggerBehavior> </ic:EventTriggerBehavior>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
<Grid> <Grid x:Name="RootGrid" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="LayoutVisualStates">
<VisualState x:Name="WideLayout">
<VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="{StaticResource WideLayoutMinWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="SmallLayout">
<VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="{StaticResource SmallLayoutMinWidth}" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="navigationView.HeaderTemplate" Value="{StaticResource HeaderSmallTemplate}"/>
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
<winui:NavigationView <winui:NavigationView
x:Name="navigationView" x:Name="navigationView"
Background="{ThemeResource HomePageBackgroundBrush}" Background="{ThemeResource HomePageBackgroundBrush}"
IsBackButtonVisible="Collapsed" IsBackButtonVisible="Collapsed"
IsTitleBarAutoPaddingEnabled="False"
IsBackEnabled="{x:Bind ViewModel.IsBackEnabled, Mode=OneWay}" IsBackEnabled="{x:Bind ViewModel.IsBackEnabled, Mode=OneWay}"
SelectedItem="{x:Bind ViewModel.Selected, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.Selected, Mode=OneWay}"
IsSettingsVisible="False" IsSettingsVisible="False"
OpenPaneLength="296"
CompactModeThresholdWidth="0" CompactModeThresholdWidth="0"
SelectionChanged="NavigationView_SelectionChanged"> SelectionChanged="NavigationView_SelectionChanged">
<winui:NavigationView.MenuItems> <winui:NavigationView.MenuItems>
@@ -124,7 +130,7 @@
</winui:NavigationView.MenuItems> </winui:NavigationView.MenuItems>
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<behaviors:NavigationViewHeaderBehavior DefaultHeader="{x:Bind ViewModel.Selected.Content, Mode=OneWay}"/>
<ic:EventTriggerBehavior EventName="ItemInvoked"> <ic:EventTriggerBehavior EventName="ItemInvoked">
<ic:InvokeCommandAction Command="{x:Bind ViewModel.ItemInvokedCommand}" /> <ic:InvokeCommandAction Command="{x:Bind ViewModel.ItemInvokedCommand}" />
</ic:EventTriggerBehavior> </ic:EventTriggerBehavior>

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
View File

@@ -14,7 +14,7 @@
<converters:StringFormatConverter x:Key="StringFormatConverter"/> <converters:StringFormatConverter x:Key="StringFormatConverter"/>
</Page.Resources> </Page.Resources>
<controls:SettingsPageControl x:Uid="About_ShortcutGuide" <controls:SettingsPageControl x:Uid="ShortcutGuide"
ModuleImageSource="ms-appx:///Assets/Modules/ShortcutGuide.png" ModuleImageSource="ms-appx:///Assets/Modules/ShortcutGuide.png"
ModuleImageLink="https://aka.ms/PowerToysOverview_ShortcutGuide"> ModuleImageLink="https://aka.ms/PowerToysOverview_ShortcutGuide">
<controls:SettingsPageControl.ModuleContent> <controls:SettingsPageControl.ModuleContent>

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/VideoConference.xaml
View File

@@ -7,7 +7,7 @@
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<controls:SettingsPageControl x:Uid="About_VideoConference" <controls:SettingsPageControl x:Uid="VideoConference"
ModuleImageSource="ms-appx:///Assets/Modules/VideoConference.png" ModuleImageSource="ms-appx:///Assets/Modules/VideoConference.png"
ModuleImageLink="https://aka.ms/PowerToysOverview_VideoConference"> ModuleImageLink="https://aka.ms/PowerToysOverview_VideoConference">
<controls:SettingsPageControl.ModuleContent> <controls:SettingsPageControl.ModuleContent>