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

OOBE XAML refactoring

Browse Source
This commit is contained in:
Niels Laute
2021-08-16 09:56:10 +02:00
parent d6ebb55672
commit 491b720e16
13 changed files with 171 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/FluentIcons/FluentIconsSettings.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

5
src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
View File

@@ -111,7 +111,7 @@
<Compile Include="Controls\SettingsPageControl\SettingsPageControl.xaml.cs"> <Compile Include="Controls\SettingsPageControl\SettingsPageControl.xaml.cs">
<DependentUpon>SettingsPageControl.xaml</DependentUpon> <DependentUpon>SettingsPageControl.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\OOBEPageControl\OOBEPageControl.xaml.cs"> <Compile Include="Controls\OOBEPageControl\OOBEPageControl.xaml.cs">
<DependentUpon>OOBEPageControl.xaml</DependentUpon> <DependentUpon>OOBEPageControl.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\SettingsPageControl\SidePanelLink.cs" /> <Compile Include="Controls\SettingsPageControl\SidePanelLink.cs" />
@@ -231,6 +231,7 @@
<Content Include="Assets\FluentIcons\FluentIconsPowerRename.png" /> <Content Include="Assets\FluentIcons\FluentIconsPowerRename.png" />
<Content Include="Assets\FluentIcons\FluentIconsPowerToys.png" /> <Content Include="Assets\FluentIcons\FluentIconsPowerToys.png" />
<Content Include="Assets\FluentIcons\FluentIconsPowerToysRun.png" /> <Content Include="Assets\FluentIcons\FluentIconsPowerToysRun.png" />
<Content Include="Assets\FluentIcons\FluentIconsSettings.png" />
<Content Include="Assets\FluentIcons\FluentIconsShortcutGuide.png" /> <Content Include="Assets\FluentIcons\FluentIconsShortcutGuide.png" />
<Content Include="Assets\FluentIcons\FluentIconsVideoConferenceMute.png" /> <Content Include="Assets\FluentIcons\FluentIconsVideoConferenceMute.png" />
<Content Include="Assets\Logo.scale-200.png" /> <Content Include="Assets\Logo.scale-200.png" />
@@ -336,7 +337,7 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Controls\OOBEPageControl\OOBEPageControl.xaml"> <Page Include="Controls\OOBEPageControl\OOBEPageControl.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>

65
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFancyZones.xaml
View File

@@ -8,63 +8,32 @@
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid> <controls:OOBEPageControl ModuleTitle="{x:Bind ViewModel.ModuleName}"
<Grid.RowDefinitions> ModuleImageSource="{x:Bind ViewModel.PreviewImageSource}"
<RowDefinition Height="280" /> ModuleDescription="{x:Bind ViewModel.Description}">
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Image Stretch="UniformToFill" <controls:OOBEPageControl.ModuleContent>
Source="{x:Bind ViewModel.PreviewImageSource}" /> <StackPanel Orientation="Vertical">
<ScrollViewer Grid.Row="1"
VerticalScrollBarVisibility="Auto">
<StackPanel Orientation="Vertical"
Margin="{StaticResource OobePageContentMargin}"
VerticalAlignment="Top">
<TextBlock Text="{x:Bind ViewModel.ModuleName}"
AutomationProperties.HeadingLevel="Level2"
Style="{StaticResource PageTitleStyle}" />
<TextBlock TextWrapping="Wrap"
Margin="0,4,0,0"
Text="{x:Bind ViewModel.Description}" />
<HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
Margin="-12,0,0,4">
<TextBlock>
<Run x:Uid="Oobe_LearnMore" />
<Run Text="{x:Bind ViewModel.ModuleName}" />
</TextBlock>
</HyperlinkButton>
<TextBlock x:Uid="Oobe_HowToUse" <TextBlock x:Uid="Oobe_HowToUse"
AutomationProperties.HeadingLevel="Level3" Style="{ThemeResource OobeSubtitleStyle}" />
Style="{StaticResource OobeSubtitleStyle}" />
<controls:ShortcutTextControl x:Uid="Oobe_FancyZones_HowToUse" /> <controls:ShortcutTextControl x:Uid="Oobe_FancyZones_HowToUse" />
<TextBlock x:Uid="Oobe_TipsAndTricks" <TextBlock x:Uid="Oobe_TipsAndTricks"
AutomationProperties.HeadingLevel="Level3" Style="{ThemeResource OobeSubtitleStyle}"/>
Style="{StaticResource OobeSubtitleStyle}" />
<controls:ShortcutTextControl x:Uid="Oobe_FancyZones_TipsAndTricks" /> <controls:ShortcutTextControl x:Uid="Oobe_FancyZones_TipsAndTricks" />
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
Spacing="4" <Button x:Uid="OOBE_Settings"
Margin="0,32,0,0"> Click="SettingsLaunchButton_Click"/>
<Button Click="SettingsLaunchButton_Click" <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}"> <TextBlock x:Uid="LearnMore_FancyZones"
<StackPanel Orientation="Horizontal" TextWrapping="Wrap" />
Spacing="8"> </HyperlinkButton>
<TextBlock Text="&#xE115;"
Margin="0,3,0,0"
FontFamily="Segoe MDL2 Assets" />
<TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel" />
</StackPanel>
</Button>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</ScrollViewer> </controls:OOBEPageControl.ModuleContent>
</Grid> </controls:OOBEPageControl>
</Page> </Page>

