Add UI for adding, renaming, and deleting a color scheme

src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp

@@ -11,6 +11,7 @@
 
 using namespace winrt;
 using namespace winrt::Windows::UI;
+using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Xaml::Navigation;
 using namespace winrt::Windows::UI::Xaml::Controls;
 using namespace winrt::Windows::UI::Xaml::Media;
@@ -38,8 +39,20 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         RS_(L"ColorScheme_BrightWhite/Header")
     };
 
+    static const std::set<std::wstring> InBoxSchemes = {
+        L"Campbell",
+        L"Campbell Powershell",
+        L"Vintage",
+        L"One Half Dark",
+        L"One Half Light",
+        L"Solarized Dark",
+        L"Solarized Light",
+        L"Tango Dark",
+        L"Tango Light"
+    };
+
     ColorSchemes::ColorSchemes() :
-        _ColorSchemeList{ single_threaded_observable_vector<hstring>() },
+        _ColorSchemeList{ single_threaded_observable_vector<Model::ColorScheme>() },
         _CurrentColorTable{ single_threaded_observable_vector<Editor::ColorTableEntry>() }
     {
         InitializeComponent();
@@ -73,10 +86,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                                                    SelectionChangedEventArgs const& args)
     {
         //  Update the color scheme this page is modifying
-        auto str = winrt::unbox_value<hstring>(args.AddedItems().GetAt(0));
-        auto colorScheme = _State.Globals().ColorSchemes().Lookup(str);
+        const auto colorScheme{ args.AddedItems().GetAt(0).try_as<Model::ColorScheme>() };
         CurrentColorScheme(colorScheme);
         _UpdateColorTable(colorScheme);
+        _PropertyChangedHandlers(*this, Windows::UI::Xaml::Data::PropertyChangedEventArgs{ L"CanDeleteCurrentScheme" });
     }
 
     // Function Description:
@@ -92,7 +105,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         const auto& colorSchemeMap{ _State.Globals().ColorSchemes() };
         for (const auto& pair : colorSchemeMap)
         {
-            _ColorSchemeList.Append(pair.Key());
+            _ColorSchemeList.Append(pair.Value());
         }
     }
 
@@ -120,6 +133,68 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
     }
 
+    bool ColorSchemes::CanDeleteCurrentScheme() const
+    {
+        if (const auto scheme{ CurrentColorScheme() })
+        {
+            // Only allow this color scheme to be deleted if it's not provided in-box
+            const std::wstring myName{ scheme.Name() };
+            return InBoxSchemes.find(myName) == InBoxSchemes.end();
+        }
+        return false;
+    }
+
+    void ColorSchemes::Delete_Click(IInspectable const& /*sender*/, RoutedEventArgs const& /*e*/)
+    {
+        const auto schemeName{ CurrentColorScheme().Name() };
+        _State.Globals().RemoveColorScheme(schemeName);
+
+        const auto removedSchemeIndex{ ColorSchemeComboBox().SelectedIndex() };
+        if (static_cast<uint32_t>(removedSchemeIndex) < _ColorSchemeList.Size() - 1)
+        {
+            // select same index
+            ColorSchemeComboBox().SelectedIndex(removedSchemeIndex + 1);
+        }
+        else
+        {
+            // select last color scheme (avoid out of bounds error)
+            ColorSchemeComboBox().SelectedIndex(removedSchemeIndex - 1);
+        }
+        _ColorSchemeList.RemoveAt(removedSchemeIndex);
+    }
+
+    void ColorSchemes::AddNew_Click(IInspectable const& /*sender*/, RoutedEventArgs const& /*e*/)
+    {
+        // Give the new scheme a distinct name
+        const hstring schemeName{ fmt::format(L"Color Scheme {}", _State.Globals().ColorSchemes().Size() + 1) };
+        Model::ColorScheme scheme{ schemeName };
+
+        // Add the new color scheme
+        _State.Globals().AddColorScheme(scheme);
+
+        // Update current page
+        _ColorSchemeList.Append(scheme);
+        ColorSchemeComboBox().SelectedItem(scheme);
+    }
+
+    void ColorSchemes::Rename_Click(IInspectable const& sender, RoutedEventArgs const& /*e*/)
+    {
+        const auto schemeName{ CurrentColorScheme().Name() };
+        const hstring title{ fmt::format(std::wstring_view{ RS_(L"ColorScheme_RenameDialog/Title") }, schemeName) };
+
+        auto dialog{ FindName(L"RenameDialog").try_as<ContentDialog>() };
+        dialog.Title(winrt::box_value(title));
+        dialog.XamlRoot(sender.as<UIElement>().XamlRoot());
+
+        NameBox().Text(schemeName);
+        dialog.ShowAsync(ContentDialogPlacement::Popup);
+    }
+
+    void ColorSchemes::RenameConfirm_Click(IInspectable const& /*sender*/, ContentDialogButtonClickEventArgs const& /*e*/)
+    {
+        CurrentColorScheme().Name(NameBox().Text());
+    }
+
     // Function Description:
     // - Updates the currently modifiable color table based on the given current color scheme.
     // Arguments:

src/cascadia/TerminalSettingsEditor/ColorSchemes.h

@@ -27,10 +27,16 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         void ColorSchemeSelectionChanged(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::Controls::SelectionChangedEventArgs const& args);
         void ColorPickerChanged(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::Controls::ColorChangedEventArgs const& args);
+        void Delete_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
+        void AddNew_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
+        void Rename_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
+        void RenameConfirm_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::Controls::ContentDialogButtonClickEventArgs const& e);
+
+        bool CanDeleteCurrentScheme() const;
 
         GETSET_PROPERTY(Editor::ColorSchemesPageNavigationState, State, nullptr);
         GETSET_PROPERTY(Windows::Foundation::Collections::IObservableVector<winrt::Microsoft::Terminal::Settings::Editor::ColorTableEntry>, CurrentColorTable, nullptr);
-        GETSET_PROPERTY(Windows::Foundation::Collections::IObservableVector<winrt::hstring>, ColorSchemeList, nullptr);
+        GETSET_PROPERTY(Windows::Foundation::Collections::IObservableVector<Model::ColorScheme>, ColorSchemeList, nullptr);
 
         WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
         OBSERVABLE_GETSET_PROPERTY(winrt::Microsoft::Terminal::Settings::Model::ColorScheme, CurrentColorScheme, _PropertyChangedHandlers, nullptr);

src/cascadia/TerminalSettingsEditor/ColorSchemes.idl

@@ -13,9 +13,10 @@ namespace Microsoft.Terminal.Settings.Editor
         ColorSchemes();
         ColorSchemesPageNavigationState State { get; };
 
+        Boolean CanDeleteCurrentScheme { get; };
         Microsoft.Terminal.Settings.Model.ColorScheme CurrentColorScheme { get; };
         Windows.Foundation.Collections.IObservableVector<ColorTableEntry> CurrentColorTable;
-        Windows.Foundation.Collections.IObservableVector<String> ColorSchemeList { get; };
+        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Model.ColorScheme> ColorSchemeList { get; };
     }
 
     [default_interface] runtimeclass ColorTableEntry : Windows.UI.Xaml.Data.INotifyPropertyChanged

src/cascadia/TerminalSettingsEditor/ColorSchemes.xaml

@@ -5,6 +5,7 @@ the MIT License. See LICENSE in the project root for license information. -->
     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:model="using:Microsoft.Terminal.Settings.Model"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
@@ -15,8 +16,8 @@ the MIT License. See LICENSE in the project root for license information. -->
                 <ResourceDictionary Source="CommonResources.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
