From 82ff6400ebb655f37e2abccf71221bcff12ebe7d Mon Sep 17 00:00:00 2001
From: Jaime Bernardo <jaime@janeasystems.com>
Date: Wed, 31 Aug 2022 20:43:23 +0100
Subject: [PATCH] [Settings]Order new PowerToys after renames (#20208)

---
 src/settings-ui/Settings.UI/App.xaml.cs       |  4 +--
 .../OOBE/Enums/PowerToysModules.cs            |  4 +--
 .../Settings.UI/OOBE/Views/OobeShellPage.xaml | 28 ++++++++---------
 .../OOBE/Views/OobeShellPage.xaml.cs          | 27 +++++++---------
 .../Settings.UI/Views/ShellPage.xaml          | 31 +++++++++----------
 5 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/src/settings-ui/Settings.UI/App.xaml.cs b/src/settings-ui/Settings.UI/App.xaml.cs
index a074720f47..f31728845f 100644
--- a/src/settings-ui/Settings.UI/App.xaml.cs
+++ b/src/settings-ui/Settings.UI/App.xaml.cs
@@ -122,11 +122,11 @@ namespace Microsoft.PowerToys.Settings.UI
                         case "ImageResizer": StartupPage = typeof(Views.ImageResizerPage); break;
                         case "KBM": StartupPage = typeof(Views.KeyboardManagerPage); break;
                         case "MouseUtils": StartupPage = typeof(Views.MouseUtilsPage); break;
-                        case "QuickAccent": StartupPage = typeof(Views.PowerAccentPage); break;
-                        case "TextExtractor": StartupPage = typeof(Views.PowerOcrPage); break;
                         case "PowerRename": StartupPage = typeof(Views.PowerRenamePage); break;
+                        case "QuickAccent": StartupPage = typeof(Views.PowerAccentPage); break;
                         case "FileExplorer": StartupPage = typeof(Views.PowerPreviewPage); break;
                         case "ShortcutGuide": StartupPage = typeof(Views.ShortcutGuidePage); break;
+                        case "TextExtractor": StartupPage = typeof(Views.PowerOcrPage); break;
                         case "VideoConference": StartupPage = typeof(Views.VideoConferencePage); break;
                         case "MeasureTool": StartupPage = typeof(Views.MeasureToolPage); break;
                         default: Debug.Assert(false, "Unexpected SettingsWindow argument value"); break;
diff --git a/src/settings-ui/Settings.UI/OOBE/Enums/PowerToysModules.cs b/src/settings-ui/Settings.UI/OOBE/Enums/PowerToysModules.cs
index e53e79b24c..3bcd711fa4 100644
--- a/src/settings-ui/Settings.UI/OOBE/Enums/PowerToysModules.cs
+++ b/src/settings-ui/Settings.UI/OOBE/Enums/PowerToysModules.cs
@@ -15,11 +15,11 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Enums
         ImageResizer,
         KBM,
         MouseUtils,
-        QuickAccent,
-        TextExtractor,
         PowerRename,
         Run,
+        QuickAccent,
         ShortcutGuide,
+        TextExtractor,
         VideoConference,
         MeasureTool,
         WhatsNew,
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml
index 4f6dcf3b77..1a0c7fc7d0 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml
@@ -97,20 +97,6 @@
                                 ShowAsMonochrome="False" />
                     </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
-                <muxc:NavigationViewItem x:Uid="Shell_QuickAccent" Tag="QuickAccent">
-                    <muxc:NavigationViewItem.Icon>
-                        <BitmapIcon
-                                UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerAccent.png"
-                                ShowAsMonochrome="False" />
-                    </muxc:NavigationViewItem.Icon>
-                </muxc:NavigationViewItem>
-                <muxc:NavigationViewItem x:Uid="Shell_TextExtractor" Tag="TextExtractor">
-                    <muxc:NavigationViewItem.Icon>
-                        <BitmapIcon
-                                UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerOCR.png"
-                                ShowAsMonochrome="False" />
-                    </muxc:NavigationViewItem.Icon>
-                </muxc:NavigationViewItem>
                 <muxc:NavigationViewItem x:Uid="Shell_PowerRename" Tag="PowerRename">
                     <muxc:NavigationViewItem.Icon>
                         <BitmapIcon
@@ -125,6 +111,13 @@
                                 ShowAsMonochrome="False" />
                     </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
+                <muxc:NavigationViewItem x:Uid="Shell_QuickAccent" Tag="QuickAccent">
+                    <muxc:NavigationViewItem.Icon>
+                        <BitmapIcon
+                                UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerAccent.png"
+                                ShowAsMonochrome="False" />
+                    </muxc:NavigationViewItem.Icon>
+                </muxc:NavigationViewItem>
                 <muxc:NavigationViewItem x:Uid="Shell_MeasureTool" Tag="MeasureTool">
                     <muxc:NavigationViewItem.Icon>
                         <BitmapIcon ShowAsMonochrome="False"
@@ -138,6 +131,13 @@
                                 ShowAsMonochrome="False" />
                     </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
+                <muxc:NavigationViewItem x:Uid="Shell_TextExtractor" Tag="TextExtractor">
+                    <muxc:NavigationViewItem.Icon>
+                        <BitmapIcon
+                                UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerOCR.png"
+                                ShowAsMonochrome="False" />
+                    </muxc:NavigationViewItem.Icon>
+                </muxc:NavigationViewItem>
                 <muxc:NavigationViewItem x:Uid="Shell_VideoConference" Tag="VideoConference">
                     <muxc:NavigationViewItem.Icon>
                         <BitmapIcon
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml.cs b/src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml.cs
index e3f299f144..7dfa962a01 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml.cs
@@ -102,19 +102,6 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
                 ModuleName = "MouseUtils",
                 IsNew = true,
             });
