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

src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp

@@ -39,7 +39,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         RS_(L"ColorScheme_BrightWhite/Header")
     };
 
-    static const std::set<std::wstring> InBoxSchemes = {
+    static const std::array<std::wstring, 9> InBoxSchemes = {
         L"Campbell",
         L"Campbell Powershell",
         L"Vintage",
@@ -89,7 +89,20 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         const auto colorScheme{ args.AddedItems().GetAt(0).try_as<Model::ColorScheme>() };
         CurrentColorScheme(colorScheme);
         _UpdateColorTable(colorScheme);
+
+        // Set the text disclaimer for the text box
+        hstring disclaimer{};
+        const std::wstring schemeName{ colorScheme.Name() };
+        if (std::find(std::begin(InBoxSchemes), std::end(InBoxSchemes), schemeName) != std::end(InBoxSchemes))
+        {
+            // load disclaimer for in-box profiles
+            disclaimer = RS_(L"ColorScheme_DeleteButtonDisclaimerInBox");
+        }
+        DeleteButtonDisclaimer().Text(disclaimer);
+
+        // Update the state of the page
         _PropertyChangedHandlers(*this, Windows::UI::Xaml::Data::PropertyChangedEventArgs{ L"CanDeleteCurrentScheme" });
+        IsRenaming(false);
     }
 
     // Function Description:
@@ -139,12 +152,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         {
             // 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 std::find(std::begin(InBoxSchemes), std::end(InBoxSchemes), myName) == std::end(InBoxSchemes);
         }
         return false;
     }
 
-    void ColorSchemes::Delete_Click(IInspectable const& /*sender*/, RoutedEventArgs const& /*e*/)
+    void ColorSchemes::DeleteConfirmation_Click(IInspectable const& /*sender*/, RoutedEventArgs const& /*e*/)
     {
         const auto schemeName{ CurrentColorScheme().Name() };
         _State.Globals().RemoveColorScheme(schemeName);
@@ -161,6 +174,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             ColorSchemeComboBox().SelectedIndex(removedSchemeIndex - 1);
         }
         _ColorSchemeList.RemoveAt(removedSchemeIndex);
+        DeleteButton().Flyout().Hide();
     }
 
     void ColorSchemes::AddNew_Click(IInspectable const& /*sender*/, RoutedEventArgs const& /*e*/)
@@ -177,22 +191,54 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         ColorSchemeComboBox().SelectedItem(scheme);
     }
 
-    void ColorSchemes::Rename_Click(IInspectable const& sender, RoutedEventArgs const& /*e*/)
+    // Function Description:
+    // - Pre-populates/focuses the name TextBox, updates the UI
+    // Arguments:
+    // - <unused>
+    // Return Value:
+    // - <none>
+    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) };
+        NameBox().Text(CurrentColorScheme().Name());
+        IsRenaming(true);
+        NameBox().Focus(FocusState::Programmatic);
+        NameBox().SelectAll();
+    }
 
-        auto dialog{ FindName(L"RenameDialog").try_as<ContentDialog>() };
-        dialog.Title(winrt::box_value(title));
-        dialog.XamlRoot(sender.as<UIElement>().XamlRoot());
+    void ColorSchemes::RenameAccept_Click(IInspectable const& /*sender*/, RoutedEventArgs const& /*e*/)
+    {
+        _RenameCurrentScheme(NameBox().Text());
+    }
 
-        NameBox().Text(schemeName);
-        dialog.ShowAsync(ContentDialogPlacement::Popup);
+    void ColorSchemes::RenameCancel_Click(IInspectable const& /*sender*/, RoutedEventArgs const& /*e*/)
+    {
+        IsRenaming(false);
+    }
+
+    void ColorSchemes::NameBox_PreviewKeyDown(IInspectable const& /*sender*/, winrt::Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e)
+    {
+        if (e.OriginalKey() == winrt::Windows::System::VirtualKey::Enter)
+        {
+            _RenameCurrentScheme(NameBox().Text());
+            e.Handled(true);
+        }
+        else if (e.OriginalKey() == winrt::Windows::System::VirtualKey::Escape)
+        {
+            IsRenaming(false);
+            e.Handled(true);
+        }
     }
 
-    void ColorSchemes::RenameConfirm_Click(IInspectable const& /*sender*/, ContentDialogButtonClickEventArgs const& /*e*/)
+    void ColorSchemes::_RenameCurrentScheme(hstring newName)
     {
-        CurrentColorScheme().Name(NameBox().Text());
+        CurrentColorScheme().Name(newName);
+        IsRenaming(false);
+
+        // The color scheme is renamed appropriately, but the ComboBox still shows the old name (until you open it)
+        // We need to manually force the ComboBox to refresh itself.
+        const auto selectedIndex{ ColorSchemeComboBox().SelectedIndex() };
+        ColorSchemeComboBox().SelectedIndex((selectedIndex + 1) % ColorSchemeList().Size());
+        ColorSchemeComboBox().SelectedIndex(selectedIndex);
     }
 
     // Function Description:

src/cascadia/TerminalSettingsEditor/ColorSchemes.h

@@ -27,23 +27,28 @@ 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);
+        void RenameAccept_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
+        void RenameCancel_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
+        void NameBox_PreviewKeyDown(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e);
 
         bool CanDeleteCurrentScheme() const;
+        void DeleteConfirmation_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
 
         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<Model::ColorScheme>, ColorSchemeList, nullptr);
 
         WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
         OBSERVABLE_GETSET_PROPERTY(winrt::Microsoft::Terminal::Settings::Model::ColorScheme, CurrentColorScheme, _PropertyChangedHandlers, nullptr);
+        OBSERVABLE_GETSET_PROPERTY(bool, IsRenaming, _PropertyChangedHandlers, nullptr);
 
     private:
         void _UpdateColorTable(const winrt::Microsoft::Terminal::Settings::Model::ColorScheme& colorScheme);
         void _UpdateColorSchemeList();
+        void _RenameCurrentScheme(hstring newName);
     };
 
     struct ColorTableEntry : ColorTableEntryT<ColorTableEntry>

src/cascadia/TerminalSettingsEditor/ColorSchemes.idl

@@ -14,6 +14,8 @@ namespace Microsoft.Terminal.Settings.Editor
         ColorSchemesPageNavigationState State { get; };
 
         Boolean CanDeleteCurrentScheme { get; };
+        Boolean IsRenaming { get; };
+
         Microsoft.Terminal.Settings.Model.ColorScheme CurrentColorScheme { get; };
         Windows.Foundation.Collections.IObservableVector<ColorTableEntry> CurrentColorTable;
         Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Model.ColorScheme> ColorSchemeList { get; };