diff --git a/doc/images/overview/Awake_large.png b/doc/images/overview/Awake_large.png index d573613513..d1ab7767c4 100644 Binary files a/doc/images/overview/Awake_large.png and b/doc/images/overview/Awake_large.png differ diff --git a/doc/images/overview/Awake_small.png b/doc/images/overview/Awake_small.png index 4964ab7330..79863d27ce 100644 Binary files a/doc/images/overview/Awake_small.png and b/doc/images/overview/Awake_small.png differ diff --git a/doc/images/overview/Original/Awake.png b/doc/images/overview/Original/Awake.png index fe30ac7f40..244df383cf 100644 Binary files a/doc/images/overview/Original/Awake.png and b/doc/images/overview/Original/Awake.png differ diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/Awake.png b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/Awake.png index d573613513..d1ab7767c4 100644 Binary files a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/Awake.png and b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/Awake.png differ diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/Awake.png b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/Awake.png index 00542f14ab..dd66da49e6 100644 Binary files a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/Awake.png and b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/Awake.png differ diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Enums/PowerToysModulesEnum.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Enums/PowerToysModulesEnum.cs index 8c6bc6fd7a..70c65c44bf 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Enums/PowerToysModulesEnum.cs +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Enums/PowerToysModulesEnum.cs @@ -7,8 +7,8 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Enums public enum PowerToysModulesEnum { Overview = 0, - ColorPicker, Awake, + ColorPicker, FancyZones, FileExplorer, ImageResizer, diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs index 8d02266936..13948e6343 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs @@ -69,18 +69,6 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views DescriptionLink = "https://aka.ms/PowerToysOverview", 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() { ModuleName = loader.GetString("Oobe_Awake"), @@ -93,6 +81,18 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views Description = loader.GetString("Oobe_Awake_Description"), 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() { ModuleName = loader.GetString("Oobe_FancyZones"), @@ -215,8 +215,8 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views switch (selectedItem.Tag) { case "Overview": NavigationFrame.Navigate(typeof(OobeOverview)); break; - case "ColorPicker": NavigationFrame.Navigate(typeof(OobeColorPicker)); break; case "Awake": NavigationFrame.Navigate(typeof(OobeAwake)); break; + case "ColorPicker": NavigationFrame.Navigate(typeof(OobeColorPicker)); break; case "FancyZones": NavigationFrame.Navigate(typeof(OobeFancyZones)); break; case "Run": NavigationFrame.Navigate(typeof(OobeRun)); break; case "ImageResizer": NavigationFrame.Navigate(typeof(OobeImageResizer)); break; diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml index 1c414e9991..0c8ab004ae 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml @@ -36,17 +36,17 @@ - - - - - - + + + + + +