Skip to content

Replace "bindings" with "actions" #7332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1 commit merged into from
Aug 20, 2020
Merged

Replace "bindings" with "actions" #7332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2440,7 +2440,7 @@ namespace TerminalAppLocalTests
"commandline": "wsl.exe"
}
],
"bindings": [
"actions": [
{ "keys": "ctrl+a", "command": { "action": "splitPane", "split": "vertical" } },
{ "name": "ctrl+b", "command": { "action": "splitPane", "split": "vertical" } },
{ "keys": "ctrl+c", "name": "ctrl+c", "command": { "action": "splitPane", "split": "vertical" } },
Expand Down Expand Up @@ -2642,7 +2642,7 @@ namespace TerminalAppLocalTests
"commandline": "wsl.exe"
}
],
"bindings": [
"actions": [
{
"name": "iterable command ${profile.name}",
"iterateOn": "profiles",
Expand Down Expand Up @@ -2773,7 +2773,7 @@ namespace TerminalAppLocalTests
"commandline": "wsl.exe"
}
],
"bindings": [
"actions": [
{
"iterateOn": "profiles",
"command": { "action": "splitPane", "profile": "${profile.name}" }
Expand Down Expand Up @@ -2904,7 +2904,7 @@ namespace TerminalAppLocalTests
"commandline": "wsl.exe"
}
],
"bindings": [
"actions": [
{
"name": "iterable command ${profile.name}",
"iterateOn": "profiles",
Expand Down Expand Up @@ -3041,7 +3041,7 @@ namespace TerminalAppLocalTests
"commandline": "wsl.exe"
}
],
"bindings": [
"actions": [
{
"name": "Connect to ssh...",
"commands": [
Expand Down Expand Up @@ -3144,7 +3144,7 @@ namespace TerminalAppLocalTests
"commandline": "wsl.exe"
}
],
"bindings": [
"actions": [
{
"name": "grandparent",
"commands": [
Expand Down Expand Up @@ -3292,7 +3292,7 @@ namespace TerminalAppLocalTests
"commandline": "wsl.exe"
}
],
"bindings": [
"actions": [
{
"iterateOn": "profiles",
"name": "${profile.name}...",
Expand Down Expand Up @@ -3445,7 +3445,7 @@ namespace TerminalAppLocalTests
"commandline": "wsl.exe"
}
],
"bindings": [
"actions": [
{
"name": "New Tab With Profile...",
"commands": [
Expand Down Expand Up @@ -3553,7 +3553,7 @@ namespace TerminalAppLocalTests
"commandline": "wsl.exe"
}
],
"bindings": [
"actions": [
{
"name": "New Pane...",
"commands": [
Expand Down Expand Up @@ -3716,7 +3716,7 @@ namespace TerminalAppLocalTests
"commandline": "wsl.exe"
}
],
"bindings": [
"actions": [
{
"commands": [
{
Expand Down Expand Up @@ -3779,7 +3779,7 @@ namespace TerminalAppLocalTests
"commandline": "wsl.exe"
}
],
"bindings": [
"actions": [
{
"name": "parent",
"commands": [
Expand All @@ -3800,7 +3800,7 @@ namespace TerminalAppLocalTests
const std::string settings1Json{ R"(
{
"defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
"bindings": [
"actions": [
{
"name": "parent",
"commands": null
Expand Down Expand Up @@ -3862,7 +3862,7 @@ namespace TerminalAppLocalTests
"commandline": "wsl.exe"
}
],
"bindings": [
"actions": [
{
"name": "parent",
"commands": [
Expand All @@ -3883,7 +3883,7 @@ namespace TerminalAppLocalTests
const std::string settings1Json{ R"(
{
"defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
"bindings": [
"actions": [
{
"name": "parent",
"command": "newTab"
Expand Down
4 changes: 2 additions & 2 deletions src/cascadia/TerminalApp/GlobalAppSettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using namespace ::Microsoft::Console;
using namespace winrt::Microsoft::UI::Xaml::Controls;

static constexpr std::string_view LegacyKeybindingsKey{ "keybindings" };
static constexpr std::string_view BindingsKey{ "bindings" };
static constexpr std::string_view ActionsKey{ "actions" };
static constexpr std::string_view DefaultProfileKey{ "defaultProfile" };
static constexpr std::string_view AlwaysShowTabsKey{ "alwaysShowTabs" };
static constexpr std::string_view InitialRowsKey{ "initialRows" };
Expand Down Expand Up @@ -202,7 +202,7 @@ void GlobalAppSettings::LayerJson(const Json::Value& json)
}
};
parseBindings(LegacyKeybindingsKey);
parseBindings(BindingsKey);
parseBindings(ActionsKey);
}

// Method Description:
Expand Down
2 changes: 1 addition & 1 deletion src/cascadia/TerminalApp/defaults-universal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"brightWhite": "#FFFFFF"
}
],
"keybindings":
"actions":
[
// Application-level Keys
{ "command": "closeWindow", "keys": "alt+f4" },
Expand Down
2 changes: 1 addition & 1 deletion src/cascadia/TerminalApp/defaults.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
"brightWhite": "#EEEEEC"
}
],
"bindings":
"actions":
[
// Application-level Keys
{ "command": "closeWindow", "keys": "alt+f4" },
Expand Down