62
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFileExplorer.xaml
View File

@@ -7,59 +7,27 @@
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid> <controls:OOBEPageControl ModuleTitle="{x:Bind ViewModel.ModuleName}"
<Grid.RowDefinitions> ModuleImageSource="{x:Bind ViewModel.PreviewImageSource}"
<RowDefinition Height="280" /> ModuleDescription="{x:Bind ViewModel.Description}">
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Image Stretch="UniformToFill" <controls:OOBEPageControl.ModuleContent>
Source="{x:Bind ViewModel.PreviewImageSource}" /> <StackPanel Orientation="Vertical">
<ScrollViewer Grid.Row="1"
VerticalScrollBarVisibility="Auto">
<StackPanel Orientation="Vertical"
Margin="{StaticResource OobePageContentMargin}"
VerticalAlignment="Top">
<TextBlock Text="{x:Bind ViewModel.ModuleName}"
AutomationProperties.HeadingLevel="Level2"
Style="{StaticResource PageTitleStyle}" />
<TextBlock Margin="0,4,0,0"
TextWrapping="Wrap"
Text="{x:Bind ViewModel.Description}" />
<HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
Margin="-12,0,0,4">
<TextBlock>
<Run x:Uid="Oobe_LearnMore" />
<Run Text="{x:Bind ViewModel.ModuleName}" />
</TextBlock>
</HyperlinkButton>
<TextBlock x:Uid="Oobe_HowToEnable" <TextBlock x:Uid="Oobe_HowToEnable"
AutomationProperties.HeadingLevel="Level3" Style="{ThemeResource OobeSubtitleStyle}" />
Style="{StaticResource OobeSubtitleStyle}" />
<controls:ShortcutTextControl x:Uid="Oobe_FileExplorer_HowToEnable" /> <controls:ShortcutTextControl x:Uid="Oobe_FileExplorer_HowToEnable" />
<StackPanel Orientation="Horizontal"
Spacing="4"
Margin="0,32,0,0">
<Button Click="SettingsLaunchButton_Click" <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}"> <Button x:Uid="OOBE_Settings"
<StackPanel Orientation="Horizontal" Click="SettingsLaunchButton_Click"/>
Spacing="8"> <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
<TextBlock Text="&#xE115;" <TextBlock x:Uid="LearnMore_PowerPreview"
Margin="0,3,0,0" TextWrapping="Wrap" />
FontFamily="Segoe MDL2 Assets" /> </HyperlinkButton>
<TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel" />
</StackPanel>
</Button>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</ScrollViewer> </controls:OOBEPageControl.ModuleContent>
</Grid> </controls:OOBEPageControl>
</Page> </Page>

66
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeImageResizer.xaml
View File

