Update ShellPage.xaml

src/settings-ui/Settings.UI/Services/NavigationService.cs

@@ -59,16 +59,23 @@ namespace Microsoft.PowerToys.Settings.UI.Services
 
         public static bool Navigate(Type pageType, object parameter = null, NavigationTransitionInfo infoOverride = null)
         {
-            // Don't open the same page multiple times
-            if (Frame.Content?.GetType() != pageType || (parameter != null && !parameter.Equals(lastParamUsed)))
+            if (pageType != null)
             {
-                var navigationResult = Frame.Navigate(pageType, parameter, infoOverride);
-                if (navigationResult)
+                // Don't open the same page multiple times
+                if (Frame.Content?.GetType() != pageType || (parameter != null && !parameter.Equals(lastParamUsed)))
                 {
-                    lastParamUsed = parameter;
-                }
+                    var navigationResult = Frame.Navigate(pageType, parameter, infoOverride);
+                    if (navigationResult)
+                    {
+                        lastParamUsed = parameter;
+                    }
 
-                return navigationResult;
+                    return navigationResult;
+                }
+                else
+                {
+                    return false;
+                }
             }
             else
             {

src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml

@@ -106,124 +106,163 @@
                 <NavigationViewItemSeparator />
 
                 <NavigationViewItem
-                    x:Uid="Shell_AlwaysOnTop"
-                    helpers:NavHelper.NavigateTo="views:AlwaysOnTopPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/AlwaysOnTop.png}" />
+                    Content="File Explorer Add-ons"
+                    Icon="{ui:FontIcon Glyph=&#xEC50;}"
+                    SelectsOnInvoked="False">
+                    <NavigationViewItem.MenuItems>
+                        <NavigationViewItem
+                            helpers:NavHelper.NavigateTo="views:PowerPreviewPage"
+                            Content="File Explorer Thumbnails"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileExplorerPreview.png}" />
+                        <NavigationViewItem
+                            helpers:NavHelper.NavigateTo="views:PowerPreviewPage"
+                            Content="File Explorer Preview Pane"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileExplorerPreview.png}" />
+                        <NavigationViewItem
+                            x:Uid="Shell_Peek"
+                            helpers:NavHelper.NavigateTo="views:PeekPage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Peek.png}" />
+                    </NavigationViewItem.MenuItems>
+                </NavigationViewItem>
 
                 <NavigationViewItem
-                    x:Uid="Shell_Awake"
-                    helpers:NavHelper.NavigateTo="views:AwakePage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Awake.png}" />
+                    Content="Mouse &amp; Keyboard"
+                    Icon="{ui:FontIcon Glyph=&#xE961;}"
+                    SelectsOnInvoked="False">
+                    <NavigationViewItem.MenuItems>
+                        <NavigationViewItem
+                            helpers:NavHelper.NavigateTo="views:MouseUtilsPage"
+                            Content="Find My Mouse"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FindMyMouse.png}" />
+                        <NavigationViewItem
+                            x:Uid="Shell_KeyboardManager"
+                            helpers:NavHelper.NavigateTo="views:KeyboardManagerPage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/KeyboardManager.png}" />
+                        <NavigationViewItem
+                            helpers:NavHelper.NavigateTo="views:MouseUtilsPage"
+                            Content="Mouse Highlighter"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseHighlighter.png}" />
+                        <NavigationViewItem
+                            helpers:NavHelper.NavigateTo="views:MouseUtilsPage"
+                            Content="Mouse Jump"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseJump.png}" />
+                        <NavigationViewItem
+                            x:Uid="Shell_MouseWithoutBorders"
+                            helpers:NavHelper.NavigateTo="views:MouseWithoutBordersPage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseWithoutBorders.png}" />
+                        <NavigationViewItem
+                            x:Uid="Shell_QuickAccent"
+                            helpers:NavHelper.NavigateTo="views:PowerAccentPage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/QuickAccent.png}" />
+                    </NavigationViewItem.MenuItems>
+                </NavigationViewItem>
+
 
                 <NavigationViewItem
