Convert TerminalSettingsEditor into a DLL

src/cascadia/TerminalApp/TerminalAppLib.vcxproj

@@ -358,6 +358,12 @@
       <Private>false</Private>
       <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
     </Reference>
+    <Reference Include="Microsoft.Terminal.Settings.Editor">
+      <HintPath>$(_BinRoot)TerminalSettingsEditor\Microsoft.Terminal.Settings.Editor.winmd</HintPath>
+      <IsWinMDFile>true</IsWinMDFile>
+      <Private>false</Private>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+    </Reference>
   </ItemGroup>
   <!-- ====================== Compiler & Linker Flags ===================== -->
   <ItemDefinitionGroup>

src/cascadia/TerminalApp/dll/TerminalApp.vcxproj

@@ -69,6 +69,7 @@
     include Settings and Connection, since Control will include them for us) -->
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettingsEditor\TerminalSettingsEditor.vcxproj" />
     <!-- Reference TerminalAppLib here, so we can use it's TerminalApp.winmd as
     our TerminalApp.winmd. This didn't work correctly in VS2017, you'd need to
     manually reference the lib -->

src/cascadia/TerminalApp/pch.h

@@ -67,6 +67,7 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalAppProvider);
 #include <shellapi.h>
 
 #include <winrt/Microsoft.Terminal.TerminalConnection.h>
+#include <winrt/Microsoft.Terminal.Settings.Editor.h>
 #include <winrt/Windows.UI.Popups.h>
 
 #include <CLI11/CLI11.hpp>

src/cascadia/TerminalSettingsEditor/ColorSchemes.idl

@@ -8,6 +8,6 @@ namespace Microsoft.Terminal.Settings.Editor
     [default_interface] runtimeclass ColorSchemes : Windows.UI.Xaml.Controls.Page
     {
         ColorSchemes();
-        Microsoft.Terminal.Settings.Model.ColorSchemeModel ColorSchemeModel { get; };
+        Microsoft.Terminal.Settings.Editor.Model.ColorSchemeModel ColorSchemeModel { get; };
     }
 }

src/cascadia/TerminalSettingsEditor/CommonResources.xaml

@@ -0,0 +1,20 @@
+<ResourceDictionary
+    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">
+
+    <Style x:Key="GridViewItemStyle" TargetType="GridViewItem">
+        <Setter Property="Margin" Value="0,0,12,12" />
+    </Style>
+    <Style x:Key="IndentedGridViewItemStyle" TargetType="GridViewItem">
+        <Setter Property="Margin" Value="12,0,0,12" />
+    </Style>
+    <Style x:Key="GridViewItemStyleSmall" TargetType="GridViewItem">
+        <Setter Property="Margin" Value="0,0,0,12" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    </Style>
+    <Style x:Key="IndentedGridViewItemStyleSmall" TargetType="GridViewItem">
+        <Setter Property="Margin" Value="12,0,12,12" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    </Style>
+</ResourceDictionary>

src/cascadia/TerminalSettingsEditor/GlobalAppearance.idl

@@ -8,6 +8,6 @@ namespace Microsoft.Terminal.Settings.Editor
     [default_interface] runtimeclass GlobalAppearance : Windows.UI.Xaml.Controls.Page
     {
         GlobalAppearance();
-        Microsoft.Terminal.Settings.Model.GlobalSettingsModel GlobalSettingsModel { get; };
+        Microsoft.Terminal.Settings.Editor.Model.GlobalSettingsModel GlobalSettingsModel { get; };
     }
 }

src/cascadia/TerminalSettingsEditor/Home.xaml

@@ -10,6 +10,14 @@ the MIT License. See LICENSE in the project root for license information. -->
     xmlns:Controls="using:Microsoft.UI.Xaml.Controls"
     mc:Ignorable="d">
 
+    <Page.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="CommonResources.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Page.Resources>
+
     <Frame x:Name="frame">
         <Frame.ContentTransitions>
             <TransitionCollection>

src/cascadia/TerminalSettingsEditor/Interaction.idl

@@ -9,6 +9,6 @@ namespace Microsoft.Terminal.Settings.Editor
     {
         Interaction();
 
-        Microsoft.Terminal.Settings.Model.GlobalSettingsModel GlobalSettingsModel { get; };
+        Microsoft.Terminal.Settings.Editor.Model.GlobalSettingsModel GlobalSettingsModel { get; };
     }
 }

src/cascadia/TerminalSettingsEditor/Launch.idl

@@ -9,6 +9,6 @@ namespace Microsoft.Terminal.Settings.Editor
     {
         Launch();
 
-        Microsoft.Terminal.Settings.Model.GlobalSettingsModel GlobalSettingsModel { get; };
+        Microsoft.Terminal.Settings.Editor.Model.GlobalSettingsModel GlobalSettingsModel { get; };
     }
 }

src/cascadia/TerminalSettingsEditor/MainPage.cpp

@@ -22,7 +22,7 @@ namespace winrt
 
 using namespace winrt::Windows::Foundation;
 using namespace winrt::Windows::UI::Xaml;