@@ -8,64 +8,32 @@
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid> <controls:OOBEPageControl ModuleTitle="{x:Bind ViewModel.ModuleName}"
<Grid.RowDefinitions> ModuleImageSource="{x:Bind ViewModel.PreviewImageSource}"
<RowDefinition Height="280" /> ModuleDescription="{x:Bind ViewModel.Description}">
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Image Stretch="UniformToFill" <controls:OOBEPageControl.ModuleContent>
Source="{x:Bind ViewModel.PreviewImageSource}" /> <StackPanel Orientation="Vertical">
<ScrollViewer Grid.Row="1"
VerticalScrollBarVisibility="Auto">
<StackPanel Orientation="Vertical"
Margin="{StaticResource OobePageContentMargin}"
VerticalAlignment="Top">
<TextBlock Text="{x:Bind ViewModel.ModuleName}"
AutomationProperties.HeadingLevel="Level2"
Style="{StaticResource PageTitleStyle}" />
<TextBlock Margin="0,4,0,0"
TextWrapping="Wrap"
Text="{x:Bind ViewModel.Description}" />
<HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
Margin="-12,0,0,4">
<TextBlock>
<Run x:Uid="Oobe_LearnMore" />
<Run Text="{x:Bind ViewModel.ModuleName}" />
</TextBlock>
</HyperlinkButton>
<TextBlock x:Uid="Oobe_HowToLaunch" <TextBlock x:Uid="Oobe_HowToLaunch"
AutomationProperties.HeadingLevel="Level3" Style="{ThemeResource OobeSubtitleStyle}" />
Style="{StaticResource OobeSubtitleStyle}" />
<controls:ShortcutTextControl x:Uid="Oobe_ImageResizer_HowToLaunch" /> <controls:ShortcutTextControl x:Uid="Oobe_ImageResizer_HowToLaunch" />
<TextBlock x:Uid="Oobe_TipsAndTricks" <TextBlock x:Uid="Oobe_TipsAndTricks"
AutomationProperties.HeadingLevel="Level3" Style="{ThemeResource OobeSubtitleStyle}"/>
Style="{StaticResource OobeSubtitleStyle}" />
<controls:ShortcutTextControl x:Uid="Oobe_ImageResizer_TipsAndTricks" /> <controls:ShortcutTextControl x:Uid="Oobe_ImageResizer_TipsAndTricks" />
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
Spacing="4" <Button x:Uid="OOBE_Settings"
Margin="0,32,0,0"> Click="SettingsLaunchButton_Click"/>
<Button Click="SettingsLaunchButton_Click" <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}"> <TextBlock x:Uid="LearnMore_ImageResizer"
<StackPanel Orientation="Horizontal" TextWrapping="Wrap" />
Spacing="8"> </HyperlinkButton>
<TextBlock Text="&#xE115;"
Margin="0,3,0,0"
FontFamily="Segoe MDL2 Assets" />
<TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel"/>
</StackPanel>
</Button>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</ScrollViewer> </controls:OOBEPageControl.ModuleContent>
</Grid> </controls:OOBEPageControl>
</Page> </Page>

67
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeKBM.xaml
View File