-            <Thickness x:Key="ColorSchemesStandardControlMargin">10,0,0,20</Thickness>
-            
+            <Thickness x:Key="ColorSchemesStandardControlMargin">0,0,10,20</Thickness>
+
             <Style x:Key="ColorStackPanelStyle" TargetType="StackPanel">
                 <Setter Property="Margin" Value="{StaticResource ColorSchemesStandardControlMargin}"/>
                 <Setter Property="Height" Value="59"/>
@@ -46,28 +47,59 @@ the MIT License. See LICENSE in the project root for license information. -->
     </Page.Resources>
 
     <ScrollViewer>
-        <Grid>
+        <Grid Margin="{StaticResource StandardIndentMargin}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="*"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="1*" MaxWidth="480"/>
                 <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-            <!--Select a color scheme-->
-            <ComboBox x:Name="ColorSchemeComboBox"
-                      Grid.Row="0"
-                      Grid.Column="0"
-                      Grid.ColumnSpan="2"
-                      SelectedIndex="0"
-                      ItemsSource="{x:Bind ColorSchemeList, Mode=OneWay}"
-                      SelectionChanged="ColorSchemeSelectionChanged"
-                      Style="{StaticResource ComboBoxSettingStyle}"
-                      Margin="{StaticResource ColorSchemesStandardControlMargin}"/>
-
-            <!-- Color Table -->
+            <!--Select Color and Add New Button-->
+            <StackPanel Orientation="Horizontal"
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Margin="{StaticResource StandardControlSpacing}">
+                <ComboBox x:Name="ColorSchemeComboBox"
+                          Grid.Row="0"
+                          Grid.Column="0"
+                          Grid.ColumnSpan="2"
+                          SelectedIndex="0"
+                          ItemsSource="{x:Bind ColorSchemeList, Mode=OneWay}"
+                          SelectionChanged="ColorSchemeSelectionChanged"
+                          Style="{StaticResource ComboBoxSettingStyle}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate x:DataType="model:ColorScheme">
+                            <TextBlock Text="{x:Bind Name, Mode=OneWay}"/>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+
+                <!--Rename Button-->
+                <Button x:Uid="ColorScheme_Rename"
+                        Style="{StaticResource BrowseButtonStyle}"
+                        Click="Rename_Click">
+                    <FontIcon Glyph="&#xE8AC;"/>
+                </Button>
+
+                <!--Add new button-->
+                <Button Click="AddNew_Click"
+                        Style="{StaticResource BrowseButtonStyle}">
+                    <StackPanel Orientation="Horizontal">
+                        <FontIcon Glyph="&#xE710;"
+                                  FontSize="15"/>
+                        <TextBlock x:Uid="ColorScheme_AddNewButton"
+                                   Margin="10,0,0,0"
+                                   FontSize="15"/>
+                    </StackPanel>
+                </Button>
+            </StackPanel>
+
+            <!-- Color Table (Left Column)-->
             <ItemsControl x:Name="ColorTableControl"
                           ItemsSource="{x:Bind CurrentColorTable, Mode=OneWay}"
                           Grid.Row="1"
@@ -98,8 +130,8 @@ the MIT License. See LICENSE in the project root for license information. -->
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
 
-            <!-- Additional Colors -->
-            <ItemsControl Grid.Row="2"
+            <!-- Additional Colors (Right Column) -->
+            <ItemsControl Grid.Row="1"
                           Grid.Column="1">
                 <StackPanel Style="{StaticResource ColorStackPanelStyle}">
                     <TextBlock x:Uid="ColorScheme_Foreground"
@@ -149,6 +181,64 @@ the MIT License. See LICENSE in the project root for license information. -->
                     </Button>
                 </StackPanel>
             </ItemsControl>
