From 8898350106e696c44263e4510245477bd8f4c20e Mon Sep 17 00:00:00 2001
From: cinnamon-msft <cinnamon@microsoft.com>
Date: Wed, 28 Oct 2020 20:20:23 -0700
Subject: [PATCH 1/2] make all nav items top level and remove addprofile

---
 .../TerminalSettingsEditor/AddProfile.cpp     |  17 --
 .../TerminalSettingsEditor/AddProfile.h       |  20 --
 .../TerminalSettingsEditor/AddProfile.idl     |   7 -
 .../TerminalSettingsEditor/AddProfile.xaml    | 267 ------------------
 .../TerminalSettingsEditor/MainPage.cpp       |   9 -
 .../TerminalSettingsEditor/MainPage.xaml      |  92 ++----
 ...Microsoft.Terminal.Settings.Editor.vcxproj |  13 -
 ...t.Terminal.Settings.Editor.vcxproj.filters |   1 -
 .../Resources/en-US/Resources.resw            |  17 +-
 9 files changed, 30 insertions(+), 413 deletions(-)
 delete mode 100644 src/cascadia/TerminalSettingsEditor/AddProfile.cpp
 delete mode 100644 src/cascadia/TerminalSettingsEditor/AddProfile.h
 delete mode 100644 src/cascadia/TerminalSettingsEditor/AddProfile.idl
 delete mode 100644 src/cascadia/TerminalSettingsEditor/AddProfile.xaml

