From 8daf89e318e0deac961b2727b959e9237e1ef53b Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Mon, 18 Sep 2023 11:55:05 -0500 Subject: [PATCH] Add an `openAbout` action. (#15990) Just as it says on the label. Closes #15986 --- doc/cascadia/profiles.schema.json | 47 ++++++++++--------- .../TerminalApp/AppActionHandlers.cpp | 6 +++ .../TerminalSettingsModel/ActionAndArgs.cpp | 2 + .../AllShortcutActions.h | 3 +- .../Resources/en-US/Resources.resw | 6 ++- .../TerminalSettingsModel/defaults.json | 3 +- 6 files changed, 41 insertions(+), 26 deletions(-) diff --git a/doc/cascadia/profiles.schema.json b/doc/cascadia/profiles.schema.json index d43a9e4e7d8..74450b6704c 100644 --- a/doc/cascadia/profiles.schema.json +++ b/doc/cascadia/profiles.schema.json @@ -378,8 +378,12 @@ }, "ShortcutActionName": { "enum": [ + "addMark", "adjustFontSize", + "adjustOpacity", + "clearAllMarks", "clearBuffer", + "clearMark", "closeOtherPanes", "closeOtherTabs", "closePane", @@ -390,6 +394,7 @@ "copy", "duplicateTab", "expandSelectionToWord", + "experimental.colorSelection", "exportBuffer", "find", "findMatch", @@ -397,64 +402,60 @@ "globalSummon", "identifyWindow", "identifyWindows", + "markMode", "moveFocus", "movePane", - "swapPane", - "markMode", "moveTab", "multipleActions", "newTab", "newWindow", "nextTab", + "openAbout", "openNewTabDropdown", "openSettings", + "openSystemMenu", "openTabColorPicker", + "openTabRenamer", "openWindowRenamer", "paste", "prevTab", - "renameTab", - "openSystemMenu", - "openTabRenamer", "quakeMode", + "quit", + "renameTab", + "renameWindow", "resetFontSize", "resizePane", - "renameWindow", + "restoreLastClosed", "scrollDown", "scrollDownPage", - "scrollUp", - "scrollUpPage", "scrollToBottom", + "scrollToMark", "scrollToTop", + "scrollUp", + "scrollUpPage", + "searchWeb", + "selectAll", "sendInput", "setColorScheme", + "setFocusMode", + "setFullScreen", + "setMaximized", "setTabColor", "showSuggestions", "splitPane", + "swapPane", + "switchSelectionEndpoint", "switchToTab", "tabSearch", "toggleAlwaysOnTop", "toggleBlockSelection", "toggleFocusMode", - "selectAll", - "setFocusMode", - "switchSelectionEndpoint", "toggleFullscreen", - "setFullScreen", - "setMaximized", "togglePaneZoom", - "toggleSplitOrientation", "toggleReadOnlyMode", "toggleShaderEffects", + "toggleSplitOrientation", "wt", - "quit", - "adjustOpacity", - "restoreLastClosed", - "addMark", - "scrollToMark", - "clearMark", - "clearAllMarks", - "searchWeb", - "experimental.colorSelection", "unbound" ], "type": "string" diff --git a/src/cascadia/TerminalApp/AppActionHandlers.cpp b/src/cascadia/TerminalApp/AppActionHandlers.cpp index 9d7d835597d..481fce33620 100644 --- a/src/cascadia/TerminalApp/AppActionHandlers.cpp +++ b/src/cascadia/TerminalApp/AppActionHandlers.cpp @@ -1419,4 +1419,10 @@ namespace winrt::TerminalApp::implementation } args.Handled(true); } + void TerminalPage::_HandleOpenAbout(const IInspectable& /*sender*/, + const ActionEventArgs& args) + { + _ShowAboutDialog(); + args.Handled(true); + } } diff --git a/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp b/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp index b38a73b9296..e90a2b8dcfa 100644 --- a/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp +++ b/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp @@ -96,6 +96,7 @@ static constexpr std::string_view ShowContextMenuKey{ "showContextMenu" }; static constexpr std::string_view ExpandSelectionToWordKey{ "expandSelectionToWord" }; static constexpr std::string_view RestartConnectionKey{ "restartConnection" }; static constexpr std::string_view ToggleBroadcastInputKey{ "toggleBroadcastInput" }; +static constexpr std::string_view OpenAboutKey{ "openAbout" }; static constexpr std::string_view ActionKey{ "action" }; @@ -430,6 +431,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation { ShortcutAction::ExpandSelectionToWord, RS_(L"ExpandSelectionToWordCommandKey") }, { ShortcutAction::RestartConnection, RS_(L"RestartConnectionKey") }, { ShortcutAction::ToggleBroadcastInput, RS_(L"ToggleBroadcastInputCommandKey") }, + { ShortcutAction::OpenAbout, RS_(L"OpenAboutCommandKey") }, }; }(); diff --git a/src/cascadia/TerminalSettingsModel/AllShortcutActions.h b/src/cascadia/TerminalSettingsModel/AllShortcutActions.h index df008b58220..f9d934e36e0 100644 --- a/src/cascadia/TerminalSettingsModel/AllShortcutActions.h +++ b/src/cascadia/TerminalSettingsModel/AllShortcutActions.h @@ -109,7 +109,8 @@ ON_ALL_ACTIONS(ExpandSelectionToWord) \ ON_ALL_ACTIONS(CloseOtherPanes) \ ON_ALL_ACTIONS(RestartConnection) \ - ON_ALL_ACTIONS(ToggleBroadcastInput) + ON_ALL_ACTIONS(ToggleBroadcastInput) \ + ON_ALL_ACTIONS(OpenAbout) #define ALL_SHORTCUT_ACTIONS_WITH_ARGS \ ON_ALL_ACTIONS_WITH_ARGS(AdjustFontSize) \ diff --git a/src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw index 74035df755d..d6d6d9565f9 100644 --- a/src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw +++ b/src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw @@ -720,4 +720,8 @@ Search the web for selected text This will open a web browser to search for some user-selected text - \ No newline at end of file + + Open about dialog + This will open the "about" dialog, to display version info and other documentation + + diff --git a/src/cascadia/TerminalSettingsModel/defaults.json b/src/cascadia/TerminalSettingsModel/defaults.json index 117abb5c892..f9fbe216628 100644 --- a/src/cascadia/TerminalSettingsModel/defaults.json +++ b/src/cascadia/TerminalSettingsModel/defaults.json @@ -373,7 +373,8 @@ { "command": "quakeMode", "keys":"win+sc(41)" }, { "command": "openSystemMenu", "keys": "alt+space" }, { "command": "quit" }, - { "command": "restoreLastClosed"}, + { "command": "restoreLastClosed" }, + { "command": "openAbout" }, // Tab Management // "command": "closeTab" is unbound by default.