[Settings] Fix "What's new" icon (#30557)

* Fixing order and icon

* XAML styler

* Fix expect
This commit is contained in:
Niels Laute
2023-12-25 18:31:07 +01:00
committed by GitHub
parent ae21b0dc09
commit 3e45392274
3 changed files with 22 additions and 10 deletions

View File

@@ -34,6 +34,7 @@ ALPHATYPE
AModifier AModifier
AMPROPERTY AMPROPERTY
AMPROPSETID AMPROPSETID
animatedvisuals
ANDSCANS ANDSCANS
ansicolor ansicolor
ANull ANull

View File

@@ -2,6 +2,7 @@
x:Class="Microsoft.PowerToys.Settings.UI.Views.ShellPage" x:Class="Microsoft.PowerToys.Settings.UI.Views.ShellPage"
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:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
xmlns:animations="using:CommunityToolkit.WinUI.Animations" xmlns:animations="using:CommunityToolkit.WinUI.Animations"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:helpers="using:Microsoft.PowerToys.Settings.UI.Helpers" xmlns:helpers="using:Microsoft.PowerToys.Settings.UI.Helpers"
@@ -90,10 +91,18 @@
helpers:NavHelper.NavigateTo="views:DashboardPage" helpers:NavHelper.NavigateTo="views:DashboardPage"
Icon="{ui:FontIcon Glyph=}" /> Icon="{ui:FontIcon Glyph=}" />
<NavigationViewItem <NavigationViewItem x:Uid="Shell_General" helpers:NavHelper.NavigateTo="views:GeneralPage">
x:Uid="Shell_General" <NavigationViewItem.Icon>
helpers:NavHelper.NavigateTo="views:GeneralPage" <AnimatedIcon>
Icon="{ui:FontIcon Glyph=&#xE713;}" /> <AnimatedIcon.Source>
<animatedvisuals:AnimatedSettingsVisualSource />
</AnimatedIcon.Source>
<AnimatedIcon.FallbackIconSource>
<SymbolIconSource Symbol="Setting" />
</AnimatedIcon.FallbackIconSource>
</AnimatedIcon>
</NavigationViewItem.Icon>
</NavigationViewItem>
<NavigationViewItemSeparator /> <NavigationViewItemSeparator />
<NavigationViewItem <NavigationViewItem
@@ -125,15 +134,17 @@
x:Uid="Shell_FancyZones" x:Uid="Shell_FancyZones"
helpers:NavHelper.NavigateTo="views:FancyZonesPage" helpers:NavHelper.NavigateTo="views:FancyZonesPage"
Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsFancyZones.png}" /> Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsFancyZones.png}" />
<NavigationViewItem
x:Uid="Shell_FileLocksmith"
helpers:NavHelper.NavigateTo="views:FileLocksmithPage"
Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsFileLocksmith.png}" />
<NavigationViewItem <NavigationViewItem
x:Uid="Shell_PowerPreview" x:Uid="Shell_PowerPreview"
helpers:NavHelper.NavigateTo="views:PowerPreviewPage" helpers:NavHelper.NavigateTo="views:PowerPreviewPage"
Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsFileExplorerPreview.png}" /> Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsFileExplorerPreview.png}" />
<NavigationViewItem
x:Uid="Shell_FileLocksmith"
helpers:NavHelper.NavigateTo="views:FileLocksmithPage"
Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsFileLocksmith.png}" />
<NavigationViewItem <NavigationViewItem
x:Uid="Shell_Hosts" x:Uid="Shell_Hosts"
helpers:NavHelper.NavigateTo="views:HostsPage" helpers:NavHelper.NavigateTo="views:HostsPage"
@@ -217,7 +228,7 @@
Tapped="OOBEItem_Tapped" /> Tapped="OOBEItem_Tapped" />
<NavigationViewItem <NavigationViewItem
x:Uid="WhatIsNew_NavViewItem" x:Uid="WhatIsNew_NavViewItem"
Icon="{ui:FontIcon Glyph=&#xF133;}" Icon="{ui:FontIcon Glyph=&#xE789;}"
Tapped="WhatIsNewItem_Tapped" /> Tapped="WhatIsNewItem_Tapped" />
<NavigationViewItem <NavigationViewItem
x:Uid="Feedback_NavViewItem" x:Uid="Feedback_NavViewItem"

View File

@@ -2187,7 +2187,7 @@ From there, simply click on one of the supported files in the File Explorer and
<comment>Don't loc "PowerToys"</comment> <comment>Don't loc "PowerToys"</comment>
</data> </data>
<data name="WhatIsNew_NavViewItem.Content" xml:space="preserve"> <data name="WhatIsNew_NavViewItem.Content" xml:space="preserve">
<value>What's New</value> <value>What's new</value>
</data> </data>
<data name="Feedback_NavViewItem.Content" xml:space="preserve"> <data name="Feedback_NavViewItem.Content" xml:space="preserve">
<value>Give feedback</value> <value>Give feedback</value>