-using namespace winrt::Microsoft::Terminal::Settings::Model::implementation;
+using namespace winrt::Microsoft::Terminal::Settings::Editor::Model::implementation;
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {

src/cascadia/TerminalSettingsEditor/MainPage.xaml

@@ -1,6 +1,6 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
 the MIT License. See LICENSE in the project root for license information. -->
-<Page
+<Grid
     x:Class="Microsoft.Terminal.Settings.Editor.MainPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -175,4 +175,4 @@ the MIT License. See LICENSE in the project root for license information. -->
                    Margin="20"></Frame>
         </muxc:NavigationView>
     </Grid>
-</Page>
+</Grid>

src/cascadia/TerminalSettingsEditor/ObjectModel/AppSettings.cpp

@@ -1,7 +1,7 @@
 #include "pch.h"
 #include "AppSettings.h"
 
-using namespace winrt::Microsoft::Terminal::Settings::Model::implementation;
+using namespace winrt::Microsoft::Terminal::Settings::Editor::Model::implementation;
 
 // uncomment and edit these to test data binding
 

src/cascadia/TerminalSettingsEditor/ObjectModel/AppSettings.h

@@ -3,7 +3,7 @@
 #include "GlobalSettings.h"
 #include "Profile.h"
 
-namespace winrt::Microsoft::Terminal::Settings::Model::implementation
+namespace winrt::Microsoft::Terminal::Settings::Editor::Model::implementation
 {
     enum class Modifiers
     {

src/cascadia/TerminalSettingsEditor/ObjectModel/ColorScheme.cpp

@@ -1,14 +1,14 @@
 #include "pch.h"
 #include "ColorScheme.h"
-#include "Microsoft.Terminal.Settings.Model.ColorScheme.g.cpp"
+#include "Model.ColorScheme.g.cpp"
 
 using namespace winrt;
 using namespace winrt::Windows::UI;
 using namespace winrt::Windows::UI::Core;
 using namespace winrt::Windows::UI::Xaml::Data;
 using namespace winrt::Windows::UI::Xaml::Media;
 
-namespace winrt::Microsoft::Terminal::Settings::Model::implementation
+namespace winrt::Microsoft::Terminal::Settings::Editor::Model::implementation
 {
     ColorScheme::ColorScheme()
     {

src/cascadia/TerminalSettingsEditor/ObjectModel/ColorScheme.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Microsoft.Terminal.Settings.Model.ColorScheme.g.h"
+#include "Model.ColorScheme.g.h"
 
-namespace winrt::Microsoft::Terminal::Settings::Model::implementation
+namespace winrt::Microsoft::Terminal::Settings::Editor::Model::implementation
 {
     struct ColorScheme : ColorSchemeT<ColorScheme>
     {

src/cascadia/TerminalSettingsEditor/ObjectModel/ColorScheme.idl

@@ -1,4 +1,4 @@
-namespace Microsoft.Terminal.Settings.Model
+namespace Microsoft.Terminal.Settings.Editor.Model
 {
     runtimeclass ColorScheme : Windows.UI.Xaml.Data.INotifyPropertyChanged
     {

src/cascadia/TerminalSettingsEditor/ObjectModel/ColorSchemeModel.cpp

@@ -1,9 +1,9 @@
 #include "pch.h"
 #include "ColorScheme.h"
-#include "Microsoft.Terminal.Settings.Model.ColorSchemeModel.g.cpp"
+#include "Model.ColorSchemeModel.g.cpp"
 #include "ColorSchemeModel.h"
 
-namespace winrt::Microsoft::Terminal::Settings::Model::implementation
+namespace winrt::Microsoft::Terminal::Settings::Editor::Model::implementation
 {
     ColorSchemeModel::ColorSchemeModel()
     {

src/cascadia/TerminalSettingsEditor/ObjectModel/ColorSchemeModel.h

@@ -1,8 +1,8 @@
 #pragma once
-#include "Microsoft.Terminal.Settings.Model.ColorSchemeModel.g.h"
+#include "Model.ColorSchemeModel.g.h"
 #include "ColorScheme.h"
 
-namespace winrt::Microsoft::Terminal::Settings::Model::implementation
+namespace winrt::Microsoft::Terminal::Settings::Editor::Model::implementation
 {
     struct ColorSchemeModel : ColorSchemeModelT<ColorSchemeModel>
     {

src/cascadia/TerminalSettingsEditor/ObjectModel/ColorSchemeModel.idl

@@ -1,6 +1,6 @@
 import "ObjectModel/ColorScheme.idl";
 
-namespace Microsoft.Terminal.Settings.Model
+namespace Microsoft.Terminal.Settings.Editor.Model
 {
     runtimeclass ColorSchemeModel
     {

src/cascadia/TerminalSettingsEditor/ObjectModel/GlobalSettings.cpp

@@ -1,3 +1,3 @@
 #include "pch.h"
 #include "GlobalSettings.h"
-#include "Microsoft.Terminal.Settings.Model.GlobalSettings.g.cpp"
+#include "Model.GlobalSettings.g.cpp"