@@ -1,70 +1,37 @@
<Page x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeKBM" <Page x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeKBM"
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: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:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid> <controls:OOBEPageControl ModuleTitle="{x:Bind ViewModel.ModuleName}"
<Grid.RowDefinitions> ModuleImageSource="{x:Bind ViewModel.PreviewImageSource}"
<RowDefinition Height="280" /> ModuleDescription="{x:Bind ViewModel.Description}">
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Image Stretch="UniformToFill" <controls:OOBEPageControl.ModuleContent>
Source="{x:Bind ViewModel.PreviewImageSource}" /> <StackPanel Orientation="Vertical">
<ScrollViewer Grid.Row="1"
VerticalScrollBarVisibility="Auto">
<StackPanel Orientation="Vertical"
Margin="{StaticResource OobePageContentMargin}"
VerticalAlignment="Top">
<TextBlock Text="{x:Bind ViewModel.ModuleName}"
AutomationProperties.HeadingLevel="Level2"
Style="{StaticResource PageTitleStyle}" />
<TextBlock Margin="0,4,0,0"
TextWrapping="Wrap"
Text="{x:Bind ViewModel.Description}" />
<HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
Margin="-12,0,0,4">
<TextBlock>
<Run x:Uid="Oobe_LearnMore" />
<Run Text="{x:Bind ViewModel.ModuleName}" />
</TextBlock>
</HyperlinkButton>
<TextBlock x:Uid="Oobe_HowToCreateMappings" <TextBlock x:Uid="Oobe_HowToCreateMappings"
AutomationProperties.HeadingLevel="Level3" Style="{ThemeResource OobeSubtitleStyle}" />
Style="{StaticResource OobeSubtitleStyle}" />
<controls:ShortcutTextControl x:Uid="Oobe_KBM_HowToCreateMappings" /> <controls:ShortcutTextControl x:Uid="Oobe_KBM_HowToCreateMappings" />
<TextBlock x:Uid="Oobe_TipsAndTricks" <TextBlock x:Uid="Oobe_TipsAndTricks"
AutomationProperties.HeadingLevel="Level3" Style="{ThemeResource OobeSubtitleStyle}"/>
Style="{StaticResource OobeSubtitleStyle}" />
<controls:ShortcutTextControl x:Uid="Oobe_KBM_TipsAndTricks" /> <controls:ShortcutTextControl x:Uid="Oobe_KBM_TipsAndTricks" />
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
Spacing="4" <Button x:Uid="OOBE_Settings"
Margin="0,32,0,0"> Click="SettingsLaunchButton_Click"/>
<Button Click="SettingsLaunchButton_Click" <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}"> <TextBlock x:Uid="LearnMore_KBM"
<StackPanel Orientation="Horizontal" TextWrapping="Wrap" />
Spacing="8"> </HyperlinkButton>
<TextBlock Text="&#xE115;"
Margin="0,3,0,0"
FontFamily="Segoe MDL2 Assets" />
<TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel" />
</StackPanel>
</Button>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</ScrollViewer> </controls:OOBEPageControl.ModuleContent>
</Grid> </controls:OOBEPageControl>
</Page> </Page>

65
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeOverview.xaml
View File

@@ -4,56 +4,33 @@
xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views" 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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid> <controls:OOBEPageControl ModuleTitle="{x:Bind ViewModel.ModuleName}"
<Grid.RowDefinitions> ModuleImageSource="{x:Bind ViewModel.PreviewImageSource}">
<RowDefinition Height="280" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Image Stretch="UniformToFill" <controls:OOBEPageControl.ModuleContent>
Source="{x:Bind ViewModel.PreviewImageSource}" /> <StackPanel Orientation="Vertical">
<ScrollViewer Grid.Row="1"
VerticalScrollBarVisibility="Auto">
<StackPanel Orientation="Vertical"
Margin="{StaticResource OobePageContentMargin}"
VerticalAlignment="Top">
<TextBlock Text="{x:Bind ViewModel.ModuleName}"
AutomationProperties.HeadingLevel="Level2"
Style="{StaticResource PageTitleStyle}" />
<TextBlock Margin="0,4,0,0" <TextBlock Margin="0,4,0,0"
TextWrapping="Wrap"> x:Uid="Oobe_Overview_Description"
<Run x:Uid="Oobe_Overview_Description" /> TextWrapping="Wrap"/>
<Hyperlink NavigateUri="{x:Bind ViewModel.DescriptionLink}"> <HyperlinkButton NavigateUri="{x:Bind ViewModel.DescriptionLink}" Style="{StaticResource HyperlinkButtonStyle}">
<Run x:Uid="Oobe_Overview_DescriptionLinkText" /> <TextBlock x:Uid="Oobe_Overview_DescriptionLinkText"
</Hyperlink><Run Text="." /> TextWrapping="Wrap" />
</TextBlock> </HyperlinkButton>
<TextBlock Margin="0,32,0,0" <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
TextWrapping="Wrap"> <TextBlock x:Uid="Oobe_Overview_LatestVersionLink"
<Run x:Uid="Oobe_Overview_CheckoutLatestVersion" /> TextWrapping="Wrap" />
<Hyperlink NavigateUri="{x:Bind ViewModel.Link}"> </HyperlinkButton>
<Run x:Uid="Oobe_Overview_LatestVersionLink" />
</Hyperlink><Run Text="." />
</TextBlock>
<Button Click="SettingsLaunchButton_Click" <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}" <Button x:Uid="OOBE_Settings"
Margin="0,32,0,0"> Click="SettingsLaunchButton_Click"/>
<StackPanel Orientation="Horizontal" </StackPanel>
Spacing="8">
<TextBlock Text="&#xE115;"
Margin="0,3,0,0"
FontFamily="Segoe MDL2 Assets" />
<TextBlock
Name="SettingsLabel" />
</StackPanel>
</Button>
</StackPanel> </StackPanel>
</ScrollViewer> </controls:OOBEPageControl.ModuleContent>
</Grid> </controls:OOBEPageControl>
</Page> </Page>

