Polish OpenSettings action for Settings UI and Profile page navigation on refresh

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -602,7 +602,9 @@ namespace winrt::TerminalApp::implementation
                 settingsItem.Click({ this, &TerminalPage::_SettingsButtonOnClick });
                 newTabFlyout.Items().Append(settingsItem);
 
-                auto settingsKeyChord = keyBindings.GetKeyBindingForAction(ShortcutAction::OpenSettings);
+                Microsoft::Terminal::Settings::Model::OpenSettingsArgs args{ SettingsTarget::SettingsFile };
+                Microsoft::Terminal::Settings::Model::ActionAndArgs settingsAction{ ShortcutAction::OpenSettings, args };
+                const auto settingsKeyChord{ keyBindings.GetKeyBindingForActionWithArgs(settingsAction) };
                 if (settingsKeyChord)
                 {
                     _SetAcceleratorForMenuItem(settingsItem, settingsKeyChord);

src/cascadia/TerminalSettingsEditor/MainPage.cpp

@@ -76,7 +76,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             {
                 if (const auto tag{ navViewItem.Tag() })
                 {
-                    if (tag.try_as<Model::Profile>())
+                    if (tag.try_as<Editor::ProfileViewModel>())
                     {
                         // hide NavViewItem pointing to a Profile
                         navViewItem.Visibility(Visibility::Collapsed);
@@ -104,13 +104,13 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         {
             if (const auto tag{ selectedItem.as<MUX::Controls::NavigationViewItem>().Tag() })
             {
-                if (const auto profile{ tag.try_as<Model::Profile>() })
+                if (const auto oldProfile{ tag.try_as<Editor::ProfileViewModel>() })
                 {
                     // check if the profile still exists
-                    if (_settingsClone.FindProfile(profile.Guid()))
+                    if (const auto profile{ _settingsClone.FindProfile(oldProfile.Guid()) })
                     {
                         // Navigate to the page with the given profile
-                        contentFrame().Navigate(xaml_typename<Editor::Profiles>(), winrt::make<ProfilePageNavigationState>(_viewModelForProfile(profile), _settingsClone.GlobalSettings().ColorSchemes(), *this));
+                        _Navigate(_viewModelForProfile(profile));
                         return;
                     }
                 }
@@ -126,7 +126,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         // could not find the page we were on, fallback to first menu item
         const auto firstItem{ navigationMenu.MenuItems().GetAt(0) };
         navigationMenu.SelectedItem(firstItem);
-        if (const auto tag{ navigationMenu.SelectedItem().as<NavigationViewItem>().Tag() })
+        if (const auto tag{ navigationMenu.SelectedItem().as<MUX::Controls::NavigationViewItem>().Tag() })
         {
             _Navigate(unbox_value<hstring>(tag));
         }

src/cascadia/TerminalSettingsModel/ActionArgs.cpp

@@ -292,6 +292,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             return RS_(L"OpenDefaultSettingsCommandKey");
         case SettingsTarget::AllFiles:
             return RS_(L"OpenBothSettingsFilesCommandKey");
+        case SettingsTarget::SettingsUI:
+            return RS_(L"OpenSettingsUICommandKey");
         default:
             return RS_(L"OpenSettingsCommandKey");
         }

src/cascadia/TerminalSettingsModel/ActionArgs.h

@@ -441,6 +441,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     struct OpenSettingsArgs : public OpenSettingsArgsT<OpenSettingsArgs>
     {
         OpenSettingsArgs() = default;
+        OpenSettingsArgs(const SettingsTarget& target) :
+            _Target{ target } {}
         GETSET_PROPERTY(SettingsTarget, Target, SettingsTarget::SettingsFile);
 
         static constexpr std::string_view TargetKey{ "target" };
@@ -850,4 +852,5 @@ namespace winrt::Microsoft::Terminal::Settings::Model::factory_implementation
     BASIC_FACTORY(CloseOtherTabsArgs);
     BASIC_FACTORY(CloseTabsAfterArgs);
     BASIC_FACTORY(MoveTabArgs);
+    BASIC_FACTORY(OpenSettingsArgs);
 }

src/cascadia/TerminalSettingsModel/ActionArgs.idl

@@ -147,6 +147,7 @@ namespace Microsoft.Terminal.Settings.Model
 
     [default_interface] runtimeclass OpenSettingsArgs : IActionArgs
     {
+        OpenSettingsArgs(SettingsTarget target);
         SettingsTarget Target { get; };
     };
 

src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw

@@ -363,4 +363,7 @@
   <data name="BreakIntoDebuggerCommandKey" xml:space="preserve">
     <value>Break into the debugger</value>
   </data>
+  <data name="OpenSettingsUICommandKey" xml:space="preserve">
+    <value>Open Settings...</value>
+  </data>
 </root>