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

[Settings]XamlStyler formatting (#29114)

Browse Source 
* XamlStyler formatting

* add generated files exclusion
This commit is contained in:
Davide Giacometti
2023-10-24 12:25:55 +02:00
committed by GitHub
parent 8eb48676f2
commit 536c723599
41 changed files with 720 additions and 1162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pipelines/applyXamlStyling.ps1
View File

@@ -107,7 +107,7 @@ if (-not $Passive)
else else
{ {
Write-Output "Checking all files (passively)" Write-Output "Checking all files (passively)"
$files = Get-ChildItem -Path "$PSScriptRoot\..\src\*.xaml" -Recurse | Select-Object -ExpandProperty FullName | Where-Object { $_ -notmatch "(\\obj\\)|(\\bin\\)|(\\x64\\)|(\\launcher\\PowerLauncher\\)|(\\launcher\\Wox.Plugin\\)|(\\colorPicker\\ColorPickerUI\\)|(\\settings-ui\\Settings.UI\\)" } $files = Get-ChildItem -Path "$PSScriptRoot\..\src\*.xaml" -Recurse | Select-Object -ExpandProperty FullName | Where-Object { $_ -notmatch "(\\obj\\)|(\\bin\\)|(\\x64\\)|(\\Generated Files\\PowerRenameXAML\\)|(\\launcher\\PowerLauncher\\)|(\\launcher\\Wox.Plugin\\)|(\\colorPicker\\ColorPickerUI\\)" }
if ($files.count -gt 0) if ($files.count -gt 0)
{ {

58
src/settings-ui/Settings.UI/SettingsXAML/Controls/FancyZonesPreviewControl.xaml
View File

@@ -11,39 +11,23 @@
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.ThemeDictionaries> <ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Dark"> <ResourceDictionary x:Key="Dark">
<SolidColorBrush <SolidColorBrush x:Key="SolidBackgroundBrush" Color="Black" />
x:Key="SolidBackgroundBrush" <SolidColorBrush x:Key="SolidZoneNumberBrush" Color="White" />
Color="Black" />
<SolidColorBrush
x:Key="SolidZoneNumberBrush"
Color="White" />
</ResourceDictionary> </ResourceDictionary>
<ResourceDictionary x:Key="Light"> <ResourceDictionary x:Key="Light">
<SolidColorBrush <SolidColorBrush x:Key="SolidBackgroundBrush" Color="White" />
x:Key="SolidBackgroundBrush" <SolidColorBrush x:Key="SolidZoneNumberBrush" Color="Black" />
Color="White" />
<SolidColorBrush
x:Key="SolidZoneNumberBrush"
Color="Black" />
</ResourceDictionary> </ResourceDictionary>
<ResourceDictionary x:Key="HighContrast"> <ResourceDictionary x:Key="HighContrast">
<SolidColorBrush <SolidColorBrush x:Key="SolidBackgroundBrush" Color="Black" />
x:Key="SolidBackgroundBrush" <SolidColorBrush x:Key="SolidZoneNumberBrush" Color="White" />
Color="Black" />
<SolidColorBrush
x:Key="SolidZoneNumberBrush"
Color="White" />
</ResourceDictionary> </ResourceDictionary>
</ResourceDictionary.ThemeDictionaries> </ResourceDictionary.ThemeDictionaries>
<SolidColorBrush <SolidColorBrush x:Key="DefaultAccentBrush" Color="{ThemeResource SystemAccentColor}" />
x:Key="DefaultAccentBrush" <SolidColorBrush x:Key="DefaultBorderBrush" Color="{ThemeResource SystemAccentColor}" />
Color="{ThemeResource SystemAccentColor}" />
<SolidColorBrush
x:Key="DefaultBorderBrush"
Color="{ThemeResource SystemAccentColor}" />
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
<Grid <Grid
x:Name="RootGrid" x:Name="RootGrid"
MinWidth="170" MinWidth="170"
@@ -64,10 +48,10 @@
<Border <Border
Grid.RowSpan="2" Grid.RowSpan="2"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Opacity="0.8" CornerRadius="4"
CornerRadius="4"> Opacity="0.8">
<Image <Image
AutomationProperties.AccessibilityView="Raw" AutomationProperties.AccessibilityView="Raw"
Source="{x:Bind WallpaperPath, Mode=OneWay}" Source="{x:Bind WallpaperPath, Mode=OneWay}"
Stretch="UniformToFill" /> Stretch="UniformToFill" />
</Border> </Border>
@@ -75,10 +59,10 @@
<Border <Border
x:Name="Zone1" x:Name="Zone1"
Grid.RowSpan="2" Grid.RowSpan="2"
BorderThickness="1"
Margin="4,4,2,4" Margin="4,4,2,4"
CornerRadius="2" Background="{ThemeResource SystemControlAcrylicElementBrush}"
Background="{ThemeResource SystemControlAcrylicElementBrush}"> BorderThickness="1"
CornerRadius="2">
<TextBlock <TextBlock
x:Name="Zone1Number" x:Name="Zone1Number"
HorizontalAlignment="Center" HorizontalAlignment="Center"
@@ -90,10 +74,10 @@
<Border <Border
x:Name="Zone2" x:Name="Zone2"
Grid.Column="1" Grid.Column="1"
BorderThickness="1"
Margin="2,4,4,2" Margin="2,4,4,2"
CornerRadius="2" Background="{ThemeResource SystemControlAcrylicElementBrush}"
Background="{ThemeResource SystemControlAcrylicElementBrush}"> BorderThickness="1"
CornerRadius="2">
<TextBlock <TextBlock
x:Name="Zone2Number" x:Name="Zone2Number"
HorizontalAlignment="Center" HorizontalAlignment="Center"
@@ -106,10 +90,10 @@
x:Name="Zone3" x:Name="Zone3"
Grid.Row="1" Grid.Row="1"
Grid.Column="1" Grid.Column="1"
BorderThickness="1"
Margin="2,2,4,4" Margin="2,2,4,4"
CornerRadius="2" Background="{ThemeResource SystemControlAcrylicElementBrush}"
Background="{ThemeResource SystemControlAcrylicElementBrush}"> BorderThickness="1"
CornerRadius="2">
<TextBlock <TextBlock
x:Name="Zone3Number" x:Name="Zone3Number"
HorizontalAlignment="Center" HorizontalAlignment="Center"

3
src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml
View File

@@ -35,9 +35,8 @@
</Style> </Style>
<Style <Style
x:Key="SecondaryIsEnabledTextBlockStyle" x:Key="SecondaryIsEnabledTextBlockStyle"
TargetType="local:IsEnabledTextBlock"
BasedOn="{StaticResource DefaultIsEnabledTextBlockStyle}" BasedOn="{StaticResource DefaultIsEnabledTextBlockStyle}"
> TargetType="local:IsEnabledTextBlock">
<Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" /> <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
<Setter Property="FontSize" Value="{StaticResource SecondaryTextFontSize}" /> <Setter Property="FontSize" Value="{StaticResource SecondaryTextFontSize}" />
</Style> </Style>

40
src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml
View File

@@ -21,6 +21,26 @@
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="local:KeyVisual"> <ControlTemplate TargetType="local:KeyVisual">
<Grid> <Grid>
<Grid>
<Rectangle
x:Name="ContentHolder"
Height="{TemplateBinding Height}"
MinWidth="{TemplateBinding MinWidth}"
Fill="{TemplateBinding Background}"
RadiusX="4"
RadiusY="4"
Stroke="{TemplateBinding BorderBrush}"
StrokeThickness="{TemplateBinding BorderThickness}" />
<ContentPresenter
x:Name="KeyPresenter"
Margin="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="Center"
Content="{TemplateBinding Content}"
FontSize="{TemplateBinding FontSize}"
FontWeight="{TemplateBinding FontWeight}"
Foreground="{TemplateBinding Foreground}" />
</Grid>
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates"> <VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" /> <VisualState x:Name="Normal" />
@@ -45,26 +65,6 @@
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
</VisualStateManager.VisualStateGroups> </VisualStateManager.VisualStateGroups>
<Grid>
<Rectangle
x:Name="ContentHolder"
Height="{TemplateBinding Height}"
MinWidth="{TemplateBinding MinWidth}"
Fill="{TemplateBinding Background}"
RadiusX="4"
RadiusY="4"
Stroke="{TemplateBinding BorderBrush}"
StrokeThickness="{TemplateBinding BorderThickness}" />
<ContentPresenter
x:Name="KeyPresenter"
Margin="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="Center"
Content="{TemplateBinding Content}"
FontSize="{TemplateBinding FontSize}"
FontWeight="{TemplateBinding FontWeight}"
Foreground="{TemplateBinding Foreground}" />
</Grid>
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>

4
src/settings-ui/Settings.UI/SettingsXAML/Controls/PowerAccentShortcutControl.xaml
View File

@@ -22,9 +22,7 @@
ItemsSource="{x:Bind Keys}"> ItemsSource="{x:Bind Keys}">
<ItemsControl.ItemsPanel> <ItemsControl.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel <StackPanel Orientation="Horizontal" Spacing="4" />
Orientation="Horizontal"
Spacing="4" />
</ItemsPanelTemplate> </ItemsPanelTemplate>
</ItemsControl.ItemsPanel> </ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>

40
src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml
View File

@@ -2,8 +2,8 @@
x:Class="Microsoft.PowerToys.Settings.UI.Controls.SettingsPageControl" x:Class="Microsoft.PowerToys.Settings.UI.Controls.SettingsPageControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:custom="using:CommunityToolkit.WinUI.UI.Controls"
xmlns:converters="using:CommunityToolkit.WinUI.Converters" xmlns:converters="using:CommunityToolkit.WinUI.Converters"
xmlns:custom="using:CommunityToolkit.WinUI.UI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -24,25 +24,6 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup>
<VisualState>
<VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="480" />
</VisualState.StateTriggers>
</VisualState>
<VisualState>
<VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="DescriptionPanel.(Grid.Row)" Value="1" />
<Setter Target="DescriptionPanel.(Grid.Column)" Value="0" />
<Setter Target="DescriptionPanel.(Grid.ColumnSpan)" Value="2" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
<TextBlock <TextBlock
x:Name="Header" x:Name="Header"
MaxWidth="{StaticResource PageMaxWidth}" MaxWidth="{StaticResource PageMaxWidth}"
@@ -157,5 +138,24 @@
</StackPanel> </StackPanel>
</Grid> </Grid>
</ScrollViewer> </ScrollViewer>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup>
<VisualState>
<VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="480" />
</VisualState.StateTriggers>
</VisualState>
<VisualState>
<VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="DescriptionPanel.(Grid.Row)" Value="1" />
<Setter Target="DescriptionPanel.(Grid.Column)" Value="0" />
<Setter Target="DescriptionPanel.(Grid.ColumnSpan)" Value="2" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
</Grid> </Grid>
</UserControl> </UserControl>

22
src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
View File

@@ -8,17 +8,14 @@
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
x:Name="ShortcutContentControl" x:Name="ShortcutContentControl"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid <Grid MinWidth="498" MinHeight="220">
MinWidth="498"
MinHeight="220">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition MinHeight="110" /> <RowDefinition MinHeight="110" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock <TextBlock Grid.Row="0" />
Grid.Row="0" />
<ItemsControl <ItemsControl
x:Name="KeysControl" x:Name="KeysControl"
@@ -31,9 +28,7 @@
ItemsSource="{x:Bind Keys, Mode=OneWay}"> ItemsSource="{x:Bind Keys, Mode=OneWay}">
<ItemsControl.ItemsPanel> <ItemsControl.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel <StackPanel Orientation="Horizontal" Spacing="8" />
Orientation="Horizontal"
Spacing="8" />
</ItemsPanelTemplate> </ItemsPanelTemplate>
</ItemsControl.ItemsPanel> </ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
@@ -57,11 +52,12 @@
Spacing="8"> Spacing="8">
<Grid Height="62"> <Grid Height="62">
<InfoBar x:Uid="InvalidShortcut" <InfoBar
IsClosable="False" x:Uid="InvalidShortcut"
IsOpen="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay}" IsClosable="False"
IsTabStop="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay}" IsOpen="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay}"
Severity="Error" /> IsTabStop="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay}"
Severity="Error" />
</Grid> </Grid>
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock

10
src/settings-ui/Settings.UI/SettingsXAML/Flyout/AppsListPage.xaml
View File

@@ -1,12 +1,12 @@
<!-- Copyright (c) Microsoft Corporation and Contributors. --> <!-- Copyright (c) Microsoft Corporation and Contributors. -->
<!-- Licensed under the MIT License. --> <!-- Licensed under the MIT License. -->
<Page <Page
x:Class="Microsoft.PowerToys.Settings.UI.Flyout.AppsListPage" x:Class="Microsoft.PowerToys.Settings.UI.Flyout.AppsListPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:converters="using:CommunityToolkit.WinUI.Converters" xmlns:converters="using:CommunityToolkit.WinUI.Converters"
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:viewmodels="using:Microsoft.PowerToys.Settings.UI.ViewModels" xmlns:viewmodels="using:Microsoft.PowerToys.Settings.UI.ViewModels"
mc:Ignorable="d"> mc:Ignorable="d">
@@ -71,8 +71,8 @@
<!--<ViewBox VerticalAlignment="Center">--> <!--<ViewBox VerticalAlignment="Center">-->
<Image <Image
Width="20" Width="20"
VerticalAlignment="Center" Margin="0,0,16,0"
Margin="0,0,16,0"> VerticalAlignment="Center">
<Image.Source> <Image.Source>
<BitmapImage UriSource="{x:Bind Icon, Mode=OneWay}" /> <BitmapImage UriSource="{x:Bind Icon, Mode=OneWay}" />
</Image.Source> </Image.Source>
@@ -86,9 +86,9 @@
<FontIcon <FontIcon
Grid.Column="2" Grid.Column="2"
Width="20" Width="20"
VerticalAlignment="Center"
FontSize="16" FontSize="16"
Glyph="&#xE72E;" Glyph="&#xE72E;"
VerticalAlignment="Center"
Visibility="{x:Bind IsLocked, Converter={StaticResource BoolToInvertedVisibilityConverter}, ConverterParameter=True, Mode=OneWay}"> Visibility="{x:Bind IsLocked, Converter={StaticResource BoolToInvertedVisibilityConverter}, ConverterParameter=True, Mode=OneWay}">
<ToolTipService.ToolTip> <ToolTipService.ToolTip>
<TextBlock x:Uid="GPO_IsSettingForcedText" TextWrapping="WrapWholeWords" /> <TextBlock x:Uid="GPO_IsSettingForcedText" TextWrapping="WrapWholeWords" />

18
src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml
View File

@@ -1,14 +1,14 @@
<winuiex:WindowEx <winuiex:WindowEx
x:Class="Microsoft.PowerToys.Settings.UI.FlyoutWindow" x:Class="Microsoft.PowerToys.Settings.UI.FlyoutWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:flyout="using:Microsoft.PowerToys.Settings.UI.Flyout" xmlns:flyout="using:Microsoft.PowerToys.Settings.UI.Flyout"
xmlns:i="using:Microsoft.Xaml.Interactivity"
xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
xmlns:local="using:Microsoft.PowerToys.Settings.UI" xmlns:local="using:Microsoft.PowerToys.Settings.UI"
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"
xmlns:i="using:Microsoft.Xaml.Interactivity"
xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
Title="PowerToys Settings" Title="PowerToys Settings"
IsAlwaysOnTop="True" IsAlwaysOnTop="True"
IsMaximizable="False" IsMaximizable="False"
@@ -29,19 +29,15 @@
LightTintOpacity="0" /> LightTintOpacity="0" />
</winuiex:WindowEx.Backdrop> </winuiex:WindowEx.Backdrop>
<Grid> <Grid>
<!-- HACK: https://github.com/microsoft/microsoft-ui-xaml/issues/7629 --> <!-- HACK: https://github.com/microsoft/microsoft-ui-xaml/issues/7629 -->
<!-- W11 grey border, W10: no border --> <!-- W11 grey border, W10: no border -->
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<ic:DataTriggerBehavior <ic:DataTriggerBehavior
Binding="{x:Bind ViewModel.Windows10}" Binding="{x:Bind ViewModel.Windows10}"
ComparisonCondition="Equal" ComparisonCondition="Equal"
Value="True"> Value="True">
<ic:ChangePropertyAction <ic:ChangePropertyAction PropertyName="BorderThickness" Value="1" />
PropertyName="BorderThickness" <ic:ChangePropertyAction PropertyName="BorderBrush" Value="{ThemeResource SurfaceStrokeColorDefaultBrush}" />
Value="1" />
<ic:ChangePropertyAction
PropertyName="BorderBrush"
Value="{ThemeResource SurfaceStrokeColorDefaultBrush}" />
</ic:DataTriggerBehavior> </ic:DataTriggerBehavior>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
<flyout:ShellPage x:Name="FlyoutShellPage" /> <flyout:ShellPage x:Name="FlyoutShellPage" />

4
src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml
View File

@@ -1,4 +1,4 @@
<winuiex:WindowEx <winuiex:WindowEx
x:Class="Microsoft.PowerToys.Settings.UI.MainWindow" x:Class="Microsoft.PowerToys.Settings.UI.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -11,7 +11,7 @@
Closed="Window_Closed" Closed="Window_Closed"
mc:Ignorable="d"> mc:Ignorable="d">
<Window.SystemBackdrop> <Window.SystemBackdrop>
<MicaBackdrop/> <MicaBackdrop />
</Window.SystemBackdrop> </Window.SystemBackdrop>
<local:ShellPage x:Name="shellPage" /> <local:ShellPage x:Name="shellPage" />
</winuiex:WindowEx> </winuiex:WindowEx>

32
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAlwaysOnTop.xaml
View File

@@ -9,40 +9,24 @@
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_AlwaysOnTop" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/AlwaysOnTop.png">
x:Uid="Oobe_AlwaysOnTop"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/AlwaysOnTop.png">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToUse"
Style="{ThemeResource OobeSubtitleStyle}" />
<custom:ShortcutWithTextLabelControl <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_AlwaysOnTop_HowToUse" />
x:Name="HotkeyControl"
x:Uid="Oobe_AlwaysOnTop_HowToUse" />
<TextBlock <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_TipsAndTricks"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_AlwaysOnTop_TipsAndTricks" Background="Transparent" />
x:Uid="Oobe_AlwaysOnTop_TipsAndTricks"
Background="Transparent" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="12"> Spacing="12">
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_AlwaysOnTop" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_AlwaysOnTop" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_AlwaysOnTop"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_AlwaysOnTop"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

32
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAwake.xaml
View File

@@ -8,41 +8,25 @@
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_Awake" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Awake.png">
x:Uid="Oobe_Awake"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Awake.png">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToUse"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_Awake_HowToUse" Background="Transparent" />
x:Uid="Oobe_Awake_HowToUse"
Background="Transparent" />
<TextBlock <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_TipsAndTricks"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_Awake_TipsAndTricks" Background="Transparent" />
x:Uid="Oobe_Awake_TipsAndTricks"
Background="Transparent" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="12"> Spacing="12">
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_Awake" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_Awake" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_Awake"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_Awake"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

32
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeColorPicker.xaml
View File

@@ -9,27 +9,17 @@
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_ColorPicker" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ColorPicker.gif">
x:Uid="Oobe_ColorPicker"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ColorPicker.gif">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToUse"
Style="{ThemeResource OobeSubtitleStyle}" />
<custom:ShortcutWithTextLabelControl <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_ColorPicker_HowToUse" />
x:Name="HotkeyControl"
x:Uid="Oobe_ColorPicker_HowToUse" />
<TextBlock <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_TipsAndTricks"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_ColorPicker_TipsAndTricks" Background="Transparent" />
x:Uid="Oobe_ColorPicker_TipsAndTricks"
Background="Transparent" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
@@ -39,15 +29,9 @@
x:Uid="Launch_ColorPicker" x:Uid="Launch_ColorPicker"
Click="Start_ColorPicker_Click" Click="Start_ColorPicker_Click"
Style="{StaticResource AccentButtonStyle}" /> Style="{StaticResource AccentButtonStyle}" />
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_ColorPicker" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_ColorPicker" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_ColorPicker"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_ColorPicker"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

28
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCropAndLock.xaml
View File

@@ -9,36 +9,22 @@
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_CropAndLock" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/CropAndLock.gif">
x:Uid="Oobe_CropAndLock"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/CropAndLock.gif">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToUse"
Style="{ThemeResource OobeSubtitleStyle}" />
<custom:ShortcutWithTextLabelControl <custom:ShortcutWithTextLabelControl x:Name="ThumbnailHotkeyControl" x:Uid="Oobe_CropAndLock_HowToUse_Thumbnail" />
x:Name="ThumbnailHotkeyControl"
x:Uid="Oobe_CropAndLock_HowToUse_Thumbnail" />
<custom:ShortcutWithTextLabelControl <custom:ShortcutWithTextLabelControl x:Name="ReparentHotkeyControl" x:Uid="Oobe_CropAndLock_HowToUse_Reparent" />
x:Name="ReparentHotkeyControl"
x:Uid="Oobe_CropAndLock_HowToUse_Reparent" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="12"> Spacing="12">
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_CropAndLock" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_CropAndLock" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_CropAndLock"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_CropAndLock"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

38
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFancyZones.xaml
View File

@@ -1,4 +1,4 @@
<Page <Page
x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeFancyZones" x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeFancyZones"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -8,44 +8,26 @@
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_FancyZones" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FancyZones.gif">
x:Uid="Oobe_FancyZones"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FancyZones.gif">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToUse"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_FancyZones_HowToUse" Background="Transparent" />
x:Uid="Oobe_FancyZones_HowToUse" <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_FancyZones_HowToUse_Shortcut" />
Background="Transparent" />
<custom:ShortcutWithTextLabelControl
x:Name="HotkeyControl"
x:Uid="Oobe_FancyZones_HowToUse_Shortcut" />
<TextBlock <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_TipsAndTricks"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_FancyZones_TipsAndTricks" Background="Transparent" />
x:Uid="Oobe_FancyZones_TipsAndTricks"
Background="Transparent" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="12"> Spacing="12">
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_FancyZones" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_FancyZones" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_FancyZones"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_FancyZones"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

24
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileExplorer.xaml
View File

@@ -9,33 +9,21 @@
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_FileExplorer" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FileExplorer.png">
x:Uid="Oobe_FileExplorer"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FileExplorer.png">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToEnable" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToEnable"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_FileExplorer_HowToEnable" Background="Transparent" />
x:Uid="Oobe_FileExplorer_HowToEnable"
Background="Transparent" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="12"> Spacing="12">
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_FileExplorerAddOns" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_PowerPreview" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_FileExplorerAddOns"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_PowerPreview"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

32
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileLocksmith.xaml
View File

@@ -8,42 +8,26 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_FileLocksmith" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FileLocksmith.gif">
x:Uid="Oobe_FileLocksmith"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FileLocksmith.gif">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToUse"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_FileLocksmith_HowToUse" Background="Transparent" />
x:Uid="Oobe_FileLocksmith_HowToUse"
Background="Transparent" />
<TextBlock <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_TipsAndTricks"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_FileLocksmith_TipsAndTricks" Background="Transparent" />
x:Uid="Oobe_FileLocksmith_TipsAndTricks"
Background="Transparent" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="12"> Spacing="12">
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_FileLocksmith" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_FileLocksmith" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_FileLocksmith"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_FileLocksmith"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

16
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeHosts.xaml
View File

@@ -9,9 +9,7 @@
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_Hosts" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/HostsFileEditor.png">
x:Uid="Oobe_Hosts"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/HostsFileEditor.png">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<StackPanel <StackPanel
@@ -22,15 +20,9 @@
x:Uid="Launch_Hosts" x:Uid="Launch_Hosts"
Click="Launch_Hosts_Click" Click="Launch_Hosts_Click"
Style="{StaticResource AccentButtonStyle}" /> Style="{StaticResource AccentButtonStyle}" />
<Button <Button x:Uid="OOBE_Settings" Click="Launch_Settings_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_HostsFileEditor" Style="{StaticResource TextButtonStyle}">
Click="Launch_Settings_Click" /> <TextBlock x:Uid="LearnMore_Hosts" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_HostsFileEditor"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_Hosts"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

32
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeImageResizer.xaml
View File

@@ -9,41 +9,25 @@
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_ImageResizer" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ImageResizer.gif">
x:Uid="Oobe_ImageResizer"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ImageResizer.gif">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToLaunch" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToLaunch"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_ImageResizer_HowToLaunch" Background="Transparent" />
x:Uid="Oobe_ImageResizer_HowToLaunch"
Background="Transparent" />
<TextBlock <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_TipsAndTricks"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_ImageResizer_TipsAndTricks" Background="Transparent" />
x:Uid="Oobe_ImageResizer_TipsAndTricks"
Background="Transparent" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="12"> Spacing="12">
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_ImageResizer" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_ImageResizer" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_ImageResizer"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_ImageResizer"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

32
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeKBM.xaml
View File

@@ -7,42 +7,26 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_KBM" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/KBM.gif">
x:Uid="Oobe_KBM"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/KBM.gif">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToCreateMappings" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToCreateMappings"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_KBM_HowToCreateMappings" Background="Transparent" />
x:Uid="Oobe_KBM_HowToCreateMappings"
Background="Transparent" />
<TextBlock <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_TipsAndTricks"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_KBM_TipsAndTricks" Background="Transparent" />
x:Uid="Oobe_KBM_TipsAndTricks"
Background="Transparent" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="12"> Spacing="12">
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_KeyboardManager" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_KBM" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_KeyboardManager"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_KBM"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

28
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMeasureTool.xaml
View File

@@ -9,37 +9,23 @@
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_MeasureTool" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ScreenRuler.gif">
x:Uid="Oobe_MeasureTool"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ScreenRuler.gif">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToLaunch" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToLaunch"
Style="{ThemeResource OobeSubtitleStyle}" />
<custom:ShortcutWithTextLabelControl <custom:ShortcutWithTextLabelControl x:Name="HotkeyActivation" x:Uid="Oobe_MeasureTool_Activation" />
x:Name="HotkeyActivation"
x:Uid="Oobe_MeasureTool_Activation" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_MeasureTool_HowToLaunch" Background="Transparent" />
x:Uid="Oobe_MeasureTool_HowToLaunch"
Background="Transparent" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="12"> Spacing="12">
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_ScreenRuler" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_MeasureTool" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_ScreenRuler"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_MeasureTool"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

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

@@ -8,53 +8,29 @@
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_MouseUtils" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/MouseUtils.gif">
x:Uid="Oobe_MouseUtils"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/MouseUtils.gif">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_MouseUtils_FindMyMouse" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_MouseUtils_FindMyMouse" <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_MouseUtils_FindMyMouse_Description" Background="Transparent" />
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock
x:Uid="Oobe_MouseUtils_FindMyMouse_Description"
Background="Transparent" />
<TextBlock <TextBlock x:Uid="Oobe_MouseUtils_MouseHighlighter" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_MouseUtils_MouseHighlighter" <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_MouseUtils_MouseHighlighter_Description" Background="Transparent" />
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock
x:Uid="Oobe_MouseUtils_MouseHighlighter_Description"
Background="Transparent" />
<TextBlock <TextBlock x:Uid="Oobe_MouseUtils_MousePointerCrosshairs" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_MouseUtils_MousePointerCrosshairs" <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_MouseUtils_MousePointerCrosshairs_Description" Background="Transparent" />
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock
x:Uid="Oobe_MouseUtils_MousePointerCrosshairs_Description"
Background="Transparent" />
<TextBlock <TextBlock x:Uid="Oobe_MouseUtils_MouseJump" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_MouseUtils_MouseJump" <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_MouseUtils_MouseJump_Description" Background="Transparent" />
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock
x:Uid="Oobe_MouseUtils_MouseJump_Description"
Background="Transparent" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="12"> Spacing="12">
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_MouseUtilities" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_MouseUtils" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_MouseUtilities"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_MouseUtils"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>

32
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseWithoutBorders.xaml
View File

@@ -8,42 +8,26 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_MouseWithoutBorders" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/MouseWithoutBorders.png">
x:Uid="Oobe_MouseWithoutBorders"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/MouseWithoutBorders.png">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToUse"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_MouseWithoutBorders_HowToUse" Background="Transparent" />
x:Uid="Oobe_MouseWithoutBorders_HowToUse"
Background="Transparent" />
<TextBlock <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_TipsAndTricks"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_MouseWithoutBorders_TipsAndTricks" Background="Transparent" />
x:Uid="Oobe_MouseWithoutBorders_TipsAndTricks"
Background="Transparent" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="12"> Spacing="12">
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_MouseWithoutBorders" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_MouseWithoutBorders" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_MouseWithoutBorders"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_MouseWithoutBorders"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

20
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml
View File

@@ -8,31 +8,21 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_Overview" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/OOBEPTHero.png">
x:Uid="Oobe_Overview"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/OOBEPTHero.png">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToUse"
Style="{ThemeResource OobeSubtitleStyle}" />
<HyperlinkButton <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview" Style="{StaticResource TextButtonStyle}">
NavigateUri="https://aka.ms/PowerToysOverview" <TextBlock x:Uid="Oobe_Overview_DescriptionLinkText" TextWrapping="Wrap" />
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="Oobe_Overview_DescriptionLinkText"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="12"> Spacing="12">
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings"
Click="SettingsLaunchButton_Click" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</custom:OOBEPageControl.PageContent> </custom:OOBEPageControl.PageContent>

20
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewPlaceholder.xaml
View File

@@ -1,23 +1,23 @@
<!-- Copyright (c) Microsoft Corporation. All rights reserved. --> <!-- Copyright (c) Microsoft Corporation. All rights reserved. -->
<!-- Licensed under the MIT License. See LICENSE in the project root for license information. --> <!-- Licensed under the MIT License. See LICENSE in the project root for license information. -->
<Page <Page
x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeOverviewPlaceholder" x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeOverviewPlaceholder"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
Loaded="Page_Loaded" Loaded="Page_Loaded"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> mc:Ignorable="d">
<Grid Margin="0,24,0,0"> <Grid Margin="0,24,0,0">
<ProgressRing <ProgressRing
x:Name="LoadingProgressRing" x:Name="LoadingProgressRing"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
IsIndeterminate="True" IsIndeterminate="True"
Visibility="Visible" /> Visibility="Visible" />
</Grid> </Grid>
</Page> </Page>

24
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePastePlain.xaml
View File

@@ -9,33 +9,21 @@
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_PastePlain" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PastePlain.gif">
x:Uid="Oobe_PastePlain"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PastePlain.gif">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToUse"
Style="{ThemeResource OobeSubtitleStyle}" />
<custom:ShortcutWithTextLabelControl <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_PastePlain_HowToUse" />
x:Name="HotkeyControl"
x:Uid="Oobe_PastePlain_HowToUse" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="12"> Spacing="12">
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_PastePlain" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_PastePlain" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_PastePlain"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_PastePlain"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

34
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePeek.xaml
View File

@@ -1,45 +1,33 @@
<!-- Copyright (c) Microsoft Corporation and Contributors. --> <!-- Copyright (c) Microsoft Corporation and Contributors. -->
<!-- Licensed under the MIT License. --> <!-- Licensed under the MIT License. -->
<Page <Page
x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobePeek" x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobePeek"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_Peek" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Peek.gif">
x:Uid="Oobe_Peek"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Peek.gif">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToUse"
Style="{ThemeResource OobeSubtitleStyle}" />
<custom:ShortcutWithTextLabelControl <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_Peek_HowToUse" />
x:Name="HotkeyControl"
x:Uid="Oobe_Peek_HowToUse" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="12"> Spacing="12">
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_Peek" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_Peek" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_Peek"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_Peek"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

24
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml
View File

@@ -9,33 +9,21 @@
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_QuickAccent" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerAccent.gif">
x:Uid="Oobe_QuickAccent"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerAccent.gif">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToUse"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_QuickAccent_HowToUse" Background="Transparent" />
x:Uid="Oobe_QuickAccent_HowToUse"
Background="Transparent" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="12"> Spacing="12">
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_QuickAccent" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_QuickAccent" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_QuickAccent"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_QuickAccent"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

32
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml
View File

@@ -9,41 +9,25 @@
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_TextExtractor" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerOCR.gif">
x:Uid="Oobe_TextExtractor"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerOCR.gif">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToUse"
Style="{ThemeResource OobeSubtitleStyle}" />
<custom:ShortcutWithTextLabelControl <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_TextExtractor_HowToUse" />
x:Name="HotkeyControl"
x:Uid="Oobe_TextExtractor_HowToUse" />
<TextBlock <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_TipsAndTricks"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_TextExtractor_TipsAndTricks" Background="Transparent" />
x:Uid="Oobe_TextExtractor_TipsAndTricks"
Background="Transparent" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="12"> Spacing="12">
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_TextExtractor" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_TextExtractor" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_TextExtractor"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_TextExtractor"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

32
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerRename.xaml
View File

@@ -8,42 +8,26 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_PowerRename" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerRename.gif">
x:Uid="Oobe_PowerRename"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerRename.gif">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToUse"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_PowerRename_HowToUse" Background="Transparent" />
x:Uid="Oobe_PowerRename_HowToUse"
Background="Transparent" />
<TextBlock <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_TipsAndTricks"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_PowerRename_TipsAndTricks" Background="Transparent" />
x:Uid="Oobe_PowerRename_TipsAndTricks"
Background="Transparent" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="12"> Spacing="12">
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_PowerRename" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_PowerRename" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_PowerRename"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_PowerRename"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

32
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRegistryPreview.xaml
View File

@@ -8,28 +8,18 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_RegistryPreview" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/RegistryPreview.png">
x:Uid="Oobe_RegistryPreview"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/RegistryPreview.png">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToUse"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_RegistryPreview_HowToUse" Background="Transparent" />
x:Uid="Oobe_RegistryPreview_HowToUse"
Background="Transparent" />
<TextBlock <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_TipsAndTricks"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_RegistryPreview_TipsAndTricks" Background="Transparent" />
x:Uid="Oobe_RegistryPreview_TipsAndTricks"
Background="Transparent" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
@@ -39,15 +29,9 @@
x:Uid="Launch_RegistryPreview" x:Uid="Launch_RegistryPreview"
Click="Launch_RegistryPreview_Click" Click="Launch_RegistryPreview_Click"
Style="{StaticResource AccentButtonStyle}" /> Style="{StaticResource AccentButtonStyle}" />
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_RegistryPreview" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_RegistryPreview" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_RegistryPreview"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_RegistryPreview"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

32
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRun.xaml
View File

@@ -9,27 +9,17 @@
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_Run" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Run.gif">
x:Uid="Oobe_Run"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Run.gif">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToLaunch" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToLaunch"
Style="{ThemeResource OobeSubtitleStyle}" />
<custom:ShortcutWithTextLabelControl <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_Run_HowToLaunch" />
x:Name="HotkeyControl"
x:Uid="Oobe_Run_HowToLaunch" />
<TextBlock <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_TipsAndTricks"
Style="{ThemeResource OobeSubtitleStyle}" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_Run_TipsAndTricks" Background="Transparent" />
x:Uid="Oobe_Run_TipsAndTricks"
Background="Transparent" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
@@ -39,15 +29,9 @@
x:Uid="Launch_Run" x:Uid="Launch_Run"
Click="Start_Run_Click" Click="Start_Run_Click"
Style="{StaticResource AccentButtonStyle}" /> Style="{StaticResource AccentButtonStyle}" />
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_PowerToysRun" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_Run" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_PowerToysRun"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_Run"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

24
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShortcutGuide.xaml
View File

@@ -8,19 +8,13 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_ShortcutGuide" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/OOBEShortcutGuide.png">
x:Uid="Oobe_ShortcutGuide"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/OOBEShortcutGuide.png">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToLaunch" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToLaunch"
Style="{ThemeResource OobeSubtitleStyle}" />
<custom:ShortcutWithTextLabelControl <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_ShortcutGuide_HowToLaunch" />
x:Name="HotkeyControl"
x:Uid="Oobe_ShortcutGuide_HowToLaunch" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
Orientation="Horizontal" Orientation="Horizontal"
@@ -29,15 +23,9 @@
x:Uid="Launch_ShortcutGuide" x:Uid="Launch_ShortcutGuide"
Click="Start_ShortcutGuide_Click" Click="Start_ShortcutGuide_Click"
Style="{StaticResource AccentButtonStyle}" /> Style="{StaticResource AccentButtonStyle}" />
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_ShortcutGuide" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_ShortcutGuide" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_ShortcutGuide"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_ShortcutGuide"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

40
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeVideoConference.xaml
View File

@@ -9,46 +9,26 @@
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<custom:OOBEPageControl <custom:OOBEPageControl x:Uid="Oobe_VideoConference" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/VideoConferenceMute.png">
x:Uid="Oobe_VideoConference"
HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/VideoConferenceMute.png">
<custom:OOBEPageControl.PageContent> <custom:OOBEPageControl.PageContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock <TextBlock x:Uid="Oobe_HowToLaunch" Style="{ThemeResource OobeSubtitleStyle}" />
x:Uid="Oobe_HowToLaunch"
Style="{ThemeResource OobeSubtitleStyle}" />
<custom:ShortcutWithTextLabelControl <custom:ShortcutWithTextLabelControl x:Name="HotkeyMicVidControl" x:Uid="Oobe_VideoConference_ToggleMicVid" />
x:Name="HotkeyMicVidControl" <custom:ShortcutWithTextLabelControl x:Name="HotkeyMicControl" x:Uid="Oobe_VideoConference_ToggleMic" />
x:Uid="Oobe_VideoConference_ToggleMicVid" /> <custom:ShortcutWithTextLabelControl x:Name="HotkeyPushToTalkControl" x:Uid="Oobe_VideoConference_PushToTalkMic" />
<custom:ShortcutWithTextLabelControl <custom:ShortcutWithTextLabelControl x:Name="HotkeyVidControl" x:Uid="Oobe_VideoConference_ToggleVid" />
x:Name="HotkeyMicControl"
x:Uid="Oobe_VideoConference_ToggleMic" />
<custom:ShortcutWithTextLabelControl
x:Name="HotkeyPushToTalkControl"
x:Uid="Oobe_VideoConference_PushToTalkMic" />
<custom:ShortcutWithTextLabelControl
x:Name="HotkeyVidControl"
x:Uid="Oobe_VideoConference_ToggleVid" />
<toolkitcontrols:MarkdownTextBlock <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_VideoConference_HowToLaunch" Background="Transparent" />
x:Uid="Oobe_VideoConference_HowToLaunch"
Background="Transparent" />
<StackPanel <StackPanel
Margin="0,24,0,0" Margin="0,24,0,0"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="12"> Spacing="12">
<Button <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
x:Uid="OOBE_Settings" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_VideoConference" Style="{StaticResource TextButtonStyle}">
Click="SettingsLaunchButton_Click" /> <TextBlock x:Uid="LearnMore_VCM" TextWrapping="Wrap" />
<HyperlinkButton
NavigateUri="https://aka.ms/PowerToysOverview_VideoConference"
Style="{StaticResource TextButtonStyle}">
<TextBlock
x:Uid="LearnMore_VCM"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

8
src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml
View File

@@ -30,9 +30,7 @@
Margin="0,0,0,16" Margin="0,0,0,16"
NavigateUri="https://github.com/microsoft/PowerToys/releases" NavigateUri="https://github.com/microsoft/PowerToys/releases"
Style="{StaticResource TextButtonStyle}"> Style="{StaticResource TextButtonStyle}">
<TextBlock <TextBlock x:Uid="Oobe_WhatsNew_DetailedReleaseNotesLink" TextWrapping="Wrap" />
x:Uid="Oobe_WhatsNew_DetailedReleaseNotesLink"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
<InfoBar <InfoBar
@@ -53,9 +51,7 @@
IsOpen="False" IsOpen="False"
IsTabStop="True" IsTabStop="True"
Severity="Warning" /> Severity="Warning" />
<ScrollViewer <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
Grid.Row="1"
VerticalScrollBarVisibility="Auto">
<Grid Margin="32,24,32,24"> <Grid Margin="32,24,32,24">
<ProgressRing <ProgressRing
x:Name="LoadingProgressRing" x:Name="LoadingProgressRing"

894
src/settings-ui/Settings.UI/SettingsXAML/Styles/Button.xaml
View File

File diff suppressed because it is too large Load Diff

12
src/settings-ui/Settings.UI/SettingsXAML/Styles/TextBlock.xaml
View File

@@ -1,10 +1,6 @@
<ResourceDictionary <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style <Style x:Key="OobeSubtitleStyle" TargetType="TextBlock">
x:Key="OobeSubtitleStyle"
TargetType="TextBlock">
<Setter Property="Margin" Value="0,16,0,0" /> <Setter Property="Margin" Value="0,16,0,0" />
<Setter Property="Foreground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" /> <Setter Property="Foreground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" />
<Setter Property="AutomationProperties.HeadingLevel" Value="Level3" /> <Setter Property="AutomationProperties.HeadingLevel" Value="Level3" />
@@ -25,8 +21,8 @@
<x:Double x:Key="HeaderTextFontSize">12</x:Double> <x:Double x:Key="HeaderTextFontSize">12</x:Double>
<Style x:Key="HeaderTextStyle" TargetType="TextBlock"> <Style x:Key="HeaderTextStyle" TargetType="TextBlock">
<Setter Property="FontSize" Value="{StaticResource HeaderTextFontSize}"/> <Setter Property="FontSize" Value="{StaticResource HeaderTextFontSize}" />
<Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}"/> <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
<Setter Property="FontWeight" Value="Bold" /> <Setter Property="FontWeight" Value="Bold" />
</Style> </Style>
</ResourceDictionary> </ResourceDictionary>

28
src/settings-ui/Settings.UI/SettingsXAML/Themes/Colors.xaml
View File

@@ -1,35 +1,21 @@
<ResourceDictionary <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.ThemeDictionaries> <ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Dark"> <ResourceDictionary x:Key="Dark">
<SolidColorBrush <SolidColorBrush x:Key="InfoBarInformationalSeverityBackgroundBrush" Color="#FF34424d" />
x:Key="InfoBarInformationalSeverityBackgroundBrush"
Color="#FF34424d" />
<Color x:Key="InfoBarInformationalSeverityIconBackground">#FF5fb2f2</Color> <Color x:Key="InfoBarInformationalSeverityIconBackground">#FF5fb2f2</Color>
<SolidColorBrush <SolidColorBrush x:Key="SolidBackgroundBrush" Color="Black" />
x:Key="SolidBackgroundBrush"
Color="Black" />
</ResourceDictionary> </ResourceDictionary>
<ResourceDictionary x:Key="Light"> <ResourceDictionary x:Key="Light">
<SolidColorBrush <SolidColorBrush x:Key="InfoBarInformationalSeverityBackgroundBrush" Color="#FFd3e7f7" />
x:Key="InfoBarInformationalSeverityBackgroundBrush"
Color="#FFd3e7f7" />
<Color x:Key="InfoBarInformationalSeverityIconBackground">#FF0063b1</Color> <Color x:Key="InfoBarInformationalSeverityIconBackground">#FF0063b1</Color>
<SolidColorBrush <SolidColorBrush x:Key="SolidBackgroundBrush" Color="White" />
x:Key="SolidBackgroundBrush"
Color="White" />
</ResourceDictionary> </ResourceDictionary>
<ResourceDictionary x:Key="HighContrast"> <ResourceDictionary x:Key="HighContrast">
<SolidColorBrush <SolidColorBrush x:Key="InfoBarInformationalSeverityBackgroundBrush" Color="#FF34424d" />
x:Key="InfoBarInformationalSeverityBackgroundBrush" <SolidColorBrush x:Key="SolidBackgroundBrush" Color="Black" />
Color="#FF34424d" />
<SolidColorBrush
x:Key="SolidBackgroundBrush"
Color="Black" />
<Color x:Key="InfoBarInformationalSeverityIconBackground">#FF5fb2f2</Color> <Color x:Key="InfoBarInformationalSeverityIconBackground">#FF5fb2f2</Color>
</ResourceDictionary> </ResourceDictionary>
</ResourceDictionary.ThemeDictionaries> </ResourceDictionary.ThemeDictionaries>

6
src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml
View File

@@ -1,4 +1,4 @@
<Page <Page
x:Class="Microsoft.PowerToys.Settings.UI.Views.ColorPickerPage" x:Class="Microsoft.PowerToys.Settings.UI.Views.ColorPickerPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -160,9 +160,9 @@
<ContentDialog <ContentDialog
x:Name="ColorFormatDialog" x:Name="ColorFormatDialog"
x:Uid="ColorFormatDialog" x:Uid="ColorFormatDialog"
Closed="ColorFormatDialog_Closed"
IsPrimaryButtonEnabled="{Binding IsValid, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsPrimaryButtonEnabled="{Binding IsValid, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
PrimaryButtonStyle="{ThemeResource AccentButtonStyle}" PrimaryButtonStyle="{ThemeResource AccentButtonStyle}">
Closed="ColorFormatDialog_Closed">
<ContentDialog.DataContext> <ContentDialog.DataContext>
<models:ColorFormatModel /> <models:ColorFormatModel />
</ContentDialog.DataContext> </ContentDialog.DataContext>

6
src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml
View File

@@ -1,4 +1,4 @@
<Page <Page
x:Class="Microsoft.PowerToys.Settings.UI.Views.FancyZonesPage" x:Class="Microsoft.PowerToys.Settings.UI.Views.FancyZonesPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -171,8 +171,8 @@
IsExpanded="True"> IsExpanded="True">
<ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.WindowSwitching}" /> <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.WindowSwitching}" />
<controls:SettingsExpander.Items> <controls:SettingsExpander.Items>
<!-- HACK: For some weird reason, a Shortcut Control is not working correctly if it's the first item in the expander, so we add an invisible card as the first one. --> <!-- HACK: For some weird reason, a Shortcut Control is not working correctly if it's the first item in the expander, so we add an invisible card as the first one. -->
<controls:SettingsCard Visibility="Collapsed"/> <controls:SettingsCard Visibility="Collapsed" />
<controls:SettingsCard x:Uid="FancyZones_HotkeyNextTabControl" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.WindowSwitchingCategoryEnabled}"> <controls:SettingsCard x:Uid="FancyZones_HotkeyNextTabControl" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.WindowSwitchingCategoryEnabled}">
<custom:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.NextTabHotkey, Mode=TwoWay}" /> <custom:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.NextTabHotkey, Mode=TwoWay}" />
</controls:SettingsCard> </controls:SettingsCard>

7
src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml
View File

@@ -1,4 +1,4 @@
<Page <Page
x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerLauncherPage" x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerLauncherPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -298,7 +298,10 @@
Visibility="{x:Bind ShowBadgeOnPluginSettingError}" /> Visibility="{x:Bind ShowBadgeOnPluginSettingError}" />
</Grid> </Grid>
<ToggleSwitch x:Uid="PowerLauncher_EnablePluginToggle" IsOn="{x:Bind Path=Disabled, Converter={StaticResource BoolNegationConverter}, Mode=TwoWay}" IsEnabled="{x:Bind Path=EnabledGpoRuleIsConfigured, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" /> <ToggleSwitch
x:Uid="PowerLauncher_EnablePluginToggle"
IsEnabled="{x:Bind Path=EnabledGpoRuleIsConfigured, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
IsOn="{x:Bind Path=Disabled, Converter={StaticResource BoolNegationConverter}, Mode=TwoWay}" />
</StackPanel> </StackPanel>
<controls:SettingsExpander.Items> <controls:SettingsExpander.Items>