69
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobePowerRename.xaml
View File

@@ -7,67 +7,32 @@
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid> <controls:OOBEPageControl ModuleTitle="{x:Bind ViewModel.ModuleName}"
<Grid.RowDefinitions> ModuleImageSource="{x:Bind ViewModel.PreviewImageSource}"
<RowDefinition Height="280" /> ModuleDescription="{x:Bind ViewModel.Description}">
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Image Stretch="UniformToFill"
Source="{x:Bind ViewModel.PreviewImageSource}" />
<ScrollViewer Grid.Row="1"
VerticalScrollBarVisibility="Auto">
<StackPanel Orientation="Vertical"
Margin="{StaticResource OobePageContentMargin}"
VerticalAlignment="Top">
<TextBlock Text="{x:Bind ViewModel.ModuleName}"
AutomationProperties.HeadingLevel="Level2"
Style="{StaticResource PageTitleStyle}" />
<TextBlock Margin="0,4,0,0"
TextWrapping="Wrap"
Text="{x:Bind ViewModel.Description}" />
<HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
Margin="-12,0,0,4">
<TextBlock>
<Run x:Uid="Oobe_LearnMore" />
<Run Text="{x:Bind ViewModel.ModuleName}" />
</TextBlock>
</HyperlinkButton>
<controls:OOBEPageControl.ModuleContent>
<StackPanel Orientation="Vertical">
<TextBlock x:Uid="Oobe_HowToUse" <TextBlock x:Uid="Oobe_HowToUse"
AutomationProperties.HeadingLevel="Level3" Style="{ThemeResource OobeSubtitleStyle}" />
Style="{StaticResource OobeSubtitleStyle}" />
<controls:ShortcutTextControl x:Uid="Oobe_PowerRename_HowToUse" /> <controls:ShortcutTextControl x:Uid="Oobe_PowerRename_HowToUse" />
<TextBlock x:Uid="Oobe_TipsAndTricks" <TextBlock x:Uid="Oobe_TipsAndTricks"
AutomationProperties.HeadingLevel="Level3" Style="{ThemeResource OobeSubtitleStyle}"/>
Style="{StaticResource OobeSubtitleStyle}" />
<TextBlock x:Uid="Oobe_PowerRename_TipsAndTricks" <controls:ShortcutTextControl x:Uid="Oobe_PowerRename_TipsAndTricks" />
TextWrapping="Wrap" />
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
Spacing="4" <Button x:Uid="OOBE_Settings"
Margin="0,32,0,0"> Click="SettingsLaunchButton_Click"/>
<HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
<Button Click="SettingsLaunchButton_Click" <TextBlock x:Uid="LearnMore_PowerRename"
AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}"> TextWrapping="Wrap" />
<StackPanel Orientation="Horizontal" </HyperlinkButton>
Spacing="8">
<TextBlock Text="&#xE115;"
Margin="0,3,0,0"
FontFamily="Segoe MDL2 Assets" />
<TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel" />
</StackPanel>
</Button>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</ScrollViewer> </controls:OOBEPageControl.ModuleContent>
</Grid> </controls:OOBEPageControl>
</Page> </Page>

76
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeRun.xaml
View File