diff --git a/src/cascadia/TerminalSettingsEditor/AddProfile.cpp b/src/cascadia/TerminalSettingsEditor/AddProfile.cpp
deleted file mode 100644
index 9139a8d9623..00000000000
--- a/src/cascadia/TerminalSettingsEditor/AddProfile.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "AddProfile.h"
-#include "AddProfile.g.cpp"
-
-using namespace winrt;
-using namespace winrt::Windows::UI::Xaml;
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    AddProfile::AddProfile()
-    {
-        InitializeComponent();
-    }
-}
diff --git a/src/cascadia/TerminalSettingsEditor/AddProfile.h b/src/cascadia/TerminalSettingsEditor/AddProfile.h
deleted file mode 100644
index d27f3e6f553..00000000000
--- a/src/cascadia/TerminalSettingsEditor/AddProfile.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-
-#include "AddProfile.g.h"
-#include "Utils.h"
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    struct AddProfile : AddProfileT<AddProfile>
-    {
-        AddProfile();
-    };
-}
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
-{
-    BASIC_FACTORY(AddProfile);
-}
diff --git a/src/cascadia/TerminalSettingsEditor/AddProfile.idl b/src/cascadia/TerminalSettingsEditor/AddProfile.idl
deleted file mode 100644
index de959cdaf93..00000000000
--- a/src/cascadia/TerminalSettingsEditor/AddProfile.idl
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Microsoft.Terminal.Settings.Editor
-{
-    [default_interface] runtimeclass AddProfile : Windows.UI.Xaml.Controls.Page
-    {
-        AddProfile();
-    }
-}
diff --git a/src/cascadia/TerminalSettingsEditor/AddProfile.xaml b/src/cascadia/TerminalSettingsEditor/AddProfile.xaml
deleted file mode 100644
index d535ef218b5..00000000000
--- a/src/cascadia/TerminalSettingsEditor/AddProfile.xaml
+++ /dev/null
@@ -1,267 +0,0 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
-the MIT License. See LICENSE in the project root for license information. -->
-<Page
-    x:Class="Microsoft.Terminal.Settings.Editor.AddProfile"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.Terminal.Settings.Editor"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:Controls="using:Microsoft.UI.Xaml.Controls"
-    xmlns:Windows10version1809="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 7)"
-    mc:Ignorable="d">
-
-    <!--TODO: SETTINGS UI make sure there isn't a separate UI for a new profile vs existing ones.-->
-    <Page.Resources>
-        <Flyout x:Key="cursorColorPickerFlyout">
-            <RelativePanel>
-                <ColorPicker x:Name="cursorColorPicker"
-                         IsColorChannelTextInputVisible="False"
-                         IsHexInputVisible="False"/>
-
-                <Grid RelativePanel.Below="cursorColorPicker"
-                  RelativePanel.AlignLeftWithPanel="True"
-                  RelativePanel.AlignRightWithPanel="True">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
-                        <ColumnDefinition/>
-                    </Grid.ColumnDefinitions>
-                    <!--TODO: SETTINGS UI consolidate common styles across XAML pages. -->
-                    <Button Content="OK"
-                        Margin="0,12,2,0" HorizontalAlignment="Stretch"/>
-                    <Button Content="Cancel"
-                        Margin="2,12,0,0" HorizontalAlignment="Stretch"
-                        Grid.Column="1"/>
-                </Grid>
-            </RelativePanel>
-        </Flyout>
-        <Flyout x:Key="foregroundColorPickerFlyout">
-            <RelativePanel>
-                <ColorPicker x:Name="foregroundColorPicker"
-                         IsColorChannelTextInputVisible="False"
-                         IsHexInputVisible="False"/>
-
-                <Grid RelativePanel.Below="foregroundColorPicker"
-                  RelativePanel.AlignLeftWithPanel="True"
-                  RelativePanel.AlignRightWithPanel="True">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
-                        <ColumnDefinition/>
-                    </Grid.ColumnDefinitions>
-                    <Button Content="OK"
-                        Margin="0,12,2,0" HorizontalAlignment="Stretch"/>
-                    <Button Content="Cancel"
-                        Margin="2,12,0,0" HorizontalAlignment="Stretch"
-                        Grid.Column="1"/>
-                </Grid>
-            </RelativePanel>
-        </Flyout>
-        <Flyout x:Key="backgroundColorPickerFlyout">
-            <RelativePanel>
-                <ColorPicker x:Name="backgroundColorPicker"
-                         IsColorChannelTextInputVisible="False"
-                         IsHexInputVisible="False"/>
-
-                <Grid RelativePanel.Below="backgroundColorPicker"
-                  RelativePanel.AlignLeftWithPanel="True"
-                  RelativePanel.AlignRightWithPanel="True">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
-                        <ColumnDefinition/>
-                    </Grid.ColumnDefinitions>
-                    <Button Content="OK"
-                        Margin="0,12,2,0" HorizontalAlignment="Stretch"/>
-                    <Button Content="Cancel"
-                        Margin="2,12,0,0" HorizontalAlignment="Stretch"
-                        Grid.Column="1"/>
-                </Grid>
-            </RelativePanel>
-        </Flyout>
-        <Flyout x:Key="selectionBackgroundColorPickerFlyout">
-            <RelativePanel>
-                <ColorPicker x:Name="selectionBackgroundColorPicker"
-                         IsColorChannelTextInputVisible="False"
-                         IsHexInputVisible="False"/>
-
-                <Grid RelativePanel.Below="selectionBackgroundColorPicker"
-                  RelativePanel.AlignLeftWithPanel="True"
-                  RelativePanel.AlignRightWithPanel="True">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
-                        <ColumnDefinition/>
-                    </Grid.ColumnDefinitions>
-                    <Button Content="OK"
-                        Margin="0,12,2,0" HorizontalAlignment="Stretch"/>
-                    <Button Content="Cancel"
-                        Margin="2,12,0,0" HorizontalAlignment="Stretch"
-                        Grid.Column="1"/>
-                </Grid>
-            </RelativePanel>
-        </Flyout>
-    </Page.Resources>
-
-    <RelativePanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <FlyoutBase.AttachedFlyout>
-            <Flyout>
-                <Grid/>
-            </Flyout>
-        </FlyoutBase.AttachedFlyout>
-        <TextBlock x:Name="TitleTextBox" 
-                   Text=""
-                   Style="{StaticResource HeaderTextBlockStyle}"
-                   Margin="0,0,0,8" />
-
-        <GridView x:Name="ProfilesGridView"
-                  Margin="0,0,0,8"
-                  RelativePanel.AlignLeftWithPanel="True"
-                  RelativePanel.AlignRightWithPanel="True"
-                  RelativePanel.Below="TitleTextBox" Height="52">
-            <GridView.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <ItemsWrapGrid x:Name="MaxItemsWrapGrid" 
-                           MaximumRowsOrColumns="2" 
-                           Orientation="Horizontal"/>
-                </ItemsPanelTemplate>
-            </GridView.ItemsPanel>
-        </GridView>
-        <Pivot >
-            <PivotItem Header="General">
-                <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-          Margin="0,12,0,0">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*" />
-                        <ColumnDefinition Width="1*" />
-                    </Grid.ColumnDefinitions>
-                    <StackPanel Grid.Row="1" Grid.Column="0" Margin="0,0,100,0">
-                        <TextBox Header="Name" Margin="0,0,0,10" />
-                        <TextBox Header="GUID" Margin="0,0,0,10" />
-                        <TextBox Header="Command line" Margin="0,0,0,10" />
-                        <TextBox Header="Starting directory" Margin="0,0,0,10" />
-                        <TextBox Header="Icon" Margin="0,0,0,10" />
-                        <TextBox Header="Tab title" Margin="0,0,0,10" />
-                        <Controls:RadioButtons Header="Scrollbar visibility" Margin="0,0,0,10">
-                            <RadioButton x:Name="ScrollBarVisible" Content="Visible"/>
-                            <RadioButton x:Name="ScrollBarHidden" Content="Hidden"/>
-                        </Controls:RadioButtons>
-                    </StackPanel>
-                </Grid>
-            </PivotItem>
-            <PivotItem Header="Appearance">
-
-                <ScrollViewer >
-                    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-          Margin="0,12,0,0">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="1*" />
-                            <ColumnDefinition Width="1*" />
-                        </Grid.ColumnDefinitions>
-                        <!-- THIS IS WHERE THE MINI-TERMINAL WOULD GO -->
-
-
-                        <StackPanel Grid.Row="2" Grid.Column="0" Margin="0,0,100,0">
-                            <CheckBox Content="Enable acrylic" />
-                            <Controls:NumberBox Header="Acrylic opacity" Margin="0,0,0,10" Value="0.5" SpinButtonPlacementMode="Compact" SmallChange="0.1" LargeChange="0.25" />
-                            <TextBox Header="Background image" Margin="0,0,0,10" />
-                            <Controls:RadioButtons Header="Background image stretch mode" Margin="0,0,0,10">
-                                <RadioButton x:Name="backgroundImageStretchModeNone" Content="none"/>
-                                <RadioButton x:Name="backgroundImageStretchModeFill" Content="fill"/>
-                                <RadioButton x:Name="backgroundImageStretchModeUniform" Content="uniform"/>
-                                <RadioButton x:Name="backgroundImageStretchModeUniformToFill" Content="uniformToFill"/>
-                            </Controls:RadioButtons>
-                            <Windows10version1809:DropDownButton Content="Background image alignment" Margin="0,0,0,10" >
-                                <DropDownButton.Flyout>
-                                    <MenuFlyout Placement="Bottom">
-                                        <MenuFlyoutItem Text="center"/>
-                                        <MenuFlyoutItem Text="left"/>
-                                        <MenuFlyoutItem Text="top"/>
-                                        <MenuFlyoutItem Text="right"/>
-                                        <MenuFlyoutItem Text="bottom"/>
-                                        <MenuFlyoutItem Text="topLeft"/>
-                                        <MenuFlyoutItem Text="topRight"/>
-                                        <MenuFlyoutItem Text="bottomLeft"/>
-                                        <MenuFlyoutItem Text="bottomRight"/>
-                                    </MenuFlyout>
-                                </DropDownButton.Flyout>
-                            </Windows10version1809:DropDownButton>
-                            <Controls:NumberBox Header="Background image opacity" Margin="0,0,0,10" Value="100" SpinButtonPlacementMode="Compact" SmallChange="10" LargeChange="25" />
-                            <CheckBox Content="Retro terminal effects" />
-                        </StackPanel>
-                        <StackPanel Grid.Row="2" Grid.Column="1" Margin="0,0,80,0">
-                            <TextBox Header="Font face" Margin="0,0,0,10" />
-                            <Controls:NumberBox Header="Font size" Margin="0,0,0,10" Value="12" SpinButtonPlacementMode="Compact" SmallChange="1" LargeChange="10" />
-                            <TextBox Header="Font weight" Margin="0,0,0,10"/>
-                            <TextBox Header="Padding" Margin="0,0,0,10" />
-                            <Controls:RadioButtons Header="Cursor shape" Margin="0,0,0,10">
-                                <RadioButton x:Name="CursorShapeBar" Content="Bar"/>
-                                <RadioButton x:Name="CursorShapeVintage" Content="Vintage"/>
-                                <RadioButton x:Name="CursorShapeUnderscore" Content="Underscore"/>
-                                <RadioButton x:Name="CursorShapeFilledBox" Content="FilledBox"/>
-                                <RadioButton x:Name="CursorShapeEmptyBox" Content="EmptyBox"/>
-                            </Controls:RadioButtons>
-                            <Controls:NumberBox Header="Cursor height" Margin="0,0,0,10" Value="100" SpinButtonPlacementMode="Compact" SmallChange="1" LargeChange="10" />
-                            <Button x:Name="cursorColorPickerButton" Content="Cursor color" Flyout="{StaticResource cursorColorPickerFlyout}"/>
-                            <Controls:NumberBox Header="Cursor height" Margin="0,0,0,10" Value="100" SpinButtonPlacementMode="Compact" SmallChange="10" LargeChange="25" />
-                            <Windows10version1809:DropDownButton Content="Color scheme" Margin="0,0,0,10" >
-                                <DropDownButton.Flyout>
-                                    <MenuFlyout Placement="Bottom">
-                                        <MenuFlyoutItem Text="Campbell"/>
-                                        <MenuFlyoutItem Text="Campbell Powershell"/>
-                                        <MenuFlyoutItem Text="Vintage"/>
-                                        <MenuFlyoutItem Text="One Half Dark"/>
-                                        <MenuFlyoutItem Text="One Half Light"/>
-                                        <MenuFlyoutItem Text="Tango Dark"/>
-                                        <MenuFlyoutItem Text="Tango Light"/>
-                                    </MenuFlyout>
-                                </DropDownButton.Flyout>
-                            </Windows10version1809:DropDownButton>
-                            <Button x:Name="foregroundColorPickerButton" Content="Foreground color" Flyout="{StaticResource foregroundColorPickerFlyout}"/>
-                            <Button x:Name="backgroundColorPickerButton" Content="Background color" Flyout="{StaticResource backgroundColorPickerFlyout}"/>
-                            <Button x:Name="selectionBackgroundColorPickerButton" Content="Selection background color" Flyout="{StaticResource selectionBackgroundColorPickerFlyout}"/>
-                        </StackPanel>
-                    </Grid>
-                </ScrollViewer>
-            </PivotItem>
-            <PivotItem Header="Advanced">
-                <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-          Margin="0,12,0,0">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*" />
-                        <ColumnDefinition Width="1*" />
-                    </Grid.ColumnDefinitions>
-                    <StackPanel Grid.Row="1" Grid.Column="0" Margin="0,0,100,0">
-                        <CheckBox Content="Hide profile from dropdown" />
-                        <CheckBox Content="Suppress title changes" />
-                        <Controls:RadioButtons Header="Antialiasing text" Margin="0,0,0,10">
-                            <RadioButton x:Name="antialiasingTextGrayscale" Content="grayscale"/>
-                            <RadioButton x:Name="antialiasingTextCleartype" Content="cleartype"/>
-                            <RadioButton x:Name="antialiasingTextAliased" Content="aliased"/>
-                        </Controls:RadioButtons>
-                        <CheckBox Content="AltGr aliasing" />
-                        <CheckBox Content="Scroll to input when typing" />
-                        <Controls:NumberBox Header="History size" Margin="0,0,0,10" Value="9001" SpinButtonPlacementMode="Compact" SmallChange="10" LargeChange="100" />
-                        <Controls:RadioButtons Header="How the profile closes" Margin="0,0,0,10">
-                            <RadioButton x:Name="closeOnExitGraceful" Content="graceful"/>
-                            <RadioButton x:Name="closeOnExitAlways" Content="always"/>
-                            <RadioButton x:Name="closeOnExitNever" Content="never"/>
-                            <RadioButton x:Name="closeOnExitTrue" Content="true"/>
-                            <RadioButton x:Name="closeOnExitFalse" Content="false"/>
-                        </Controls:RadioButtons>
-                    </StackPanel>
-                </Grid>
-            </PivotItem>
-        </Pivot>
-    </RelativePanel>
-</Page>
-
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index 8a0d5a59e84..590916d3d41 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -12,7 +12,6 @@
 #include "GlobalAppearance.h"
 #include "ColorSchemes.h"
 #include "Keybindings.h"
