Merge pull request #5 from cinnamon-msft/vithoma/ObjectBinding_General

Cleanup of the settings UI.
microsoft · Jul 24, 2020 · 6229da3 · 6229da3
2 parents bb61353 + 3c5fc97
commit 6229da3
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 5 deletions.
diff --git a/src/TerminalSettings/TerminalSettings/MainPage.cpp b/src/TerminalSettings/TerminalSettings/MainPage.cpp
@@ -60,25 +60,44 @@ namespace winrt::SettingsControl::implementation
 
         if (clickedItemContainer != NULL)
         {
-            const hstring globalsPage = L"General_Nav";
+            const hstring generalPage = L"General_Nav";
+            const hstring launchSubpage = L"Launch_Nav";
+            const hstring interactionSubpage = L"Interaction_Nav";
+            const hstring renderingSubpage = L"Rendering_Nav";
+
             const hstring profilesPage = L"Profiles_Nav";
-            const hstring colorSchemesPage = L"Appearance_Nav";
+            const hstring globalprofileSubpage = L"GlobalProfile_Nav";
+            const hstring addnewSubpage = L"AddNew_Nav";
+
+            const hstring appearancePage = L"Appearance_Nav";
+            const hstring colorSchemesPage = L"ColorSchemes_Nav";
+            const hstring globalAppearancePage = L"GlobalAppearance_Nav";
+
             const hstring keybindingsPage = L"Keyboard_Nav";
+
 
             hstring clickedItemTag = unbox_value<hstring>(clickedItemContainer.Tag());
 
-            if (clickedItemTag == globalsPage)
+            if (clickedItemTag == launchSubpage)
             {
                 contentFrame().Navigate(xaml_typename<SettingsControl::Globals>());
             }
-            else if (clickedItemTag == profilesPage)
+            else if (clickedItemTag == globalprofileSubpage)
+            {
+                contentFrame().Navigate(xaml_typename<TerminalSettings::Profiles>());
+            }
+            else if (clickedItemTag == addnewSubpage)
             {
                 contentFrame().Navigate(xaml_typename<SettingsControl::Profiles>());
             }
             else if (clickedItemTag == colorSchemesPage)
             {
                 contentFrame().Navigate(xaml_typename<SettingsControl::ColorSchemes>());
             }
+            else if (clickedItemTag == globalAppearancePage)
+            {
+                contentFrame().Navigate(xaml_typename<TerminalSettings::ColorSchemes>());
+            }
             else if (clickedItemTag == keybindingsPage)
             {
                 contentFrame().Navigate(xaml_typename<SettingsControl::Keybindings>());

diff --git a/src/TerminalSettings/TerminalSettings/MainPage.xaml b/src/TerminalSettings/TerminalSettings/MainPage.xaml
@@ -56,6 +56,25 @@
                 <muxc:NavigationViewItem.Icon>
                     <FontIcon Glyph="&#xE790;" />
                 </muxc:NavigationViewItem.Icon>
+
+                <muxc:NavigationViewItem.MenuItems>
+                    <muxc:NavigationViewItem Tag="GlobalAppearance_Nav" >
+                        <!-- Couldn't find spaceship -->
+                        <muxc:NavigationViewItem.Icon>
+                            <FontIcon Glyph="&#xE909;" />
+                        </muxc:NavigationViewItem.Icon>
+                        <TextBlock Tag="Global_Page">Global</TextBlock>
+                    </muxc:NavigationViewItem>
+
+                    <muxc:NavigationViewItem Tag="ColorSchemes_Nav" >
+                        <!-- Couldn't find spaceship -->
+                        <muxc:NavigationViewItem.Icon>
+                            <FontIcon Glyph="&#xE909;" />
+                        </muxc:NavigationViewItem.Icon>
+                        <TextBlock Tag="Global_Page">Color Schemes</TextBlock>
+                    </muxc:NavigationViewItem>
+                </muxc:NavigationViewItem.MenuItems>
+
             </muxc:NavigationViewItem>
 
             <muxc:NavigationViewItem Tag="Profiles_Nav">
@@ -65,7 +84,7 @@
                 <TextBlock Tag="Profiles_Page">Profiles</TextBlock>
 
                 <muxc:NavigationViewItem.MenuItems>
-                    <muxc:NavigationViewItem Tag="Global_Nav" >
+                    <muxc:NavigationViewItem Tag="GlobalProfile_Nav" >
                         <!-- Couldn't find spaceship -->
                         <muxc:NavigationViewItem.Icon>
                             <FontIcon Glyph="&#xE909;" />