@@ -8,73 +8,33 @@
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid> <controls:OOBEPageControl ModuleTitle="{x:Bind ViewModel.ModuleName}"
<Grid.RowDefinitions> ModuleImageSource="{x:Bind ViewModel.PreviewImageSource}"
<RowDefinition Height="280" /> ModuleDescription="{x:Bind ViewModel.Description}">
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Image Stretch="UniformToFill" <controls:OOBEPageControl.ModuleContent>
Source="{x:Bind ViewModel.PreviewImageSource}" /> <StackPanel Orientation="Vertical">
<ScrollViewer Grid.Row="1"
VerticalScrollBarVisibility="Auto">
<StackPanel Orientation="Vertical"
Margin="{StaticResource OobePageContentMargin}"
VerticalAlignment="Top">
<TextBlock Text="{x:Bind ViewModel.ModuleName}"
AutomationProperties.HeadingLevel="Level2"
Style="{StaticResource PageTitleStyle}" />
<TextBlock Margin="0,4,0,0"
TextWrapping="Wrap"
Text="{x:Bind ViewModel.Description}" />
<HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
Margin="-12,0,0,4">
<TextBlock>
<Run x:Uid="Oobe_LearnMore" />
<Run Text="{x:Bind ViewModel.ModuleName}" />
</TextBlock>
</HyperlinkButton>
<TextBlock x:Uid="Oobe_HowToLaunch" <TextBlock x:Uid="Oobe_HowToLaunch"
AutomationProperties.HeadingLevel="Level3" Style="{ThemeResource OobeSubtitleStyle}" />
Style="{StaticResource OobeSubtitleStyle}" />
<controls:ShortcutTextControl x:Uid="Oobe_Run_HowToLaunch" /> <controls:ShortcutTextControl x:Uid="Oobe_Run_HowToLaunch" />
<TextBlock x:Uid="Oobe_TipsAndTricks" <TextBlock x:Uid="Oobe_TipsAndTricks"
AutomationProperties.HeadingLevel="Level3" Style="{ThemeResource OobeSubtitleStyle}"/>
Style="{StaticResource OobeSubtitleStyle}" />
<controls:ShortcutTextControl x:Uid="Oobe_Run_TipsAndTricks" /> <controls:ShortcutTextControl x:Uid="Oobe_Run_TipsAndTricks" />
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
Margin="0,32,0,0" <Button x:Uid="Launch_Run" Style="{StaticResource AccentButtonStyle}" Click="Start_Run_Click"/>
Spacing="4"> <Button x:Uid="OOBE_Settings"
Click="SettingsLaunchButton_Click"/>
<Button Click="Start_Run_Click" Style="{StaticResource AccentButtonStyle}"> <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
<TextBlock> <TextBlock x:Uid="LearnMore_Run"
<Run x:Uid="Oobe_Launch" /> TextWrapping="Wrap" />
<Run Text="{x:Bind ViewModel.ModuleName}" /> </HyperlinkButton>
</TextBlock>
</Button>
<Button Click="SettingsLaunchButton_Click"
AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}">
<StackPanel Orientation="Horizontal"
Spacing="8">
<TextBlock Text="&#xE115;"
Margin="0,3,0,0"
FontFamily="Segoe MDL2 Assets" />
<TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel" />
</StackPanel>
</Button>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</ScrollViewer> </controls:OOBEPageControl.ModuleContent>
</Grid> </controls:OOBEPageControl>
</Page> </Page>

72
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShortcutGuide.xaml
View File