+
+            <!--Delete Button-->
+            <Button Grid.Row="2"
+                    Grid.Column="0"
+                    Click="Delete_Click"
+                    Style="{StaticResource BaseButtonStyle}"
+                    Margin="{StaticResource StandardControlSpacing}"
+                    IsEnabled="{x:Bind CanDeleteCurrentScheme, Mode=OneWay}">
+                <Button.Resources>
+                    <ResourceDictionary>
+                        <ResourceDictionary.ThemeDictionaries>
+                            <ResourceDictionary x:Key="Light">
+                                <SolidColorBrush x:Key="ButtonBackground" Color="Firebrick"/>
+                                <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#C23232"/>
+                                <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#A21212"/>
+                                <SolidColorBrush x:Key="ButtonForeground" Color="White"/>
+                                <SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="White"/>
+                                <SolidColorBrush x:Key="ButtonForegroundPressed" Color="White"/>
+                            </ResourceDictionary>
+                            <ResourceDictionary x:Key="Dark">
+                                <SolidColorBrush x:Key="ButtonBackground" Color="Firebrick"/>
+                                <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#C23232"/>
+                                <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#A21212"/>
+                                <SolidColorBrush x:Key="ButtonForeground" Color="White"/>
+                                <SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="White"/>
+                                <SolidColorBrush x:Key="ButtonForegroundPressed" Color="White"/>
+                            </ResourceDictionary>
+                            <ResourceDictionary x:Key="HighContrast">
+                                <SolidColorBrush x:Key="ButtonBackground" Color="{ThemeResource SystemColorButtonFaceColor}"/>
+                                <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SystemColorHighlightColor}"/>
+                                <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SystemColorHighlightColor}"/>
+                                <SolidColorBrush x:Key="ButtonForeground" Color="{ThemeResource SystemColorButtonTextColor}"/>
+                                <SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="{ThemeResource SystemColorHighlightTextColor}"/>
+                                <SolidColorBrush x:Key="ButtonForegroundPressed" Color="{ThemeResource SystemColorHighlightTextColor}"/>
+                            </ResourceDictionary>
+                        </ResourceDictionary.ThemeDictionaries>
+                    </ResourceDictionary>
+                </Button.Resources>
+                <Button.Content>
+                    <StackPanel Orientation="Horizontal">
+                        <FontIcon Glyph="&#xE74D;"
+                                  FontSize="{StaticResource StandardFontSize}"/>
+                        <TextBlock x:Uid="ColorScheme_DeleteButton"
+                                   FontSize="{StaticResource StandardFontSize}"
+                                   Margin="10,0,0,0"/>
+                    </StackPanel>
+                </Button.Content>
+            </Button>
+
+            <ContentDialog x:Load="False"
+                           x:Uid="ColorScheme_RenameDialog"
+                           x:Name="RenameDialog"
+                           DefaultButton="Primary"
+                           PrimaryButtonClick="RenameConfirm_Click">
+                <TextBox x:Uid="ColorScheme_Name"
+                         x:Name="NameBox"
+                         Style="{StaticResource TextBoxSettingStyle}"/>
+            </ContentDialog>
         </Grid>
     </ScrollViewer>
 </Page>

src/cascadia/TerminalSettingsEditor/CommonResources.xaml

@@ -5,12 +5,13 @@
 
     <x:Double x:Key="StandardFontSize">15.0</x:Double>
     <Thickness x:Key="StandardIndentMargin">20,0,0,0</Thickness>
+    <Thickness x:Key="StandardControlSpacing">0,0,0,20</Thickness>
     <x:Double x:Key="StandardBoxMinWidth">300</x:Double>
 
     <!-- This is for easier transition to the SettingsContainer control.
          The SettingsContainer will wrap a setting with inheritance UI.-->
     <Style x:Key="SettingContainerStyle" TargetType="ContentPresenter">
-        <Setter Property="Padding" Value="0,0,0,20"/>
+        <Setter Property="Padding" Value="{StaticResource StandardControlSpacing}"/>
     </Style>
 
     <!--Used to stack a group of settings-->
@@ -105,5 +106,4 @@
         <Setter Property="Width" Value="300"/>
         <Setter Property="HorizontalAlignment" Value="Left"/>
     </Style>
-
 </ResourceDictionary>