From f2b8bb5959f54f4d5de47ab4d04eea38fb073bd3 Mon Sep 17 00:00:00 2001 From: cinnamon-msft Date: Wed, 28 Oct 2020 10:16:22 -0700 Subject: [PATCH 1/3] hide keyboard menu item --- src/cascadia/TerminalSettingsEditor/MainPage.xaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.xaml b/src/cascadia/TerminalSettingsEditor/MainPage.xaml index 14e6a5deb65..2047bf1c640 100644 --- a/src/cascadia/TerminalSettingsEditor/MainPage.xaml +++ b/src/cascadia/TerminalSettingsEditor/MainPage.xaml @@ -142,12 +142,6 @@ the MIT License. See LICENSE in the project root for license information. --> - - - Keyboard - - From 8c9df9460a381744f5b67f93c18c07be96b8e58f Mon Sep 17 00:00:00 2001 From: cinnamon-msft Date: Wed, 28 Oct 2020 10:43:40 -0700 Subject: [PATCH 2/3] remove dummy profiles and search box --- .../TerminalSettingsEditor/MainPage.cpp | 17 ++------- .../TerminalSettingsEditor/MainPage.xaml | 38 ------------------- 2 files changed, 3 insertions(+), 52 deletions(-) diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp index fbfa5583b4e..cec262f3a83 100644 --- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp +++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp @@ -77,7 +77,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation for (uint32_t i = 0; i < SettingsNav().MenuItems().Size(); i++) { const auto item = SettingsNav().MenuItems().GetAt(i).as(); - const hstring homeNav = L"Home_Nav"; + const hstring homeNav = L"General_Nav"; const hstring itemTag = unbox_value(item.Tag()); if (itemTag == homeNav) @@ -87,7 +87,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation } } - contentFrame().Navigate(xaml_typename()); + contentFrame().Navigate(xaml_typename()); } void MainPage::SettingsNav_ItemInvoked(MUX::Controls::NavigationView const&, MUX::Controls::NavigationViewItemInvokedEventArgs const& args) @@ -183,7 +183,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation void MainPage::Navigate(Controls::Frame contentFrame, hstring clickedItemTag) { - const hstring homePage = L"Home_Nav"; const hstring generalPage = L"General_Nav"; const hstring launchSubpage = L"Launch_Nav"; const hstring interactionSubpage = L"Interaction_Nav"; @@ -197,13 +196,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation const hstring colorSchemesPage = L"ColorSchemes_Nav"; const hstring globalAppearancePage = L"GlobalAppearance_Nav"; - const hstring keybindingsPage = L"Keyboard_Nav"; - - if (clickedItemTag == homePage) - { - contentFrame.Navigate(xaml_typename()); - } - else if (clickedItemTag == launchSubpage) + if (clickedItemTag == launchSubpage) { contentFrame.Navigate(xaml_typename()); } @@ -231,9 +224,5 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation { contentFrame.Navigate(xaml_typename()); } - else if (clickedItemTag == keybindingsPage) - { - contentFrame.Navigate(xaml_typename()); - } } } diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.xaml b/src/cascadia/TerminalSettingsEditor/MainPage.xaml index 2047bf1c640..cc14bf65bc1 100644 --- a/src/cascadia/TerminalSettingsEditor/MainPage.xaml +++ b/src/cascadia/TerminalSettingsEditor/MainPage.xaml @@ -26,18 +26,8 @@ the MIT License. See LICENSE in the project root for license information. --> IsBackButtonVisible="Auto" IsBackEnabled="True" BackRequested="SettingsNav_BackRequested"> - - - - @@ -104,34 +94,6 @@ the MIT License. See LICENSE in the project root for license information. --> - - - - - Command Prompt - - - - - - - Windows Powershell - - - - - - - Ubuntu - - - - - - - PowerShell 7 - - From ab55fb8d394018d283008bd6d77774f949010d66 Mon Sep 17 00:00:00 2001 From: cinnamon-msft Date: Wed, 28 Oct 2020 11:47:08 -0700 Subject: [PATCH 3/3] remove remaining home page files --- src/cascadia/TerminalSettingsEditor/Home.cpp | 40 --------- src/cascadia/TerminalSettingsEditor/Home.h | 28 ------ src/cascadia/TerminalSettingsEditor/Home.idl | 13 --- src/cascadia/TerminalSettingsEditor/Home.xaml | 79 ----------------- .../TerminalSettingsEditor/HomeGridItem.cpp | 15 ---- .../TerminalSettingsEditor/HomeGridItem.h | 19 ---- .../TerminalSettingsEditor/HomeGridItem.idl | 11 --- .../TerminalSettingsEditor/MainPage.cpp | 87 ------------------- .../TerminalSettingsEditor/MainPage.h | 7 -- ...Microsoft.Terminal.Settings.Editor.vcxproj | 27 ------ ...t.Terminal.Settings.Editor.vcxproj.filters | 3 - .../SettingsEditorViewModel.cpp | 24 ----- .../SettingsEditorViewModel.h | 22 ----- .../SettingsEditorViewModel.idl | 13 --- 14 files changed, 388 deletions(-) delete mode 100644 src/cascadia/TerminalSettingsEditor/Home.cpp delete mode 100644 src/cascadia/TerminalSettingsEditor/Home.h delete mode 100644 src/cascadia/TerminalSettingsEditor/Home.idl delete mode 100644 src/cascadia/TerminalSettingsEditor/Home.xaml delete mode 100644 src/cascadia/TerminalSettingsEditor/HomeGridItem.cpp delete mode 100644 src/cascadia/TerminalSettingsEditor/HomeGridItem.h delete mode 100644 src/cascadia/TerminalSettingsEditor/HomeGridItem.idl delete mode 100644 src/cascadia/TerminalSettingsEditor/SettingsEditorViewModel.cpp delete mode 100644 src/cascadia/TerminalSettingsEditor/SettingsEditorViewModel.h delete mode 100644 src/cascadia/TerminalSettingsEditor/SettingsEditorViewModel.idl diff --git a/src/cascadia/TerminalSettingsEditor/Home.cpp b/src/cascadia/TerminalSettingsEditor/Home.cpp deleted file mode 100644 index 91afb85dc2c..00000000000 --- a/src/cascadia/TerminalSettingsEditor/Home.cpp +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -#include "pch.h" -#include "Home.h" -#include "Home.g.cpp" -#include "MainPage.h" - -using namespace winrt; -using namespace winrt::Windows::UI::Xaml; - -namespace winrt::Microsoft::Terminal::Settings::Editor::implementation -{ - Home::Home() - { - m_homeViewModel = winrt::make(); - InitializeComponent(); - - HomeViewModel().HomeGridItems().Append(winrt::make(L"Startup", L"Launch_Nav")); - HomeViewModel().HomeGridItems().Append(winrt::make(L"Interaction", L"Interaction_Nav")); - HomeViewModel().HomeGridItems().Append(winrt::make(L"Rendering", L"Rendering_Nav")); - HomeViewModel().HomeGridItems().Append(winrt::make(L"Global appearance", L"GlobalAppearance_Nav")); - HomeViewModel().HomeGridItems().Append(winrt::make(L"Color schemes", L"ColorSchemes_Nav")); - HomeViewModel().HomeGridItems().Append(winrt::make(L"Global profile settings", L"GlobalProfile_Nav")); - HomeViewModel().HomeGridItems().Append(winrt::make(L"Keyboard", L"Keyboard_Nav")); - } - - void Home::HomeGridItemClickHandler(IInspectable const&, Controls::ItemClickEventArgs const& args) - { - auto clickedItemContainer = args.ClickedItem().as(); - hstring tag = clickedItemContainer->PageTag(); - MainPage::Navigate(frame(), tag); - } - - Editor::SettingsEditorViewModel Home::HomeViewModel() - { - return m_homeViewModel; - } - -} diff --git a/src/cascadia/TerminalSettingsEditor/Home.h b/src/cascadia/TerminalSettingsEditor/Home.h deleted file mode 100644 index bb67143dca6..00000000000 --- a/src/cascadia/TerminalSettingsEditor/Home.h +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -#pragma once - -#include "Home.g.h" -#include "SettingsEditorViewModel.h" -#include "Utils.h" - -namespace winrt::Microsoft::Terminal::Settings::Editor::implementation -{ - struct Home : HomeT - { - Home(); - - Editor::SettingsEditorViewModel HomeViewModel(); - - void HomeGridItemClickHandler(Windows::Foundation::IInspectable const&, Windows::UI::Xaml::Controls::ItemClickEventArgs const& args); - - private: - Editor::SettingsEditorViewModel m_homeViewModel{ nullptr }; - }; -} - -namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation -{ - BASIC_FACTORY(Home); -} diff --git a/src/cascadia/TerminalSettingsEditor/Home.idl b/src/cascadia/TerminalSettingsEditor/Home.idl deleted file mode 100644 index e275d44c1c4..00000000000 --- a/src/cascadia/TerminalSettingsEditor/Home.idl +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -import "SettingsEditorViewModel.idl"; - -namespace Microsoft.Terminal.Settings.Editor -{ - runtimeclass Home : Windows.UI.Xaml.Controls.Page - { - Home(); - SettingsEditorViewModel HomeViewModel{ get; }; - } -} diff --git a/src/cascadia/TerminalSettingsEditor/Home.xaml b/src/cascadia/TerminalSettingsEditor/Home.xaml deleted file mode 100644 index 48f2bcdcaad..00000000000 --- a/src/cascadia/TerminalSettingsEditor/Home.xaml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/cascadia/TerminalSettingsEditor/HomeGridItem.cpp b/src/cascadia/TerminalSettingsEditor/HomeGridItem.cpp deleted file mode 100644 index 248cb5d6c86..00000000000 --- a/src/cascadia/TerminalSettingsEditor/HomeGridItem.cpp +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -#include "pch.h" -#include "HomeGridItem.h" -#include "HomeGridItem.g.cpp" - -namespace winrt::Microsoft::Terminal::Settings::Editor::implementation -{ - HomeGridItem::HomeGridItem(hstring const& title, hstring const& pageTag) : - _Title{ title }, - _PageTag{ pageTag } - { - } -} diff --git a/src/cascadia/TerminalSettingsEditor/HomeGridItem.h b/src/cascadia/TerminalSettingsEditor/HomeGridItem.h deleted file mode 100644 index 9b7a0e10f42..00000000000 --- a/src/cascadia/TerminalSettingsEditor/HomeGridItem.h +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -#pragma once -#include "HomeGridItem.g.h" -#include "Utils.h" - -namespace winrt::Microsoft::Terminal::Settings::Editor::implementation -{ - struct HomeGridItem : HomeGridItemT - { - HomeGridItem() = delete; - HomeGridItem(hstring const& title, hstring const& pageTag); - - WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler); - OBSERVABLE_GETSET_PROPERTY(hstring, Title, _PropertyChangedHandlers); - OBSERVABLE_GETSET_PROPERTY(hstring, PageTag, _PropertyChangedHandlers); - }; -} diff --git a/src/cascadia/TerminalSettingsEditor/HomeGridItem.idl b/src/cascadia/TerminalSettingsEditor/HomeGridItem.idl deleted file mode 100644 index 935be521f2f..00000000000 --- a/src/cascadia/TerminalSettingsEditor/HomeGridItem.idl +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -namespace Microsoft.Terminal.Settings.Editor -{ - runtimeclass HomeGridItem : Windows.UI.Xaml.Data.INotifyPropertyChanged - { - String Title; - String PageTag; - } -} diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp index cec262f3a83..5f48897ce13 100644 --- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp +++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp @@ -4,7 +4,6 @@ #include "pch.h" #include "MainPage.h" #include "MainPage.g.cpp" -#include "Home.h" #include "Globals.h" #include "Launch.h" #include "Interaction.h" @@ -36,34 +35,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation // this section will clone the active AppSettings MainPage::_settingsSource = settings; _settingsClone = nullptr; - - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Add new profile"), L"AddNew_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Always show tabs"), L"GlobalAppearance_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Color scheme"), L"ColorSchemes_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Columns on first launch"), L"Launch_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Copy after selection is made"), L"Interaction_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Copy formatting"), L"Interaction_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Default profile"), L"Launch_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Disable dynamic profiles"), L"Launch_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Global appearance"), L"GlobalAppearance_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Global profile settings"), L"GlobalProfile_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Hide close all tabs popup"), L"GlobalAppearance_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Interaction"), L"Interaction_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Keyboard"), L"Keyboard_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Launch"), L"Launch_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Launch on startup"), L"Launch_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Launch position"), L"Launch_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Launch size"), L"Launch_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Rendering"), L"Rendering_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Rows on first launch"), L"Launch_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Screen redrawing"), L"Rendering_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Show terminal title in title bar"), L"GlobalAppearance_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Show the title bar"), L"GlobalAppearance_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Software rendering"), L"Rendering_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Tab width mode"), L"GlobalAppearance_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Theme"), L"GlobalAppearance_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Window resize behavior"), L"Rendering_Nav")); - SearchList.insert(std::pair(Windows::Foundation::PropertyValue::CreateString(L"Word delimiters"), L"Interaction_Nav")); } CascadiaSettings MainPage::Settings() @@ -123,64 +94,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation return true; } - void MainPage::AutoSuggestBox_TextChanged(IInspectable const& sender, const Controls::AutoSuggestBoxTextChangedEventArgs args) - { - Controls::AutoSuggestBox autoBox = sender.as(); - auto query = autoBox.Text(); - SearchSettings(query, autoBox); - } - - void MainPage::AutoSuggestBox_QuerySubmitted(const Controls::AutoSuggestBox sender, const Controls::AutoSuggestBoxQuerySubmittedEventArgs args) - { - auto value = args.QueryText(); - } - - void MainPage::AutoSuggestBox_SuggestionChosen(const Controls::AutoSuggestBox sender, const Controls::AutoSuggestBoxSuggestionChosenEventArgs args) - { - auto selectItem = args.SelectedItem().as().GetString(); - Controls::AutoSuggestBox autoBox = sender.as(); - - Navigate(contentFrame(), SearchList.at(args.SelectedItem())); - } - - void MainPage::SearchSettings(hstring query, Controls::AutoSuggestBox& autoBox) - { - Windows::Foundation::Collections::IVector suggestions = single_threaded_vector(); - std::vector rawSuggestions; - - for (auto it = SearchList.begin(); it != SearchList.end(); ++it) - { - auto value = it->first; - hstring item = value.as().GetString(); - - std::string tmp = winrt::to_string(item); - std::transform(tmp.begin(), tmp.end(), tmp.begin(), [](auto c) { return static_cast(std::tolower(c)); }); - item = winrt::to_hstring(tmp); - - std::string tmp2 = winrt::to_string(query); - std::transform(tmp2.begin(), tmp2.end(), tmp2.begin(), [](auto c) { return static_cast(std::tolower(c)); }); - query = winrt::to_hstring(tmp2); - - if (std::wcsstr(item.c_str(), query.c_str())) - { - rawSuggestions.emplace_back(value); - } - } - - // perform sort comparing strings inside of IPropertyValues - std::sort(rawSuggestions.begin(), rawSuggestions.end(), [](const IInspectable& a, const IInspectable& b) -> bool { - return a.as().GetString() < b.as().GetString(); - }); - - // Pass all elements from rawSuggestions to suggestions - for (const auto& suggestion : rawSuggestions) - { - suggestions.Append(suggestion); - } - - autoBox.ItemsSource(suggestions); - } - void MainPage::Navigate(Controls::Frame contentFrame, hstring clickedItemTag) { const hstring generalPage = L"General_Nav"; diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.h b/src/cascadia/TerminalSettingsEditor/MainPage.h index ed0ce2d82af..59fb8951860 100644 --- a/src/cascadia/TerminalSettingsEditor/MainPage.h +++ b/src/cascadia/TerminalSettingsEditor/MainPage.h @@ -19,13 +19,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation bool On_BackRequested(); static void Navigate(Windows::UI::Xaml::Controls::Frame contentFrame, hstring clickedItemTag); - std::map SearchList; - - void AutoSuggestBox_TextChanged(Windows::Foundation::IInspectable const& sender, const winrt::Windows::UI::Xaml::Controls::AutoSuggestBoxTextChangedEventArgs args); - void AutoSuggestBox_QuerySubmitted(const winrt::Windows::UI::Xaml::Controls::AutoSuggestBox sender, const winrt::Windows::UI::Xaml::Controls::AutoSuggestBoxQuerySubmittedEventArgs args); - void AutoSuggestBox_SuggestionChosen(const winrt::Windows::UI::Xaml::Controls::AutoSuggestBox sender, const winrt::Windows::UI::Xaml::Controls::AutoSuggestBoxSuggestionChosenEventArgs args); - void SearchSettings(hstring query, winrt::Windows::UI::Xaml::Controls::AutoSuggestBox& autoBox); - static winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings Settings(); private: diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj index dbcb1a66798..ef2a76a8848 100644 --- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj +++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj @@ -55,12 +55,6 @@ Globals.xaml Code - - Home.xaml - - - HomeGridItem.idl - Interaction.xaml @@ -89,9 +83,6 @@ Rendering.xaml - - SettingsEditorViewModel.idl - @@ -110,9 +101,6 @@ Designer - - Designer - Designer @@ -160,12 +148,6 @@ Globals.xaml Code - - Home.xaml - - - HomeGridItem.idl - Interaction.xaml @@ -197,18 +179,11 @@ Rendering.xaml - - SettingsEditorViewModel.idl - - - Home.xaml - Code - GlobalAppearance.xaml Code @@ -221,7 +196,6 @@ Globals.xaml Code - Launch.xaml Code @@ -257,7 +231,6 @@ NewTabOptionPanelControl.xaml Code - diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters index 29457622184..d315eed3bf3 100644 --- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters +++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters @@ -16,8 +16,6 @@ - - Converters @@ -36,7 +34,6 @@ - diff --git a/src/cascadia/TerminalSettingsEditor/SettingsEditorViewModel.cpp b/src/cascadia/TerminalSettingsEditor/SettingsEditorViewModel.cpp deleted file mode 100644 index b468e818dcb..00000000000 --- a/src/cascadia/TerminalSettingsEditor/SettingsEditorViewModel.cpp +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -#include "pch.h" -#include "SettingsEditorViewModel.h" -#include "SettingsEditorViewModel.g.cpp" - -namespace winrt::Microsoft::Terminal::Settings::Editor::implementation -{ - SettingsEditorViewModel::SettingsEditorViewModel() - { - _HomeGridItems = winrt::single_threaded_observable_vector(); - } - - Editor::HomeGridItem SettingsEditorViewModel::HomeGridItem() - { - return _HomeGridItem; - } - - Windows::Foundation::Collections::IObservableVector SettingsEditorViewModel::HomeGridItems() - { - return _HomeGridItems; - } -} diff --git a/src/cascadia/TerminalSettingsEditor/SettingsEditorViewModel.h b/src/cascadia/TerminalSettingsEditor/SettingsEditorViewModel.h deleted file mode 100644 index 670fe0b782b..00000000000 --- a/src/cascadia/TerminalSettingsEditor/SettingsEditorViewModel.h +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -#pragma once -#include "SettingsEditorViewModel.g.h" -#include "HomeGridItem.h" - -namespace winrt::Microsoft::Terminal::Settings::Editor::implementation -{ - struct SettingsEditorViewModel : SettingsEditorViewModelT - { - SettingsEditorViewModel(); - - Editor::HomeGridItem HomeGridItem(); - - Windows::Foundation::Collections::IObservableVector HomeGridItems(); - - private: - Editor::HomeGridItem _HomeGridItem{ nullptr }; - Windows::Foundation::Collections::IObservableVector _HomeGridItems; - }; -} diff --git a/src/cascadia/TerminalSettingsEditor/SettingsEditorViewModel.idl b/src/cascadia/TerminalSettingsEditor/SettingsEditorViewModel.idl deleted file mode 100644 index 325a30a05ef..00000000000 --- a/src/cascadia/TerminalSettingsEditor/SettingsEditorViewModel.idl +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -import "HomeGridItem.idl"; - -namespace Microsoft.Terminal.Settings.Editor -{ - runtimeclass SettingsEditorViewModel - { - HomeGridItem HomeGridItem { get; }; - Windows.Foundation.Collections.IObservableVector HomeGridItems { get; }; - } -}