@@ -8,65 +8,29 @@
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="280" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Image Stretch="UniformToFill" <controls:OOBEPageControl ModuleTitle="{x:Bind ViewModel.ModuleName}"
Source="{x:Bind ViewModel.PreviewImageSource}" /> ModuleImageSource="{x:Bind ViewModel.PreviewImageSource}"
ModuleDescription="{x:Bind ViewModel.Description}">
<ScrollViewer Grid.Row="1" <controls:OOBEPageControl.ModuleContent>
VerticalScrollBarVisibility="Auto"> <StackPanel Orientation="Vertical">
<StackPanel Orientation="Vertical"
Margin="{StaticResource OobePageContentMargin}"
VerticalAlignment="Top">
<TextBlock Text="{x:Bind ViewModel.ModuleName}"
AutomationProperties.HeadingLevel="Level2"
Style="{StaticResource PageTitleStyle}" />
<TextBlock Margin="0,4,0,0"
TextWrapping="Wrap"
Text="{x:Bind ViewModel.Description}" />
<HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
Margin="-12,0,0,4">
<TextBlock>
<Run x:Uid="Oobe_LearnMore" />
<Run Text="{x:Bind ViewModel.ModuleName}" />
</TextBlock>
</HyperlinkButton>
<TextBlock x:Uid="Oobe_HowToLaunch" <TextBlock x:Uid="Oobe_HowToLaunch"
AutomationProperties.HeadingLevel="Level3" Style="{ThemeResource OobeSubtitleStyle}" />
Style="{StaticResource OobeSubtitleStyle}" />
<controls:ShortcutTextControl x:Uid="Oobe_ShortcutGuide_HowToLaunch" /> <controls:ShortcutTextControl x:Uid="Oobe_ShortcutGuide_HowToLaunch" />
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
Margin="0,32,0,0" <Button x:Uid="Launch_ShortcutGuide" Style="{StaticResource AccentButtonStyle}" Click="Start_ShortcutGuide_Click"/>
Spacing="8"> <Button x:Uid="OOBE_Settings"
<Button Click="Start_ShortcutGuide_Click" Style="{StaticResource AccentButtonStyle}"> Click="SettingsLaunchButton_Click"/>
<TextBlock> <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
<Run x:Uid="Oobe_Launch" /> <TextBlock x:Uid="LearnMore_ShortcutGuide"
<Run Text="{x:Bind ViewModel.ModuleName}" /> TextWrapping="Wrap" />
</TextBlock> </HyperlinkButton>
</Button>
<Button Click="SettingsLaunchButton_Click"
AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}">
<StackPanel Orientation="Horizontal"
Spacing="8">
<TextBlock Text="&#xE115;"
Margin="0,3,0,0"
FontFamily="Segoe MDL2 Assets" />
<TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel" />
</StackPanel>
</Button>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</ScrollViewer> </controls:OOBEPageControl.ModuleContent>
</Grid> </controls:OOBEPageControl>
</Page> </Page>

63
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeVideoConference.xaml
View File

@@ -8,58 +8,27 @@
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid> <controls:OOBEPageControl ModuleTitle="{x:Bind ViewModel.ModuleName}"
<Grid.RowDefinitions> ModuleImageSource="{x:Bind ViewModel.PreviewImageSource}"
<RowDefinition Height="280" /> ModuleDescription="{x:Bind ViewModel.Description}">
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Image Stretch="UniformToFill" <controls:OOBEPageControl.ModuleContent>
Source="{x:Bind ViewModel.PreviewImageSource}" /> <StackPanel Orientation="Vertical">
<ScrollViewer Grid.Row="1"
VerticalScrollBarVisibility="Auto">
<StackPanel Orientation="Vertical"
Margin="{StaticResource OobePageContentMargin}"
VerticalAlignment="Top">
<TextBlock Text="{x:Bind ViewModel.ModuleName}"
AutomationProperties.HeadingLevel="Level2"
Style="{StaticResource PageTitleStyle}" />
<TextBlock TextWrapping="Wrap"
Margin="0,4,0,0"
Text="{x:Bind ViewModel.Description}" />
<HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
Margin="-12,0,0,4">
<TextBlock>
<Run x:Uid="Oobe_LearnMore" />
<Run Text="{x:Bind ViewModel.ModuleName}" />
</TextBlock>
</HyperlinkButton>
<TextBlock x:Uid="Oobe_HowToLaunch" <TextBlock x:Uid="Oobe_HowToLaunch"
AutomationProperties.HeadingLevel="Level3" Style="{ThemeResource OobeSubtitleStyle}" />
Style="{StaticResource OobeSubtitleStyle}" />
<controls:ShortcutTextControl x:Uid="Oobe_VideoConference_HowToLaunch" /> <controls:ShortcutTextControl x:Uid="Oobe_VideoConference_HowToLaunch" />
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
Margin="0,32,0,0" <Button x:Uid="OOBE_Settings"
Spacing="8"> Click="SettingsLaunchButton_Click"/>
<Button Click="SettingsLaunchButton_Click" <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Style="{StaticResource HyperlinkButtonStyle}">
AutomationProperties.LabeledBy="{Binding ElementName=SettingsLabel}"> <TextBlock x:Uid="LearnMore_VCM"
<StackPanel Orientation="Horizontal" TextWrapping="Wrap" />
Spacing="8"> </HyperlinkButton>
<TextBlock Text="&#xE115;"
Margin="0,3,0,0"
FontFamily="Segoe MDL2 Assets" />
<TextBlock x:Uid="OOBE_Settings" Name="SettingsLabel"/>
</StackPanel>
</Button>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</ScrollViewer> </controls:OOBEPageControl.ModuleContent>
</Grid> </controls:OOBEPageControl>
</Page> </Page>

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

