Create a new page for "Add new profile" in the SUI

src/cascadia/TerminalSettingsEditor/AddProfile.cpp

@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "AddProfile.h"
+#include "AddProfile.g.cpp"
+#include "AddProfilePageNavigationState.g.cpp"
+#include "EnumEntry.h"
+
+using namespace winrt::Windows::Foundation;
+using namespace winrt::Windows::System;
+using namespace winrt::Windows::UI::Core;
+using namespace winrt::Windows::UI::Xaml::Navigation;
+using namespace winrt::Microsoft::Terminal::Settings::Model;
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    AddProfile::AddProfile()
+    {
+        InitializeComponent();
+    }
+
+    void AddProfile::OnNavigatedTo(const NavigationEventArgs& e)
+    {
+        _State = e.Parameter().as<Editor::AddProfilePageNavigationState>();
+    }
+
+    void AddProfile::_AddNewClick(const IInspectable& /*sender*/,
+                                  const Windows::UI::Xaml::RoutedEventArgs& /*eventArgs*/)
+    {
+        _State.RequestAddNew();
+    }
+
+    void AddProfile::_DuplicateClick(const IInspectable& /*sender*/,
+                                     const Windows::UI::Xaml::RoutedEventArgs& /*eventArgs*/)
+    {
+        if (const auto selected = Profiles().SelectedItem())
+        {
+            _State.RequestDuplicate(selected.try_as<Model::Profile>().Guid());
+        }
+    }
+}

src/cascadia/TerminalSettingsEditor/AddProfile.h

@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#pragma once
+
+#include "AddProfile.g.h"
+#include "AddProfilePageNavigationState.g.h"
+#include "Utils.h"
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    struct AddProfilePageNavigationState : AddProfilePageNavigationStateT<AddProfilePageNavigationState>
+    {
+    public:
+        AddProfilePageNavigationState(const Model::CascadiaSettings& settings) :
+            _Settings{ settings } {}
+
+        void RequestAddNew()
+        {
+            _AddNewHandlers(nullptr, nullptr);
+        }
+
+        void RequestDuplicate(GUID profile)
+        {
+            _AddNewHandlers(nullptr, winrt::box_value(profile));
+        }
+
+        GETSET_PROPERTY(Model::CascadiaSettings, Settings, nullptr)
+        TYPED_EVENT(AddNew, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable);
+    };
+
+    struct AddProfile : AddProfileT<AddProfile>
+    {
+    public:
+        AddProfile();
+
+        void OnNavigatedTo(const winrt::Windows::UI::Xaml::Navigation::NavigationEventArgs& e);
+
+        GETSET_PROPERTY(Editor::AddProfilePageNavigationState, State, nullptr);
+
+    private:
+        friend struct AddProfileT<AddProfile>; // for Xaml to bind events
+
+        void _AddNewClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
+        void _DuplicateClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
+    };
+}
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
+{
+    BASIC_FACTORY(AddProfile);
+}

src/cascadia/TerminalSettingsEditor/AddProfile.idl

@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import "EnumEntry.idl";
+
+namespace Microsoft.Terminal.Settings.Editor
+{
+    runtimeclass AddProfilePageNavigationState
+    {
+        Microsoft.Terminal.Settings.Model.CascadiaSettings Settings;
+        void RequestAddNew();
+        void RequestDuplicate(Guid profile);
+        event Windows.Foundation.TypedEventHandler<Object, Object> AddNew;
+    };
+
+    [default_interface] runtimeclass AddProfile : Windows.UI.Xaml.Controls.Page
+    {
+        AddProfile();
+        AddProfilePageNavigationState State { get; };
+    }
+}

src/cascadia/TerminalSettingsEditor/AddProfile.xaml