-                    x:Uid="Shell_ColorPicker"
-                    helpers:NavHelper.NavigateTo="views:ColorPickerPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ColorPicker.png}" />
+                    Content="System"
+                    Icon="{ui:FontIcon Glyph=&#xE770;}"
+                    SelectsOnInvoked="False">
+                    <NavigationViewItem.MenuItems>
+                        <NavigationViewItem
+                            x:Uid="Shell_Awake"
+                            helpers:NavHelper.NavigateTo="views:AwakePage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Awake.png}" />
+                        <NavigationViewItem
+                            x:Uid="Shell_CmdNotFound"
+                            helpers:NavHelper.NavigateTo="views:CmdNotFoundPage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CommandNotFound.png}" />
+                        <NavigationViewItem
+                            x:Uid="Shell_EnvironmentVariables"
+                            helpers:NavHelper.NavigateTo="views:EnvironmentVariablesPage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/EnvironmentVariables.png}" />
+                        <NavigationViewItem
+                            x:Uid="Shell_Hosts"
+                            helpers:NavHelper.NavigateTo="views:HostsPage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Hosts.png}" />
+                        <NavigationViewItem
+                            x:Uid="Shell_RegistryPreview"
+                            helpers:NavHelper.NavigateTo="views:RegistryPreviewPage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/RegistryPreview.png}" />
+                        <NavigationViewItem
+                            x:Uid="Shell_PastePlain"
+                            helpers:NavHelper.NavigateTo="views:PastePlainPage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PasteAsPlainText.png}" />
+                    </NavigationViewItem.MenuItems>
+                </NavigationViewItem>
 
                 <NavigationViewItem
-                    x:Uid="Shell_CmdNotFound"
-                    helpers:NavHelper.NavigateTo="views:CmdNotFoundPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CommandNotFound.png}" />
+                    Content="Utilities"
+                    Icon="{ui:FontIcon Glyph=&#xE8B7;}"
+                    SelectsOnInvoked="False">
+                    <NavigationViewItem.MenuItems>
+                        <NavigationViewItem
+                            x:Uid="Shell_ColorPicker"
+                            helpers:NavHelper.NavigateTo="views:ColorPickerPage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ColorPicker.png}" />
+                        <NavigationViewItem
+                            x:Uid="Shell_FileLocksmith"
+                            helpers:NavHelper.NavigateTo="views:FileLocksmithPage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileLocksmith.png}" />
+                        <NavigationViewItem
+                            x:Uid="Shell_ImageResizer"
+                            helpers:NavHelper.NavigateTo="views:ImageResizerPage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ImageResizer.png}" />
+                        <NavigationViewItem
+                            x:Uid="Shell_PowerRename"
+                            helpers:NavHelper.NavigateTo="views:PowerRenamePage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerRename.png}" />
+                        <NavigationViewItem
+                            x:Uid="Shell_MeasureTool"
+                            helpers:NavHelper.NavigateTo="views:MeasureToolPage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ScreenRuler.png}" />
+                        <NavigationViewItem
+                            x:Uid="Shell_PowerLauncher"
+                            helpers:NavHelper.NavigateTo="views:PowerLauncherPage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerToysRun.png}" />
+                    </NavigationViewItem.MenuItems>
+                </NavigationViewItem>
 
                 <NavigationViewItem
-                    x:Uid="Shell_CropAndLock"
-                    helpers:NavHelper.NavigateTo="views:CropAndLockPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CropAndLock.png}" />
+                    Content="Windowing"
+                    Icon="{ui:FontIcon Glyph=&#xEE40;}"
+                    SelectsOnInvoked="False">
+                    <NavigationViewItem.MenuItems>
+                        <NavigationViewItem
+                            x:Uid="Shell_AlwaysOnTop"
+                            helpers:NavHelper.NavigateTo="views:AlwaysOnTopPage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/AlwaysOnTop.png}" />
+                        <NavigationViewItem
+                            x:Uid="Shell_CropAndLock"
+                            helpers:NavHelper.NavigateTo="views:CropAndLockPage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CropAndLock.png}" />
+                        <NavigationViewItem
+                            x:Uid="Shell_FancyZones"
+                            helpers:NavHelper.NavigateTo="views:FancyZonesPage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FancyZones.png}" />
+                    </NavigationViewItem.MenuItems>
+                </NavigationViewItem>
 
+                <NavigationViewItemSeparator />
                 <NavigationViewItem
