mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Add default hotkey for "edit/line/duplicate/shift_back"

Browse source
This commit is contained in:
Thomas Goyne 2013-06-08 18:49:32 -07:00
parent cff5afbb08
commit 7658f6e329
3 changed files with 36 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
aegisub/src/hotkey.cpp
View file

@ -31,32 +31,33 @@
#include <boost/range/algorithm/find.hpp> #include <boost/range/algorithm/find.hpp>
namespace { namespace {
const char *removed_commands_7035[] = { 0 }; const char *added_hotkeys_7035[][5] = {
const char *added_hotkeys_7035[][4] = { { "audio/play/line", "Audio", "R", 0, 0 },
{ "audio/play/line", "Audio", "R", 0 },
{ 0 } { 0 }
}; };
const char *removed_commands_7070[] = { 0 }; const char *added_hotkeys_7070[][5] = {
const char *added_hotkeys_7070[][4] = { { "edit/color/primary", "Subtitle Edit Box", "Alt", "1", 0 },
{ "edit/color/primary", "Subtitle Edit Box", "Alt", "1" }, { "edit/color/secondary", "Subtitle Edit Box", "Alt", "2", 0 },
{ "edit/color/secondary", "Subtitle Edit Box", "Alt", "2" }, { "edit/color/outline", "Subtitle Edit Box", "Alt", "3", 0 },
{ "edit/color/outline", "Subtitle Edit Box", "Alt", "3" }, { "edit/color/shadow", "Subtitle Edit Box", "Alt", "4", 0 },
{ "edit/color/shadow", "Subtitle Edit Box", "Alt", "4" },
{ 0 } { 0 }
}; };
void migrate_hotkeys(const char *removed[], const char *added[][4]) { const char *added_hotkeys_shift_back[][5] = {
{ "edit/line/duplicate/shift_back", "Default", "Ctrl", "Shift", "D" },
{ 0 }
};
void migrate_hotkeys(const char *added[][5]) {
agi::hotkey::Hotkey::HotkeyMap hk_map = hotkey::inst->GetHotkeyMap(); agi::hotkey::Hotkey::HotkeyMap hk_map = hotkey::inst->GetHotkeyMap();
for (size_t i = 0; removed[i]; ++i)
hk_map.erase(removed[i]);
for (size_t i = 0; added[i] && added[i][0]; ++i) { for (size_t i = 0; added[i] && added[i][0]; ++i) {
std::vector<std::string> keys; std::vector<std::string> keys;
keys.emplace_back(added[i][2]); for (size_t j = 2; j < 5; ++j) {
if (added[i][3]) if (added[i][j])
keys.emplace_back(added[i][3]); keys.emplace_back(added[i][j]);
}
agi::hotkey::Combo combo(added[i][1], added[i][0], keys); agi::hotkey::Combo combo(added[i][1], added[i][0], keys);
if (hotkey::inst->HasHotkey(combo.Context(), combo.Str())) if (hotkey::inst->HasHotkey(combo.Context(), combo.Str()))
@ -80,15 +81,20 @@ void init() {
auto migrations = OPT_GET("App/Hotkey Migrations")->GetListString(); auto migrations = OPT_GET("App/Hotkey Migrations")->GetListString();
if (boost::find(migrations, "7035") == end(migrations)) { if (boost::find(migrations, "7035") == end(migrations)) {
migrate_hotkeys(removed_commands_7035, added_hotkeys_7035); migrate_hotkeys(added_hotkeys_7035);
migrations.emplace_back("7035"); migrations.emplace_back("7035");
} }
if (boost::find(migrations, "7070") == end(migrations)) { if (boost::find(migrations, "7070") == end(migrations)) {
migrate_hotkeys(removed_commands_7070, added_hotkeys_7070); migrate_hotkeys(added_hotkeys_7070);
migrations.emplace_back("7070"); migrations.emplace_back("7070");
} }
if (boost::find(migrations, "edit/line/duplicate/shift_back") == end(migrations)) {
migrate_hotkeys(added_hotkeys_shift_back);
migrations.emplace_back("edit/line/duplicate/shift_back");
}
OPT_SET("App/Hotkey Migrations")->SetListString(migrations); OPT_SET("App/Hotkey Migrations")->SetListString(migrations);
} }

6
aegisub/src/libresrc/default_hotkey.json
View file

@ -112,6 +112,12 @@
"key" : "D" "key" : "D"
} }
], ],
"edit/line/duplicate/shift_back" : [
{
"modifiers" : [ "Ctrl", "Shift" ],
"key" : "D"
}
],
"edit/line/paste" : [ "edit/line/paste" : [
{ {
"modifiers" : [ "Ctrl" ], "modifiers" : [ "Ctrl" ],

6
aegisub/src/libresrc/osx/default_hotkey.json
View file

@ -112,6 +112,12 @@
"key" : "D" "key" : "D"
} }
], ],
"edit/line/duplicate/shift_back" : [
{
"modifiers" : [ "Ctrl", "Shift" ],
"key" : "D"
}
],
"edit/line/paste" : [ "edit/line/paste" : [
{ {
"modifiers" : [ "Ctrl" ], "modifiers" : [ "Ctrl" ],