@@ -0,0 +1,87 @@
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
+the MIT License. See LICENSE in the project root for license information. -->
+<Page
+    x:Class="Microsoft.Terminal.Settings.Editor.AddProfile"
+    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:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    xmlns:SettingsModel="using:Microsoft.Terminal.Settings.Model"
+    mc:Ignorable="d">
+
+    <Page.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="CommonResources.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+
+            <DataTemplate x:DataType="local:EnumEntry" x:Key="EnumRadioButtonTemplate">
+                <RadioButton Content="{x:Bind EnumName, Mode=OneWay}"/>
+            </DataTemplate>
+            <SettingsModel:IconPathConverter x:Key="IconSourceConverter"/>
+        </ResourceDictionary>
+    </Page.Resources>
+
+    <ScrollViewer>
+        <StackPanel Style="{StaticResource SettingsStackStyle}">
+            <Button x:Name="AddNewButton"
+                    Click="_AddNewClick"
+                    Style="{StaticResource AccentButtonStyle}">
+                <Button.Content>
+                    <StackPanel Orientation="Horizontal">
+                        <FontIcon Glyph="&#xE710;"
+                                    FontSize="{StaticResource StandardIconSize}"/>
+                        <TextBlock x:Uid="AddProfile_AddNewButton"
+                                    Margin="10,0,0,0"/>
+                    </StackPanel>
+                </Button.Content>
+            </Button>
+            <StackPanel Margin="{StaticResource StandardControlMargin}">
+                <local:SettingContainer x:Uid="AddProfile_Duplicate">
+                    <muxc:RadioButtons ItemsSource="{x:Bind State.Settings.AllProfiles, Mode=OneWay}"
+                                       x:Name="Profiles">
+                        <muxc:RadioButtons.ItemTemplate>
+                            <DataTemplate x:DataType="SettingsModel:Profile">
+                                <Grid HorizontalAlignment="Stretch" ColumnSpacing="8">
+
+                                    <Grid.ColumnDefinitions>
+                                        <!-- icon -->
+                                        <ColumnDefinition Width="16"/>
+                                        <!-- profile name -->
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+
+                                    <IconSourceElement
+                                    Grid.Column="0"
+                                    Width="16"
+                                    Height="16"
+                                    IconSource="{x:Bind Icon,
+                                                        Mode=OneWay,
+                                                        Converter={StaticResource IconSourceConverter}}"/>
+
+                                    <TextBlock Grid.Column="1"
+                                           Text="{x:Bind Name}"/>
+
+                                </Grid>
+                            </DataTemplate>
+                        </muxc:RadioButtons.ItemTemplate>
+                    </muxc:RadioButtons>
+                </local:SettingContainer>
+                <Button x:Name="DuplicateButton"
+                        Click="_DuplicateClick"
+                        Style="{StaticResource AccentButtonStyle}">
+                        <Button.Content>
+                            <StackPanel Orientation="Horizontal">
+                                <FontIcon Glyph="&#xE710;"
+                                          FontSize="{StaticResource StandardIconSize}"/>
+                                <TextBlock x:Uid="AddProfile_DuplicateButton"
+                                           Margin="10,0,0,0"/>
+                            </StackPanel>
+                        </Button.Content>
+                </Button>
+            </StackPanel>
+        </StackPanel>
+    </ScrollViewer>
+</Page>

src/cascadia/TerminalSettingsEditor/MainPage.cpp

@@ -11,6 +11,7 @@
 #include "Profiles.h"
 #include "GlobalAppearance.h"
 #include "ColorSchemes.h"
+#include "AddProfile.h"
 #include "..\types\inc\utils.hpp"
 
 #include <LibraryResources.h>