@@ -1170,7 +1170,7 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
<value>Launch</value> <value>Launch</value>
</data> </data>
<data name="Launch_ColorPicker.Content" xml:space="preserve"> <data name="Launch_ColorPicker.Content" xml:space="preserve">
<value>Launch ColorPicker</value> <value>Launch Color Picker</value>
</data> </data>
<data name="Oobe_LearnMore.Text" xml:space="preserve"> <data name="Oobe_LearnMore.Text" xml:space="preserve">
<value>Learn more about</value> <value>Learn more about</value>
@@ -1202,18 +1202,16 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
<data name="Oobe_VideoConference_Description" xml:space="preserve"> <data name="Oobe_VideoConference_Description" xml:space="preserve">
<value>Video Conference Mute allows users to quickly mute the microphone and turn off the camera while on a conference call with a single keystroke, regardless of what application has focus on your computer.</value> <value>Video Conference Mute allows users to quickly mute the microphone and turn off the camera while on a conference call with a single keystroke, regardless of what application has focus on your computer.</value>
</data> </data>
<data name="Oobe_Overview_CheckoutLatestVersion.Text" xml:space="preserve">
<value>For returning users, check out what is new in our</value>
</data>
<data name="Oobe_Overview_Description.Text" xml:space="preserve"> <data name="Oobe_Overview_Description.Text" xml:space="preserve">
<value>Microsoft PowerToys is a set of utilities for power users to tune and streamline their Windows 10 experience for greater productivity. <value>Microsoft PowerToys is a set of utilities for power users to tune and streamline their Windows 10 experience for greater productivity.
Take a moment to preview the various utilities listed or view our comprehensive documentation on</value>
Take a moment to preview the various utilities listed or view our comprehensive documentation.</value>
</data> </data>
<data name="Oobe_Overview_DescriptionLinkText.Text" xml:space="preserve"> <data name="Oobe_Overview_DescriptionLinkText.Text" xml:space="preserve">
<value>Microsoft Docs</value> <value>Check out documentation on Microsoft Docs</value>
</data> </data>
<data name="Oobe_Overview_LatestVersionLink.Text" xml:space="preserve"> <data name="Oobe_Overview_LatestVersionLink.Text" xml:space="preserve">
<value>release notes</value> <value>Check out what's new in our release notes</value>
</data> </data>
<data name="Oobe_ColorPicker_HowToUse.Text" xml:space="preserve"> <data name="Oobe_ColorPicker_HowToUse.Text" xml:space="preserve">
<value>{Win} + {Shift} + {C} to open Color Picker.</value> <value>{Win} + {Shift} + {C} to open Color Picker.</value>
@@ -1517,4 +1515,10 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
<value>File Explorer add-ons</value> <value>File Explorer add-ons</value>
<comment>Do not localize this string</comment> <comment>Do not localize this string</comment>
</data> </data>
<data name="Launch_Run.Content" xml:space="preserve">
<value>Launch PowerToys Run</value>
</data>
<data name="Launch_ShortcutGuide.Content" xml:space="preserve">
<value>Launch Shortcut Guide</value>
</data>
</root> </root>

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

@@ -43,7 +43,7 @@
<winui:NavigationView.MenuItems> <winui:NavigationView.MenuItems>
<winui:NavigationViewItem x:Uid="Shell_General" helpers:NavHelper.NavigateTo="views:GeneralPage" AutomationProperties.HeadingLevel="Level1"> <winui:NavigationViewItem x:Uid="Shell_General" helpers:NavHelper.NavigateTo="views:GeneralPage" AutomationProperties.HeadingLevel="Level1">
<winui:NavigationViewItem.Icon> <winui:NavigationViewItem.Icon>
<FontIcon Glyph="&#xE713;"/> <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsSettings.png" ShowAsMonochrome="False"/>
</winui:NavigationViewItem.Icon> </winui:NavigationViewItem.Icon>
</winui:NavigationViewItem> </winui:NavigationViewItem>