-
-            Modules.Insert((int)PowerToysModules.QuickAccent, new OobePowerToysModule()
-            {
-                ModuleName = "QuickAccent",
-                IsNew = true,
-            });
-
-            Modules.Insert((int)PowerToysModules.TextExtractor, new OobePowerToysModule()
-            {
-                ModuleName = "TextExtractor",
-                IsNew = true,
-            });
-
             Modules.Insert((int)PowerToysModules.PowerRename, new OobePowerToysModule()
             {
                 ModuleName = "PowerRename",
@@ -125,11 +112,21 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
                 ModuleName = "Run",
                 IsNew = false,
             });
+            Modules.Insert((int)PowerToysModules.QuickAccent, new OobePowerToysModule()
+            {
+                ModuleName = "QuickAccent",
+                IsNew = true,
+            });
             Modules.Insert((int)PowerToysModules.ShortcutGuide, new OobePowerToysModule()
             {
                 ModuleName = "ShortcutGuide",
                 IsNew = false,
             });
+            Modules.Insert((int)PowerToysModules.TextExtractor, new OobePowerToysModule()
+            {
+                ModuleName = "TextExtractor",
+                IsNew = true,
+            });
 
             Modules.Insert((int)PowerToysModules.VideoConference, new OobePowerToysModule()
             {
@@ -189,11 +186,11 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
                     case "Run": NavigationFrame.Navigate(typeof(OobeRun)); break;
                     case "ImageResizer": NavigationFrame.Navigate(typeof(OobeImageResizer)); break;
                     case "KBM": NavigationFrame.Navigate(typeof(OobeKBM)); break;
-                    case "QuickAccent": NavigationFrame.Navigate(typeof(OobePowerAccent)); break;
                     case "PowerRename": NavigationFrame.Navigate(typeof(OobePowerRename)); break;
-                    case "TextExtractor": NavigationFrame.Navigate(typeof(OobePowerOCR)); break;
+                    case "QuickAccent": NavigationFrame.Navigate(typeof(OobePowerAccent)); break;
                     case "FileExplorer": NavigationFrame.Navigate(typeof(OobeFileExplorer)); break;
                     case "ShortcutGuide": NavigationFrame.Navigate(typeof(OobeShortcutGuide)); break;
+                    case "TextExtractor": NavigationFrame.Navigate(typeof(OobePowerOCR)); break;
                     case "VideoConference": NavigationFrame.Navigate(typeof(OobeVideoConference)); break;
                     case "MouseUtils": NavigationFrame.Navigate(typeof(OobeMouseUtils)); break;
                     case "MeasureTool": NavigationFrame.Navigate(typeof(OobeMeasureTool)); break;
diff --git a/src/settings-ui/Settings.UI/Views/ShellPage.xaml b/src/settings-ui/Settings.UI/Views/ShellPage.xaml
index 833c42f217..c2d91120fa 100644
--- a/src/settings-ui/Settings.UI/Views/ShellPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/ShellPage.xaml
@@ -94,34 +94,24 @@
                         <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsMouseUtils.png" />
                     </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
-
-                <muxc:NavigationViewItem x:Uid="Shell_QuickAccent"
-                                         helpers:NavHelper.NavigateTo="views:PowerAccentPage">
-                    <muxc:NavigationViewItem.Icon>
-                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerAccent.png"
-                                    ShowAsMonochrome="False" />
-                    </muxc:NavigationViewItem.Icon>
-                </muxc:NavigationViewItem>
                 
                 <muxc:NavigationViewItem x:Uid="Shell_PowerRename" helpers:NavHelper.NavigateTo="views:PowerRenamePage">
                     <muxc:NavigationViewItem.Icon>
                         <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerRename.png" />
                     </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
-                
-                <muxc:NavigationViewItem x:Uid="Shell_TextExtractor"
-                                         helpers:NavHelper.NavigateTo="views:PowerOcrPage">
-                    <muxc:NavigationViewItem.Icon>
-                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerOcr.png"
-                                    ShowAsMonochrome="False" />
-                    </muxc:NavigationViewItem.Icon>
-                </muxc:NavigationViewItem>
-
                 <muxc:NavigationViewItem x:Uid="Shell_PowerLauncher" helpers:NavHelper.NavigateTo="views:PowerLauncherPage">
                     <muxc:NavigationViewItem.Icon>
                         <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerToysRun.png" />
                     </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
+                <muxc:NavigationViewItem x:Uid="Shell_QuickAccent"
+                                         helpers:NavHelper.NavigateTo="views:PowerAccentPage">
+                    <muxc:NavigationViewItem.Icon>
+                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerAccent.png"
+                                    ShowAsMonochrome="False" />
+                    </muxc:NavigationViewItem.Icon>
+                </muxc:NavigationViewItem>
                 <muxc:NavigationViewItem x:Uid="Shell_MeasureTool" helpers:NavHelper.NavigateTo="views:MeasureToolPage">
                     <muxc:NavigationViewItem.Icon>
                         <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsScreenRuler.png" />
@@ -132,6 +122,13 @@
                         <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsShortcutGuide.png" />
                     </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
+                <muxc:NavigationViewItem x:Uid="Shell_TextExtractor"
+                                         helpers:NavHelper.NavigateTo="views:PowerOcrPage">
+                    <muxc:NavigationViewItem.Icon>
+                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerOcr.png"
+                                    ShowAsMonochrome="False" />
+                    </muxc:NavigationViewItem.Icon>
+                </muxc:NavigationViewItem>
 
                 <muxc:NavigationViewItem
                     x:Uid="Shell_VideoConference"