[Awake] Updated images + settings menu fix (#11728)
* Alphabetical module order in Settings navview menu * Updated images * Updated menu order in OOBE Co-authored-by: Niels Laute <niels9001@hotmail.com>
Before Width: | Height: | Size: 70 KiB After Width: | Height: | Size: 64 KiB |
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 196 KiB After Width: | Height: | Size: 176 KiB |
Before Width: | Height: | Size: 70 KiB After Width: | Height: | Size: 64 KiB |
Before Width: | Height: | Size: 246 KiB After Width: | Height: | Size: 230 KiB |
|
@ -7,8 +7,8 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Enums
|
||||||
public enum PowerToysModulesEnum
|
public enum PowerToysModulesEnum
|
||||||
{
|
{
|
||||||
Overview = 0,
|
Overview = 0,
|
||||||
ColorPicker,
|
|
||||||
Awake,
|
Awake,
|
||||||
|
ColorPicker,
|
||||||
FancyZones,
|
FancyZones,
|
||||||
FileExplorer,
|
FileExplorer,
|
||||||
ImageResizer,
|
ImageResizer,
|
||||||
|
|
|
@ -69,18 +69,6 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
||||||
DescriptionLink = "https://aka.ms/PowerToysOverview",
|
DescriptionLink = "https://aka.ms/PowerToysOverview",
|
||||||
Link = "https://github.com/microsoft/PowerToys/releases/",
|
Link = "https://github.com/microsoft/PowerToys/releases/",
|
||||||
});
|
});
|
||||||
Modules.Insert((int)PowerToysModulesEnum.ColorPicker, new OobePowerToysModule()
|
|
||||||
{
|
|
||||||
ModuleName = loader.GetString("Oobe_ColorPicker"),
|
|
||||||
Tag = "ColorPicker",
|
|
||||||
IsNew = false,
|
|
||||||
Icon = "\uEF3C",
|
|
||||||
Image = "ms-appx:///Assets/Modules/ColorPicker.png",
|
|
||||||
FluentIcon = "ms-appx:///Assets/FluentIcons/FluentIconsColorPicker.png",
|
|
||||||
PreviewImageSource = "ms-appx:///Assets/Modules/OOBE/ColorPicker.gif",
|
|
||||||
Description = loader.GetString("Oobe_ColorPicker_Description"),
|
|
||||||
Link = "https://aka.ms/PowerToysOverview_ColorPicker",
|
|
||||||
});
|
|
||||||
Modules.Insert((int)PowerToysModulesEnum.Awake, new OobePowerToysModule()
|
Modules.Insert((int)PowerToysModulesEnum.Awake, new OobePowerToysModule()
|
||||||
{
|
{
|
||||||
ModuleName = loader.GetString("Oobe_Awake"),
|
ModuleName = loader.GetString("Oobe_Awake"),
|
||||||
|
@ -93,6 +81,18 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
||||||
Description = loader.GetString("Oobe_Awake_Description"),
|
Description = loader.GetString("Oobe_Awake_Description"),
|
||||||
Link = "https://aka.ms/PowerToysOverview_Awake",
|
Link = "https://aka.ms/PowerToysOverview_Awake",
|
||||||
});
|
});
|
||||||
|
Modules.Insert((int)PowerToysModulesEnum.ColorPicker, new OobePowerToysModule()
|
||||||
|
{
|
||||||
|
ModuleName = loader.GetString("Oobe_ColorPicker"),
|
||||||
|
Tag = "ColorPicker",
|
||||||
|
IsNew = false,
|
||||||
|
Icon = "\uEF3C",
|
||||||
|
Image = "ms-appx:///Assets/Modules/ColorPicker.png",
|
||||||
|
FluentIcon = "ms-appx:///Assets/FluentIcons/FluentIconsColorPicker.png",
|
||||||
|
PreviewImageSource = "ms-appx:///Assets/Modules/OOBE/ColorPicker.gif",
|
||||||
|
Description = loader.GetString("Oobe_ColorPicker_Description"),
|
||||||
|
Link = "https://aka.ms/PowerToysOverview_ColorPicker",
|
||||||
|
});
|
||||||
Modules.Insert((int)PowerToysModulesEnum.FancyZones, new OobePowerToysModule()
|
Modules.Insert((int)PowerToysModulesEnum.FancyZones, new OobePowerToysModule()
|
||||||
{
|
{
|
||||||
ModuleName = loader.GetString("Oobe_FancyZones"),
|
ModuleName = loader.GetString("Oobe_FancyZones"),
|
||||||
|
@ -215,8 +215,8 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
||||||
switch (selectedItem.Tag)
|
switch (selectedItem.Tag)
|
||||||
{
|
{
|
||||||
case "Overview": NavigationFrame.Navigate(typeof(OobeOverview)); break;
|
case "Overview": NavigationFrame.Navigate(typeof(OobeOverview)); break;
|
||||||
case "ColorPicker": NavigationFrame.Navigate(typeof(OobeColorPicker)); break;
|
|
||||||
case "Awake": NavigationFrame.Navigate(typeof(OobeAwake)); break;
|
case "Awake": NavigationFrame.Navigate(typeof(OobeAwake)); break;
|
||||||
|
case "ColorPicker": NavigationFrame.Navigate(typeof(OobeColorPicker)); break;
|
||||||
case "FancyZones": NavigationFrame.Navigate(typeof(OobeFancyZones)); break;
|
case "FancyZones": NavigationFrame.Navigate(typeof(OobeFancyZones)); break;
|
||||||
case "Run": NavigationFrame.Navigate(typeof(OobeRun)); break;
|
case "Run": NavigationFrame.Navigate(typeof(OobeRun)); break;
|
||||||
case "ImageResizer": NavigationFrame.Navigate(typeof(OobeImageResizer)); break;
|
case "ImageResizer": NavigationFrame.Navigate(typeof(OobeImageResizer)); break;
|
||||||
|
|
|
@ -36,18 +36,18 @@
|
||||||
</winui:NavigationViewItem.Icon>
|
</winui:NavigationViewItem.Icon>
|
||||||
</winui:NavigationViewItem>
|
</winui:NavigationViewItem>
|
||||||
|
|
||||||
<winui:NavigationViewItem x:Uid="Shell_ColorPicker" helpers:NavHelper.NavigateTo="views:ColorPickerPage" AutomationProperties.HeadingLevel="Level1">
|
|
||||||
<winui:NavigationViewItem.Icon>
|
|
||||||
<FontIcon Glyph=""/>
|
|
||||||
</winui:NavigationViewItem.Icon>
|
|
||||||
</winui:NavigationViewItem>
|
|
||||||
|
|
||||||
<winui:NavigationViewItem x:Uid="Shell_Awake" helpers:NavHelper.NavigateTo="views:AwakePage" AutomationProperties.HeadingLevel="Level1">
|
<winui:NavigationViewItem x:Uid="Shell_Awake" helpers:NavHelper.NavigateTo="views:AwakePage" AutomationProperties.HeadingLevel="Level1">
|
||||||
<winui:NavigationViewItem.Icon>
|
<winui:NavigationViewItem.Icon>
|
||||||
<FontIcon Glyph=""/>
|
<FontIcon Glyph=""/>
|
||||||
</winui:NavigationViewItem.Icon>
|
</winui:NavigationViewItem.Icon>
|
||||||
</winui:NavigationViewItem>
|
</winui:NavigationViewItem>
|
||||||
|
|
||||||
|
<winui:NavigationViewItem x:Uid="Shell_ColorPicker" helpers:NavHelper.NavigateTo="views:ColorPickerPage" AutomationProperties.HeadingLevel="Level1">
|
||||||
|
<winui:NavigationViewItem.Icon>
|
||||||
|
<FontIcon Glyph=""/>
|
||||||
|
</winui:NavigationViewItem.Icon>
|
||||||
|
</winui:NavigationViewItem>
|
||||||
|
|
||||||
<winui:NavigationViewItem x:Uid="Shell_FancyZones" helpers:NavHelper.NavigateTo="views:FancyZonesPage" AutomationProperties.HeadingLevel="Level1">
|
<winui:NavigationViewItem x:Uid="Shell_FancyZones" helpers:NavHelper.NavigateTo="views:FancyZonesPage" AutomationProperties.HeadingLevel="Level1">
|
||||||
<winui:NavigationViewItem.Icon>
|
<winui:NavigationViewItem.Icon>
|
||||||
<PathIcon Data="M45,48H25.5V45H45V25.5H25.5v-3H45V3H25.5V0H48V48ZM22.5,48H3V45H22.5V3H3V0H25.5V48ZM0,48V0H3V48Z"/>
|
<PathIcon Data="M45,48H25.5V45H45V25.5H25.5v-3H45V3H25.5V0H48V48ZM22.5,48H3V45H22.5V3H3V0H25.5V48ZM0,48V0H3V48Z"/>
|
||||||
|
|