-                    x:Uid="Shell_EnvironmentVariables"
-                    helpers:NavHelper.NavigateTo="views:EnvironmentVariablesPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/EnvironmentVariables.png}" />
-
-                <NavigationViewItem
-                    x:Uid="Shell_FancyZones"
-                    helpers:NavHelper.NavigateTo="views:FancyZonesPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FancyZones.png}" />
-
-                <NavigationViewItem
-                    x:Uid="Shell_PowerPreview"
-                    helpers:NavHelper.NavigateTo="views:PowerPreviewPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileExplorerPreview.png}" />
-
-                <NavigationViewItem
-                    x:Uid="Shell_FileLocksmith"
-                    helpers:NavHelper.NavigateTo="views:FileLocksmithPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileLocksmith.png}" />
-
-                <NavigationViewItem
-                    x:Uid="Shell_Hosts"
-                    helpers:NavHelper.NavigateTo="views:HostsPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Hosts.png}" />
-
-                <NavigationViewItem
-                    x:Uid="Shell_ImageResizer"
-                    helpers:NavHelper.NavigateTo="views:ImageResizerPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ImageResizer.png}" />
-
-                <NavigationViewItem
-                    x:Uid="Shell_KeyboardManager"
-                    helpers:NavHelper.NavigateTo="views:KeyboardManagerPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/KeyboardManager.png}" />
-
-                <NavigationViewItem
-                    x:Uid="Shell_MouseUtilities"
-                    helpers:NavHelper.NavigateTo="views:MouseUtilsPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseUtils.png}" />
-
-                <NavigationViewItem
-                    x:Uid="Shell_MouseWithoutBorders"
-                    helpers:NavHelper.NavigateTo="views:MouseWithoutBordersPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseWithoutBorders.png}" />
-
-                <NavigationViewItem
-                    x:Uid="Shell_PastePlain"
-                    helpers:NavHelper.NavigateTo="views:PastePlainPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PasteAsPlainText.png}" />
-
-                <NavigationViewItem
-                    x:Uid="Shell_Peek"
-                    helpers:NavHelper.NavigateTo="views:PeekPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Peek.png}" />
-
-                <NavigationViewItem
-                    x:Uid="Shell_PowerRename"
-                    helpers:NavHelper.NavigateTo="views:PowerRenamePage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerRename.png}" />
-                <NavigationViewItem
-                    x:Uid="Shell_PowerLauncher"
-                    helpers:NavHelper.NavigateTo="views:PowerLauncherPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerToysRun.png}" />
-
-                <NavigationViewItem
-                    x:Uid="Shell_QuickAccent"
-                    helpers:NavHelper.NavigateTo="views:PowerAccentPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/QuickAccent.png}" />
-
-                <NavigationViewItem
-                    x:Uid="Shell_RegistryPreview"
-                    helpers:NavHelper.NavigateTo="views:RegistryPreviewPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/RegistryPreview.png}" />
-
-                <NavigationViewItem
-                    x:Uid="Shell_MeasureTool"
-                    helpers:NavHelper.NavigateTo="views:MeasureToolPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ScreenRuler.png}" />
-
-                <NavigationViewItem
-                    x:Uid="Shell_ShortcutGuide"
-                    helpers:NavHelper.NavigateTo="views:ShortcutGuidePage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ShortcutGuide.png}" />
-
-                <NavigationViewItem
-                    x:Uid="Shell_TextExtractor"
-                    helpers:NavHelper.NavigateTo="views:PowerOcrPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/TextExtractor.png}" />
-
-                <NavigationViewItem
-                    x:Uid="Shell_VideoConference"
-                    helpers:NavHelper.NavigateTo="views:VideoConferencePage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/VideoConferenceMute.png}"
-                    IsEnabled="{x:Bind ViewModel.IsVideoConferenceBuild, Mode=OneWay}" />
+                    Content="Maintenance mode"
+                    Icon="{ui:FontIcon Glyph=&#xE81B;}"
+                    SelectsOnInvoked="False">
+                    <NavigationViewItem.MenuItems>
+                        <NavigationViewItem
+                            helpers:NavHelper.NavigateTo="views:MouseUtilsPage"
+                            Content="Mouse Crosshairs"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseCrossHairs.png}" />
+                        <NavigationViewItem
+                            x:Uid="Shell_TextExtractor"
+                            helpers:NavHelper.NavigateTo="views:PowerOcrPage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/TextExtractor.png}" />
+                        <NavigationViewItem
+                            x:Uid="Shell_VideoConference"
+                            helpers:NavHelper.NavigateTo="views:VideoConferencePage"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/VideoConferenceMute.png}"
+                            IsEnabled="{x:Bind ViewModel.IsVideoConferenceBuild, Mode=OneWay}" />
+                    </NavigationViewItem.MenuItems>
+                </NavigationViewItem>
             </NavigationView.MenuItems>
             <NavigationView.PaneFooter>
                 <StackPanel Orientation="Vertical">