@@ -123,8 +124,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         // refresh the current page using the SelectedItem data we collected before the refresh
         if (selectedItemTag)
         {
-            const auto& selectedItemStringTag{ selectedItemTag.try_as<hstring>() };
-            const auto& selectedItemProfileTag{ selectedItemTag.try_as<ProfileViewModel>() };
             for (const auto& item : menuItems)
             {
                 if (const auto& menuItem{ item.try_as<MUX::Controls::NavigationViewItem>() })
@@ -133,22 +132,28 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                     {
                         if (const auto& stringTag{ tag.try_as<hstring>() })
                         {
-                            if (stringTag == selectedItemStringTag)
+                            if (const auto& selectedItemStringTag{ selectedItemTag.try_as<hstring>() })
                             {
-                                // found the one that was selected before the refresh
-                                SettingsNav().SelectedItem(item);
-                                _Navigate(*stringTag);
-                                co_return;
+                                if (stringTag == selectedItemStringTag)
+                                {
+                                    // found the one that was selected before the refresh
+                                    SettingsNav().SelectedItem(item);
+                                    _Navigate(*stringTag);
+                                    co_return;
+                                }
                             }
                         }
                         else if (const auto& profileTag{ tag.try_as<ProfileViewModel>() })
                         {
-                            if (profileTag->Guid() == selectedItemProfileTag->Guid())
+                            if (const auto& selectedItemProfileTag{ selectedItemTag.try_as<ProfileViewModel>() })
                             {
-                                // found the one that was selected before the refresh
-                                SettingsNav().SelectedItem(item);
-                                _Navigate(*profileTag);
-                                co_return;
+                                if (profileTag->Guid() == selectedItemProfileTag->Guid())
+                                {
+                                    // found the one that was selected before the refresh
+                                    SettingsNav().SelectedItem(item);
+                                    _Navigate(*profileTag);
+                                    co_return;
+                                }
                             }
                         }
                     }
@@ -223,18 +228,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
             if (const auto navString = clickedItemContainer.Tag().try_as<hstring>())
             {
-                if (navString == addProfileTag)
-                {
-                    // "AddProfile" needs to create a new profile before we can navigate to it
-                    uint32_t insertIndex;
-                    SettingsNav().MenuItems().IndexOf(clickedItemContainer, insertIndex);
-                    _CreateAndNavigateToNewProfile(insertIndex);
-                }
-                else
-                {
-                    // Otherwise, navigate to the page
-                    _Navigate(*navString);
-                }
+                _Navigate(*navString);
             }
             else if (const auto profile = clickedItemContainer.Tag().try_as<Editor::ProfileViewModel>())
             {
@@ -288,6 +282,30 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         {
             contentFrame().Navigate(xaml_typename<Editor::GlobalAppearance>(), winrt::make<GlobalAppearancePageNavigationState>(_settingsClone.GlobalSettings()));
         }
+        else if (clickedItemTag == addProfileTag)
+        {
+            auto addProfileState{ winrt::make<AddProfilePageNavigationState>(_settingsClone) };
+            addProfileState.AddNew([weakThis = get_weak()](auto&&, auto&& profileGuid) {
+                if (auto self{ weakThis.get() })
+                {
+                    uint32_t insertIndex;
+                    auto selectedItem{ self->SettingsNav().SelectedItem() };
+                    auto menuItems{ self->SettingsNav().MenuItems() };
+                    menuItems.IndexOf(selectedItem, insertIndex);
+                    if (profileGuid)
+                    {
+                        const auto profile = self->_settingsClone.FindProfile(winrt::unbox_value<GUID>(profileGuid));
+                        const auto duplicated = self->_settingsClone.DuplicateProfile(profile);
+                        self->_CreateAndNavigateToNewProfile(insertIndex, duplicated);
+                    }
+                    else
+                    {
+                        self->_CreateAndNavigateToNewProfile(insertIndex, nullptr);
+                    }
+                }
+            });
+            contentFrame().Navigate(xaml_typename<Editor::AddProfile>(), addProfileState);
+        }
     }
 
     // Method Description:
@@ -355,7 +373,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         MUX::Controls::NavigationViewItem addProfileItem;
         addProfileItem.Content(box_value(RS_(L"Nav_AddNewProfile/Content")));
         addProfileItem.Tag(box_value(addProfileTag));
-        addProfileItem.SelectsOnInvoked(false);
 
         FontIcon icon;
         // This is the "Add" symbol
@@ -365,9 +382,17 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         SettingsNav().MenuItems().Append(addProfileItem);
     }
 
-    void MainPage::_CreateAndNavigateToNewProfile(const uint32_t index)
+    void MainPage::_CreateAndNavigateToNewProfile(const uint32_t index, const Model::Profile profile)
     {
-        const auto newProfile{ _settingsClone.CreateNewProfile() };
+        Model::Profile newProfile;
+        if (profile)
+        {
+            newProfile = profile;
+        }
+        else
+        {
+            newProfile = _settingsClone.CreateNewProfile();
+        }
         const auto profileViewModel{ _viewModelForProfile(newProfile) };
         const auto navItem{ _CreateProfileNavViewItem(profileViewModel) };
         SettingsNav().MenuItems().InsertAt(index, navItem);

src/cascadia/TerminalSettingsEditor/MainPage.h

@@ -34,7 +34,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         std::optional<HWND> _hostingHwnd;
 
         void _InitializeProfilesList();
-        void _CreateAndNavigateToNewProfile(const uint32_t index);
+        void _CreateAndNavigateToNewProfile(const uint32_t index, const Model::Profile profile);
         winrt::Microsoft::UI::Xaml::Controls::NavigationViewItem _CreateProfileNavViewItem(const Editor::ProfileViewModel& profile);
         void _DeleteProfile(const Windows::Foundation::IInspectable sender, const Editor::DeleteProfileEventArgs& args);
 

src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj

@@ -38,6 +38,9 @@
     <ClInclude Include="Actions.h">
       <DependentUpon>Actions.xaml</DependentUpon>
     </ClInclude>
+    <ClInclude Include="AddProfile.h">
+      <DependentUpon>AddProfile.xaml</DependentUpon>
+    </ClInclude>
     <ClInclude Include="ColorToBrushConverter.h">
       <DependentUpon>Converters.idl</DependentUpon>
     </ClInclude>
@@ -105,6 +108,9 @@
     <Page Include="Actions.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="AddProfile.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="CommonResources.xaml">
       <SubType>Designer</SubType>
     </Page>
@@ -138,6 +144,9 @@
     <ClCompile Include="Actions.cpp">
       <DependentUpon>Actions.xaml</DependentUpon>
     </ClCompile>
+    <ClCompile Include="AddProfile.cpp">
+      <DependentUpon>AddProfile.xaml</DependentUpon>
+    </ClCompile>
     <ClCompile Include="ColorToBrushConverter.cpp">
       <DependentUpon>Converters.idl</DependentUpon>
     </ClCompile>
@@ -206,6 +215,10 @@
       <DependentUpon>Actions.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
+    <Midl Include="AddProfile.idl">
+      <DependentUpon>AddProfile.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Midl>
     <Midl Include="Converters.idl" />
     <Midl Include="EnumEntry.idl" />
     <Midl Include="GlobalAppearance.idl">