diff --git a/src/cascadia/TerminalSettingsModel/ActionMap.cpp b/src/cascadia/TerminalSettingsModel/ActionMap.cpp index 561c81cc51..193708d3cd 100644 --- a/src/cascadia/TerminalSettingsModel/ActionMap.cpp +++ b/src/cascadia/TerminalSettingsModel/ActionMap.cpp @@ -5,11 +5,11 @@ #include "AllShortcutActions.h" #include "ActionMap.h" #include "Command.h" -#include "AllShortcutActions.h" #include #include #include "ActionMap.g.cpp" +#include "ActionArgFactory.g.cpp" using namespace winrt::Microsoft::Terminal::Settings::Model; using namespace winrt::Microsoft::Terminal::Control; @@ -61,6 +61,138 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation return hasher.finalize(); } + winrt::hstring ActionArgFactory::GetNameForAction(Model::ShortcutAction action) + { + // Use a magic static to initialize this map, because we won't be able + // to load the resources at _init_, only at runtime. + static auto actionNames = []() { + return std::unordered_map{ + { ShortcutAction::AdjustFontSize, RS_(L"AdjustFontSizeCommandKey") }, + { ShortcutAction::CloseOtherPanes, RS_(L"CloseOtherPanesCommandKey") }, + { ShortcutAction::CloseOtherTabs, RS_(L"CloseOtherTabs") }, + { ShortcutAction::ClosePane, RS_(L"ClosePaneCommandKey") }, + { ShortcutAction::CloseTab, RS_(L"CloseTab") }, + { ShortcutAction::CloseTabsAfter, RS_(L"CloseTabsAfter") }, + { ShortcutAction::CloseWindow, RS_(L"CloseWindowCommandKey") }, + { ShortcutAction::CopyText, RS_(L"CopyTextCommandKey") }, + { ShortcutAction::DuplicateTab, RS_(L"DuplicateTabCommandKey") }, + { ShortcutAction::ExecuteCommandline, RS_(L"ExecuteCommandlineCommandKey") }, + { ShortcutAction::Find, RS_(L"FindCommandKey") }, + { ShortcutAction::MoveFocus, RS_(L"MoveFocusCommandKey") }, + { ShortcutAction::MovePane, RS_(L"MovePaneCommandKey") }, + { ShortcutAction::SwapPane, RS_(L"SwapPaneCommandKey") }, + { ShortcutAction::NewTab, RS_(L"NewTabCommandKey") }, + { ShortcutAction::NextTab, RS_(L"NextTabCommandKey") }, + { ShortcutAction::OpenNewTabDropdown, RS_(L"OpenNewTabDropdownCommandKey") }, + { ShortcutAction::OpenSettings, RS_(L"OpenSettingsUICommandKey") }, + { ShortcutAction::OpenTabColorPicker, RS_(L"OpenTabColorPickerCommandKey") }, + { ShortcutAction::PasteText, RS_(L"PasteTextCommandKey") }, + { ShortcutAction::PrevTab, RS_(L"PrevTabCommandKey") }, + { ShortcutAction::RenameTab, RS_(L"ResetTabNameCommandKey") }, + { ShortcutAction::OpenTabRenamer, RS_(L"OpenTabRenamerCommandKey") }, + { ShortcutAction::ResetFontSize, RS_(L"ResetFontSizeCommandKey") }, + { ShortcutAction::ResizePane, RS_(L"ResizePaneCommandKey") }, + { ShortcutAction::ScrollDown, RS_(L"ScrollDownCommandKey") }, + { ShortcutAction::ScrollDownPage, RS_(L"ScrollDownPageCommandKey") }, + { ShortcutAction::ScrollUp, RS_(L"ScrollUpCommandKey") }, + { ShortcutAction::ScrollUpPage, RS_(L"ScrollUpPageCommandKey") }, + { ShortcutAction::ScrollToTop, RS_(L"ScrollToTopCommandKey") }, + { ShortcutAction::ScrollToBottom, RS_(L"ScrollToBottomCommandKey") }, + { ShortcutAction::ScrollToMark, RS_(L"ScrollToPreviousMarkCommandKey") }, + { ShortcutAction::AddMark, RS_(L"AddMarkCommandKey") }, + { ShortcutAction::ClearMark, RS_(L"ClearMarkCommandKey") }, + { ShortcutAction::ClearAllMarks, RS_(L"ClearAllMarksCommandKey") }, + { ShortcutAction::SendInput, RS_(L"SendInput") }, + { ShortcutAction::SetColorScheme, RS_(L"SetColorScheme") }, + { ShortcutAction::SetTabColor, RS_(L"ResetTabColorCommandKey") }, + { ShortcutAction::SplitPane, RS_(L"SplitPaneCommandKey") }, + { ShortcutAction::SwitchToTab, RS_(L"SwitchToTabCommandKey") }, + { ShortcutAction::TabSearch, RS_(L"TabSearchCommandKey") }, + { ShortcutAction::ToggleAlwaysOnTop, RS_(L"ToggleAlwaysOnTopCommandKey") }, + { ShortcutAction::ToggleCommandPalette, RS_(L"ToggleCommandPaletteCommandKey") }, + { ShortcutAction::Suggestions, RS_(L"Suggestions") }, + { ShortcutAction::ToggleFocusMode, RS_(L"ToggleFocusModeCommandKey") }, + { ShortcutAction::SetFocusMode, RS_(L"SetFocusMode") }, + { ShortcutAction::ToggleFullscreen, RS_(L"ToggleFullscreenCommandKey") }, + { ShortcutAction::SetFullScreen, RS_(L"SetFullScreen") }, + { ShortcutAction::SetMaximized, RS_(L"SetMaximized") }, + { ShortcutAction::TogglePaneZoom, RS_(L"TogglePaneZoomCommandKey") }, + { ShortcutAction::ToggleSplitOrientation, RS_(L"ToggleSplitOrientationCommandKey") }, + { ShortcutAction::ToggleShaderEffects, RS_(L"ToggleShaderEffectsCommandKey") }, + { ShortcutAction::MoveTab, RS_(L"MoveTab") }, + { ShortcutAction::BreakIntoDebugger, RS_(L"BreakIntoDebuggerCommandKey") }, + { ShortcutAction::FindMatch, RS_(L"FindMatch") }, + { ShortcutAction::TogglePaneReadOnly, RS_(L"TogglePaneReadOnlyCommandKey") }, + { ShortcutAction::EnablePaneReadOnly, RS_(L"EnablePaneReadOnlyCommandKey") }, + { ShortcutAction::DisablePaneReadOnly, RS_(L"DisablePaneReadOnlyCommandKey") }, + { ShortcutAction::NewWindow, RS_(L"NewWindowCommandKey") }, + { ShortcutAction::IdentifyWindow, RS_(L"IdentifyWindowCommandKey") }, + { ShortcutAction::IdentifyWindows, RS_(L"IdentifyWindowsCommandKey") }, + { ShortcutAction::RenameWindow, RS_(L"ResetWindowNameCommandKey") }, + { ShortcutAction::OpenWindowRenamer, RS_(L"OpenWindowRenamerCommandKey") }, + { ShortcutAction::DisplayWorkingDirectory, RS_(L"DisplayWorkingDirectoryCommandKey") }, + { ShortcutAction::GlobalSummon, RS_(L"GlobalSummonCommandKey") }, + { ShortcutAction::SearchForText, RS_(L"SearchForText") }, + { ShortcutAction::QuakeMode, RS_(L"QuakeModeCommandKey") }, + { ShortcutAction::FocusPane, RS_(L"FocusPane") }, + { ShortcutAction::OpenSystemMenu, RS_(L"OpenSystemMenuCommandKey") }, + { ShortcutAction::ExportBuffer, RS_(L"ExportBuffer") }, + { ShortcutAction::ClearBuffer, RS_(L"ClearBuffer") }, + { ShortcutAction::MultipleActions, RS_(L"MultipleActions") }, + { ShortcutAction::Quit, RS_(L"QuitCommandKey") }, + { ShortcutAction::AdjustOpacity, RS_(L"AdjustOpacity") }, + { ShortcutAction::RestoreLastClosed, RS_(L"RestoreLastClosedCommandKey") }, + { ShortcutAction::SelectCommand, RS_(L"SelectCommand") }, + { ShortcutAction::SelectOutput, RS_(L"SelectOutput") }, + { ShortcutAction::SelectAll, RS_(L"SelectAllCommandKey") }, + { ShortcutAction::MarkMode, RS_(L"MarkModeCommandKey") }, + { ShortcutAction::ToggleBlockSelection, RS_(L"ToggleBlockSelectionCommandKey") }, + { ShortcutAction::SwitchSelectionEndpoint, RS_(L"SwitchSelectionEndpointCommandKey") }, + { ShortcutAction::ColorSelection, RS_(L"ColorSelection") }, + { ShortcutAction::ShowContextMenu, RS_(L"ShowContextMenuCommandKey") }, + { ShortcutAction::ExpandSelectionToWord, RS_(L"ExpandSelectionToWordCommandKey") }, + { ShortcutAction::RestartConnection, RS_(L"RestartConnectionKey") }, + { ShortcutAction::ToggleBroadcastInput, RS_(L"ToggleBroadcastInputCommandKey") }, + { ShortcutAction::OpenScratchpad, RS_(L"OpenScratchpadKey") }, + { ShortcutAction::OpenAbout, RS_(L"OpenAboutCommandKey") }, + { ShortcutAction::QuickFix, RS_(L"QuickFixCommandKey") }, + { ShortcutAction::OpenCWD, RS_(L"OpenCWDCommandKey") }, + { ShortcutAction::SaveSnippet, RS_(L"SaveSnippetNamePrefix") }, + }; + }(); + + const auto found = actionNames.find(action); + return found != actionNames.end() ? found->second : winrt::hstring{}; + } + + winrt::Windows::Foundation::Collections::IMap ActionArgFactory::AvailableShortcutActionsAndNames() + { + std::unordered_map actionNames; +#define ON_ALL_ACTIONS(action) actionNames.emplace(ShortcutAction::action, GetNameForAction(ShortcutAction::action)); + + ALL_SHORTCUT_ACTIONS + +#undef ON_ALL_ACTIONS + return winrt::single_threaded_map(std::move(actionNames)); + } + + Model::IActionArgs ActionArgFactory::GetEmptyArgsForAction(Model::ShortcutAction shortcutAction) + { + switch (shortcutAction) + { +#define ON_ALL_ACTIONS_WITH_ARGS(name) \ + case Model::ShortcutAction::name: \ + return winrt::make(); + + ALL_SHORTCUT_ACTIONS_WITH_ARGS + +#undef ON_ALL_ACTIONS_WITH_ARGS + + default: + return nullptr; + } + } + // Method Description: // - Detects if any of the user's actions are identical to the inbox actions, // and if so, deletes them and redirects their keybindings to the inbox actions diff --git a/src/cascadia/TerminalSettingsModel/ActionMap.h b/src/cascadia/TerminalSettingsModel/ActionMap.h index 05974c757d..ecb717cc37 100644 --- a/src/cascadia/TerminalSettingsModel/ActionMap.h +++ b/src/cascadia/TerminalSettingsModel/ActionMap.h @@ -16,6 +16,7 @@ Author(s): #pragma once #include "ActionMap.g.h" +#include "ActionArgFactory.g.h" #include "IInheritable.h" #include "Command.h" @@ -47,6 +48,15 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation } }; + struct ActionArgFactory + { + ActionArgFactory() = default; + + static winrt::hstring GetNameForAction(ShortcutAction action); + static Windows::Foundation::Collections::IMap AvailableShortcutActionsAndNames(); + static Model::IActionArgs GetEmptyArgsForAction(Model::ShortcutAction shortcutAction); + }; + struct ActionMap : ActionMapT, IInheritable { void _FinalizeInheritance() override; @@ -155,3 +165,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation friend class SettingsModelUnitTests::TerminalSettingsTests; }; } + +namespace winrt::Microsoft::Terminal::Settings::Model::factory_implementation +{ + BASIC_FACTORY(ActionArgFactory); +} diff --git a/src/cascadia/TerminalSettingsModel/ActionMap.idl b/src/cascadia/TerminalSettingsModel/ActionMap.idl index ee81af5cc0..d4bf2b284e 100644 --- a/src/cascadia/TerminalSettingsModel/ActionMap.idl +++ b/src/cascadia/TerminalSettingsModel/ActionMap.idl @@ -5,6 +5,13 @@ import "Command.idl"; namespace Microsoft.Terminal.Settings.Model { + static runtimeclass ActionArgFactory + { + static String GetNameForAction(Microsoft.Terminal.Settings.Model.ShortcutAction action); + static Windows.Foundation.Collections.IMap AvailableShortcutActionsAndNames { get; }; + static IActionArgs GetEmptyArgsForAction(Microsoft.Terminal.Settings.Model.ShortcutAction shortcutAction); + } + // This interface ensures that no changes are made to ActionMap interface IActionMapView { diff --git a/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp b/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp index 2fa3861d86..3135f6538e 100644 --- a/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp +++ b/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp @@ -4,7 +4,6 @@ #include "pch.h" #include "CascadiaSettings.h" #include "CascadiaSettings.g.cpp" -#include "ActionArgFactory.g.cpp" #include "MatchProfilesEntry.h" #include "DefaultTerminal.h" @@ -57,137 +56,6 @@ std::string_view Model::implementation::LoadStringResource(int resourceID) return { reinterpret_cast(ptr), sz }; } -winrt::hstring ActionArgFactory::GetNameForAction(Model::ShortcutAction action) -{ - // Use a magic static to initialize this map, because we won't be able - // to load the resources at _init_, only at runtime. - static auto actionNames = []() { - return std::unordered_map{ - { ShortcutAction::AdjustFontSize, RS_(L"AdjustFontSizeCommandKey") }, - { ShortcutAction::CloseOtherPanes, RS_(L"CloseOtherPanesCommandKey") }, - { ShortcutAction::CloseOtherTabs, RS_(L"CloseOtherTabs") }, - { ShortcutAction::ClosePane, RS_(L"ClosePaneCommandKey") }, - { ShortcutAction::CloseTab, RS_(L"CloseTab") }, - { ShortcutAction::CloseTabsAfter, RS_(L"CloseTabsAfter") }, - { ShortcutAction::CloseWindow, RS_(L"CloseWindowCommandKey") }, - { ShortcutAction::CopyText, RS_(L"CopyTextCommandKey") }, - { ShortcutAction::DuplicateTab, RS_(L"DuplicateTabCommandKey") }, - { ShortcutAction::ExecuteCommandline, RS_(L"ExecuteCommandlineCommandKey") }, - { ShortcutAction::Find, RS_(L"FindCommandKey") }, - { ShortcutAction::MoveFocus, RS_(L"MoveFocusCommandKey") }, - { ShortcutAction::MovePane, RS_(L"MovePaneCommandKey") }, - { ShortcutAction::SwapPane, RS_(L"SwapPaneCommandKey") }, - { ShortcutAction::NewTab, RS_(L"NewTabCommandKey") }, - { ShortcutAction::NextTab, RS_(L"NextTabCommandKey") }, - { ShortcutAction::OpenNewTabDropdown, RS_(L"OpenNewTabDropdownCommandKey") }, - { ShortcutAction::OpenSettings, RS_(L"OpenSettingsUICommandKey") }, - { ShortcutAction::OpenTabColorPicker, RS_(L"OpenTabColorPickerCommandKey") }, - { ShortcutAction::PasteText, RS_(L"PasteTextCommandKey") }, - { ShortcutAction::PrevTab, RS_(L"PrevTabCommandKey") }, - { ShortcutAction::RenameTab, RS_(L"ResetTabNameCommandKey") }, - { ShortcutAction::OpenTabRenamer, RS_(L"OpenTabRenamerCommandKey") }, - { ShortcutAction::ResetFontSize, RS_(L"ResetFontSizeCommandKey") }, - { ShortcutAction::ResizePane, RS_(L"ResizePaneCommandKey") }, - { ShortcutAction::ScrollDown, RS_(L"ScrollDownCommandKey") }, - { ShortcutAction::ScrollDownPage, RS_(L"ScrollDownPageCommandKey") }, - { ShortcutAction::ScrollUp, RS_(L"ScrollUpCommandKey") }, - { ShortcutAction::ScrollUpPage, RS_(L"ScrollUpPageCommandKey") }, - { ShortcutAction::ScrollToTop, RS_(L"ScrollToTopCommandKey") }, - { ShortcutAction::ScrollToBottom, RS_(L"ScrollToBottomCommandKey") }, - { ShortcutAction::ScrollToMark, RS_(L"ScrollToPreviousMarkCommandKey") }, - { ShortcutAction::AddMark, RS_(L"AddMarkCommandKey") }, - { ShortcutAction::ClearMark, RS_(L"ClearMarkCommandKey") }, - { ShortcutAction::ClearAllMarks, RS_(L"ClearAllMarksCommandKey") }, - { ShortcutAction::SendInput, RS_(L"SendInput") }, - { ShortcutAction::SetColorScheme, RS_(L"SetColorScheme") }, - { ShortcutAction::SetTabColor, RS_(L"ResetTabColorCommandKey") }, - { ShortcutAction::SplitPane, RS_(L"SplitPaneCommandKey") }, - { ShortcutAction::SwitchToTab, RS_(L"SwitchToTabCommandKey") }, - { ShortcutAction::TabSearch, RS_(L"TabSearchCommandKey") }, - { ShortcutAction::ToggleAlwaysOnTop, RS_(L"ToggleAlwaysOnTopCommandKey") }, - { ShortcutAction::ToggleCommandPalette, RS_(L"ToggleCommandPaletteCommandKey") }, - { ShortcutAction::Suggestions, RS_(L"Suggestions") }, - { ShortcutAction::ToggleFocusMode, RS_(L"ToggleFocusModeCommandKey") }, - { ShortcutAction::SetFocusMode, RS_(L"SetFocusMode") }, - { ShortcutAction::ToggleFullscreen, RS_(L"ToggleFullscreenCommandKey") }, - { ShortcutAction::SetFullScreen, RS_(L"SetFullScreen") }, - { ShortcutAction::SetMaximized, RS_(L"SetMaximized") }, - { ShortcutAction::TogglePaneZoom, RS_(L"TogglePaneZoomCommandKey") }, - { ShortcutAction::ToggleSplitOrientation, RS_(L"ToggleSplitOrientationCommandKey") }, - { ShortcutAction::ToggleShaderEffects, RS_(L"ToggleShaderEffectsCommandKey") }, - { ShortcutAction::MoveTab, RS_(L"MoveTab") }, - { ShortcutAction::BreakIntoDebugger, RS_(L"BreakIntoDebuggerCommandKey") }, - { ShortcutAction::FindMatch, RS_(L"FindMatch") }, - { ShortcutAction::TogglePaneReadOnly, RS_(L"TogglePaneReadOnlyCommandKey") }, - { ShortcutAction::EnablePaneReadOnly, RS_(L"EnablePaneReadOnlyCommandKey") }, - { ShortcutAction::DisablePaneReadOnly, RS_(L"DisablePaneReadOnlyCommandKey") }, - { ShortcutAction::NewWindow, RS_(L"NewWindowCommandKey") }, - { ShortcutAction::IdentifyWindow, RS_(L"IdentifyWindowCommandKey") }, - { ShortcutAction::IdentifyWindows, RS_(L"IdentifyWindowsCommandKey") }, - { ShortcutAction::RenameWindow, RS_(L"ResetWindowNameCommandKey") }, - { ShortcutAction::OpenWindowRenamer, RS_(L"OpenWindowRenamerCommandKey") }, - { ShortcutAction::DisplayWorkingDirectory, RS_(L"DisplayWorkingDirectoryCommandKey") }, - { ShortcutAction::GlobalSummon, RS_(L"GlobalSummonCommandKey") }, - { ShortcutAction::SearchForText, RS_(L"SearchForText") }, - { ShortcutAction::QuakeMode, RS_(L"QuakeModeCommandKey") }, - { ShortcutAction::FocusPane, RS_(L"FocusPane") }, - { ShortcutAction::OpenSystemMenu, RS_(L"OpenSystemMenuCommandKey") }, - { ShortcutAction::ExportBuffer, RS_(L"ExportBuffer") }, - { ShortcutAction::ClearBuffer, RS_(L"ClearBuffer") }, - { ShortcutAction::MultipleActions, RS_(L"MultipleActions") }, - { ShortcutAction::Quit, RS_(L"QuitCommandKey") }, - { ShortcutAction::AdjustOpacity, RS_(L"AdjustOpacity") }, - { ShortcutAction::RestoreLastClosed, RS_(L"RestoreLastClosedCommandKey") }, - { ShortcutAction::SelectCommand, RS_(L"SelectCommand") }, - { ShortcutAction::SelectOutput, RS_(L"SelectOutput") }, - { ShortcutAction::SelectAll, RS_(L"SelectAllCommandKey") }, - { ShortcutAction::MarkMode, RS_(L"MarkModeCommandKey") }, - { ShortcutAction::ToggleBlockSelection, RS_(L"ToggleBlockSelectionCommandKey") }, - { ShortcutAction::SwitchSelectionEndpoint, RS_(L"SwitchSelectionEndpointCommandKey") }, - { ShortcutAction::ColorSelection, RS_(L"ColorSelection") }, - { ShortcutAction::ShowContextMenu, RS_(L"ShowContextMenuCommandKey") }, - { ShortcutAction::ExpandSelectionToWord, RS_(L"ExpandSelectionToWordCommandKey") }, - { ShortcutAction::RestartConnection, RS_(L"RestartConnectionKey") }, - { ShortcutAction::ToggleBroadcastInput, RS_(L"ToggleBroadcastInputCommandKey") }, - { ShortcutAction::OpenScratchpad, RS_(L"OpenScratchpadKey") }, - { ShortcutAction::OpenAbout, RS_(L"OpenAboutCommandKey") }, - { ShortcutAction::QuickFix, RS_(L"QuickFixCommandKey") }, - { ShortcutAction::OpenCWD, RS_(L"OpenCWDCommandKey") }, - }; - }(); - - const auto found = actionNames.find(action); - return found != actionNames.end() ? found->second : winrt::hstring{}; -} - -winrt::Windows::Foundation::Collections::IMap ActionArgFactory::AvailableShortcutActionsAndNames() -{ - std::unordered_map actionNames; -#define ON_ALL_ACTIONS(action) actionNames.emplace(ShortcutAction::action, GetNameForAction(ShortcutAction::action)); - - ALL_SHORTCUT_ACTIONS - -#undef ON_ALL_ACTIONS - return winrt::single_threaded_map(std::move(actionNames)); -} - -Model::IActionArgs ActionArgFactory::GetEmptyArgsForAction(Model::ShortcutAction shortcutAction) -{ - switch (shortcutAction) - { -#define ON_ALL_ACTIONS_WITH_ARGS(name) \ - case Model::ShortcutAction::name: \ - return winrt::make(); - - ALL_SHORTCUT_ACTIONS_WITH_ARGS - -#undef ON_ALL_ACTIONS_WITH_ARGS - - default: - return nullptr; - } -} - winrt::hstring CascadiaSettings::Hash() const noexcept { return _hash; diff --git a/src/cascadia/TerminalSettingsModel/CascadiaSettings.h b/src/cascadia/TerminalSettingsModel/CascadiaSettings.h index a73e67d00f..a4fd16bd43 100644 --- a/src/cascadia/TerminalSettingsModel/CascadiaSettings.h +++ b/src/cascadia/TerminalSettingsModel/CascadiaSettings.h @@ -18,7 +18,6 @@ Author(s): #pragma once #include "CascadiaSettings.g.h" -#include "ActionArgFactory.g.h" #include "FragmentSettings.g.h" #include "FragmentProfileEntry.g.h" #include "FragmentColorSchemeEntry.g.h" @@ -140,15 +139,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation size_t _userProfileCount = 0; }; - struct ActionArgFactory - { - ActionArgFactory() = default; - - static winrt::hstring GetNameForAction(ShortcutAction action); - static Windows::Foundation::Collections::IMap AvailableShortcutActionsAndNames(); - static Model::IActionArgs GetEmptyArgsForAction(Model::ShortcutAction shortcutAction); - }; - struct CascadiaSettings : CascadiaSettingsT { public: @@ -319,5 +309,4 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation namespace winrt::Microsoft::Terminal::Settings::Model::factory_implementation { BASIC_FACTORY(CascadiaSettings); - BASIC_FACTORY(ActionArgFactory); } diff --git a/src/cascadia/TerminalSettingsModel/CascadiaSettings.idl b/src/cascadia/TerminalSettingsModel/CascadiaSettings.idl index 7b977e7b05..cb4c429d4f 100644 --- a/src/cascadia/TerminalSettingsModel/CascadiaSettings.idl +++ b/src/cascadia/TerminalSettingsModel/CascadiaSettings.idl @@ -15,13 +15,6 @@ namespace Microsoft.Terminal.Settings.Model Machine }; - static runtimeclass ActionArgFactory - { - static String GetNameForAction(Microsoft.Terminal.Settings.Model.ShortcutAction action); - static Windows.Foundation.Collections.IMap AvailableShortcutActionsAndNames { get; }; - static IActionArgs GetEmptyArgsForAction(Microsoft.Terminal.Settings.Model.ShortcutAction shortcutAction); - } - [default_interface] runtimeclass CascadiaSettings { static CascadiaSettings LoadDefaults(); static CascadiaSettings LoadAll();