Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make all nav items top level and remove addprofile #8089

Merged
3 commits merged into from
Oct 30, 2020
Merged

Make all nav items top level and remove addprofile #8089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8898350
make all nav items top level and remove addprofile
cinnamon-msft Oct 29, 2020
b5af57e
Merge branch 'feature/settings-ui' into cinnamon/move-nav-items
cinnamon-msft Oct 30, 2020
5fc8c92
flip nav_appearanceglobal to nav_appearance
cinnamon-msft Oct 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions src/cascadia/TerminalSettingsEditor/AddProfile.cpp
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions src/cascadia/TerminalSettingsEditor/AddProfile.h
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions src/cascadia/TerminalSettingsEditor/AddProfile.idl
View file
Open in desktop

This file was deleted.

267 changes: 0 additions & 267 deletions src/cascadia/TerminalSettingsEditor/AddProfile.xaml
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions src/cascadia/TerminalSettingsEditor/MainPage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "GlobalAppearance.h"
#include "ColorSchemes.h"
#include "Keybindings.h"
#include "AddProfile.h"

namespace winrt
{
Expand Down Expand Up @@ -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";

Expand All @@ -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>());
Expand Down
92 changes: 29 additions & 63 deletions src/cascadia/TerminalSettingsEditor/MainPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_Appearance"
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>
Expand Down
13 changes: 0 additions & 13 deletions src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -86,9 +83,6 @@
</ItemGroup>
<!-- ========================= XAML files ======================== -->
<ItemGroup>
<Page Include="AddProfile.xaml">
<SubType>Designer</SubType>
</Page>
<Page Include="CommonResources.xaml">
<SubType>Designer</SubType>
</Page>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
15 changes: 0 additions & 15 deletions src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
</data>
<data name="Nav_ColorSchemes.Content" xml:space="preserve">
cinnamon-msft marked this conversation as resolved.
Show resolved Hide resolved
<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>
Expand All @@ -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">
Expand Down