-#include "AddProfile.h"
 
 namespace winrt
 {
@@ -98,16 +97,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void MainPage::Navigate(Controls::Frame contentFrame, hstring clickedItemTag)
     {
-        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 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";
 
@@ -127,10 +122,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         {
             contentFrame.Navigate(xaml_typename<Editor::Profiles>());
         }
-        else if (clickedItemTag == addNewSubpage)
-        {
-            contentFrame.Navigate(xaml_typename<Editor::AddProfile>());
-        }
         else if (clickedItemTag == colorSchemesPage)
         {
             contentFrame.Navigate(xaml_typename<Editor::ColorSchemes>());
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.xaml b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
index 3db78f2823e..965b76e97b2 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.xaml
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
@@ -27,81 +27,47 @@ the MIT License. See LICENSE in the project root for license information. -->
                         IsBackEnabled="True"
                         BackRequested="SettingsNav_BackRequested">
             <muxc:NavigationView.MenuItems>
-
-                <muxc:NavigationViewItem x:Uid="Nav_General"
-                                         Icon="Globe"
-                                         Tag="General_Nav">
-                    <muxc:NavigationViewItem.MenuItems>
-                        <muxc:NavigationViewItem x:Uid="Nav_Launch"
-                                                 Tag="Launch_Nav">
-                            <muxc:NavigationViewItem.Icon>
-                                <FontIcon Glyph="&#xE7B5;"/>
-                            </muxc:NavigationViewItem.Icon>
-                        </muxc:NavigationViewItem>
-
-                        <muxc:NavigationViewItem x:Uid="Nav_Interaction"
-                                                 Tag="Interaction_Nav">
-                            <muxc:NavigationViewItem.Icon>
-                                <FontIcon Glyph="&#xE7C9;"/>
-                            </muxc:NavigationViewItem.Icon>
-                        </muxc:NavigationViewItem>
-
-                        <muxc:NavigationViewItem x:Uid="Nav_Rendering"
-                                                 Tag="Rendering_Nav" >
-                            <muxc:NavigationViewItem.Icon>
-                                <FontIcon Glyph="&#xE7F8;"/>
-                            </muxc:NavigationViewItem.Icon>
-                        </muxc:NavigationViewItem>
-
-                    </muxc:NavigationViewItem.MenuItems>
-
+                
+                <muxc:NavigationViewItem x:Uid="Nav_Launch"
+                                                Tag="Launch_Nav">
+                    <muxc:NavigationViewItem.Icon>
+                        <FontIcon Glyph="&#xE7B5;"/>
+                    </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
 
-                <muxc:NavigationViewItem x:Uid="Nav_Appearance" Tag="Appearance_Nav">
+                <muxc:NavigationViewItem x:Uid="Nav_Interaction"
+                                                Tag="Interaction_Nav">
                     <muxc:NavigationViewItem.Icon>
-                        <FontIcon Glyph="&#xE771;"/>
+                        <FontIcon Glyph="&#xE7C9;"/>
                     </muxc:NavigationViewItem.Icon>
-
-                    <muxc:NavigationViewItem.MenuItems>
-                        <muxc:NavigationViewItem x:Uid="Nav_AppearanceGlobal"
-                                                 Tag="GlobalAppearance_Nav">
-                            <muxc:NavigationViewItem.Icon>
-                                <FontIcon Glyph="&#xE909;"/>
-                            </muxc:NavigationViewItem.Icon>
-                        </muxc:NavigationViewItem>
-
-                        <muxc:NavigationViewItem x:Uid="Nav_ColorSchemes"
-                                                 Tag="ColorSchemes_Nav">
-                            <muxc:NavigationViewItem.Icon>
-                                <FontIcon Glyph="&#xE790;"/>
-                            </muxc:NavigationViewItem.Icon>
-                        </muxc:NavigationViewItem>
-                    </muxc:NavigationViewItem.MenuItems>
-
                 </muxc:NavigationViewItem>
 
-                <muxc:NavigationViewItem x:Uid="Nav_Profiles"
-                                         Tag="Profiles_Nav">
+                <muxc:NavigationViewItem x:Uid="Nav_ProfileGlobal"
+                                            Tag="GlobalProfile_Nav">
                     <muxc:NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE756;"/>
                     </muxc:NavigationViewItem.Icon>
+                </muxc:NavigationViewItem>
 
-                    <muxc:NavigationViewItem.MenuItems>
-                        <muxc:NavigationViewItem x:Uid="Nav_ProfileGlobal"
-                                                 Tag="GlobalProfile_Nav">
-                            <muxc:NavigationViewItem.Icon>
-                                <FontIcon Glyph="&#xE909;"/>
-                            </muxc:NavigationViewItem.Icon>
-                        </muxc:NavigationViewItem>
+                <muxc:NavigationViewItem x:Uid="Nav_AppearanceGlobal"
+                                                Tag="GlobalAppearance_Nav">
+                    <muxc:NavigationViewItem.Icon>
+                        <FontIcon Glyph="&#xE771;"/>
+                    </muxc:NavigationViewItem.Icon>
+                </muxc:NavigationViewItem>
 
-                        <muxc:NavigationViewItem x:Uid="Nav_AddNewProfile"
-                                                 Tag="AddNew_Nav" >
-                            <muxc:NavigationViewItem.Icon>
-                                <FontIcon Glyph="&#xE710;" />
-                            </muxc:NavigationViewItem.Icon>
-                        </muxc:NavigationViewItem>
+                <muxc:NavigationViewItem x:Uid="Nav_ColorSchemes"
+                                                Tag="ColorSchemes_Nav">
+                    <muxc:NavigationViewItem.Icon>
+                        <FontIcon Glyph="&#xE790;"/>
+                    </muxc:NavigationViewItem.Icon>
+                </muxc:NavigationViewItem>
 
-                    </muxc:NavigationViewItem.MenuItems>
+                <muxc:NavigationViewItem x:Uid="Nav_Rendering"
+                                                 Tag="Rendering_Nav" >
+                    <muxc:NavigationViewItem.Icon>
+                        <FontIcon Glyph="&#xE7F8;"/>
+                    </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
 
             </muxc:NavigationView.MenuItems>
diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
index ef2a76a8848..219577604cb 100644
--- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
+++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
@@ -35,9 +35,6 @@
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
   <!-- ========================= Headers ======================== -->
   <ItemGroup>
-    <ClInclude Include="AddProfile.h">
-      <DependentUpon>AddProfile.xaml</DependentUpon>
-    </ClInclude>
     <ClInclude Include="ColorToBrushConverter.h">
       <DependentUpon>ColorToBrushConverter.idl</DependentUpon>
     </ClInclude>
@@ -86,9 +83,6 @@
   </ItemGroup>
   <!-- ========================= XAML files ======================== -->
   <ItemGroup>
-    <Page Include="AddProfile.xaml">
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="CommonResources.xaml">
       <SubType>Designer</SubType>
     </Page>
@@ -128,9 +122,6 @@
   </ItemGroup>
   <!-- ========================= Cpp Files ======================== -->
   <ItemGroup>
-    <ClCompile Include="AddProfile.cpp">
-      <DependentUpon>AddProfile.xaml</DependentUpon>
-    </ClCompile>
     <ClCompile Include="ColorToBrushConverter.cpp">
       <DependentUpon>ColorToBrushConverter.idl</DependentUpon>
     </ClCompile>
@@ -219,10 +210,6 @@
       <DependentUpon>Profiles.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
-    <Midl Include="AddProfile.idl">
-      <DependentUpon>AddProfile.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Midl>
     <Midl Include="SplitPaneOptionPanelControl.idl">
       <DependentUpon>SplitPaneOptionPanelControl.xaml</DependentUpon>
       <SubType>Code</SubType>
diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
index d315eed3bf3..b7d8ed90ccf 100644
--- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
+++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
@@ -29,7 +29,6 @@
     <None Include="PropertySheet.props" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="AddProfile.xaml" />
     <Page Include="CommonResources.xaml" />
     <Page Include="GlobalAppearance.xaml" />
     <Page Include="ColorSchemes.xaml" />
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
index fba090f1d03..6d7270b133e 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
@@ -339,24 +339,12 @@
   <data name="Globals_WordDelimiters.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Determines the delimiters used in a double click selection.</value>
   </data>
-  <data name="Nav_AddNewProfile.Content" xml:space="preserve">
-    <value>Add new</value>
-  </data>
-  <data name="Nav_Appearance.Content" xml:space="preserve">
-    <value>Appearance</value>
-  </data>
   <data name="Nav_AppearanceGlobal.Content" xml:space="preserve">
-    <value>Global</value>
+    <value>Appearance</value>
   </data>
   <data name="Nav_ColorSchemes.Content" xml:space="preserve">
     <value>Color schemes</value>
   </data>
-  <data name="Nav_General.Content" xml:space="preserve">
-    <value>General</value>
-  </data>
-  <data name="Nav_Home.Content" xml:space="preserve">
-    <value>Home</value>
-  </data>
   <data name="Nav_Interaction.Content" xml:space="preserve">
     <value>Interaction</value>
   </data>
@@ -367,9 +355,6 @@
     <value>Open JSON file</value>
   </data>
   <data name="Nav_ProfileGlobal.Content" xml:space="preserve">
-    <value>Global</value>
-  </data>
-  <data name="Nav_Profiles.Content" xml:space="preserve">
     <value>Profiles</value>
   </data>
   <data name="Nav_Rendering.Content" xml:space="preserve">

From 5fc8c9209bfce4061419ccb5b271eb565a97da71 Mon Sep 17 00:00:00 2001
From: cinnamon-msft <cinnamon@microsoft.com>
Date: Fri, 30 Oct 2020 10:15:00 -0700
Subject: [PATCH 2/2] flip nav_appearanceglobal to nav_appearance

---
 src/cascadia/TerminalSettingsEditor/MainPage.xaml               | 2 +-
 .../TerminalSettingsEditor/Resources/en-US/Resources.resw       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.xaml b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
index 965b76e97b2..84312489bfe 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.xaml
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
@@ -49,7 +49,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                     </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
 
-                <muxc:NavigationViewItem x:Uid="Nav_AppearanceGlobal"
+                <muxc:NavigationViewItem x:Uid="Nav_Appearance"
                                                 Tag="GlobalAppearance_Nav">
                     <muxc:NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE771;"/>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
index 5e3cd89ed36..259c9f6e4e7 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
@@ -339,7 +339,7 @@
   <data name="Globals_WordDelimiters.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Determines the delimiters used in a double click selection.</value>
   </data>
-  <data name="Nav_AppearanceGlobal.Content" xml:space="preserve">
+  <data name="Nav_Appearance.Content" xml:space="preserve">
     <value>Appearance</value>
   </data>
   <data name="Nav_ColorSchemes.Content" xml:space="preserve">