diff --git a/aegisub/src/hotkey.cpp b/aegisub/src/hotkey.cpp index fb115ac0d..0e920ed57 100644 --- a/aegisub/src/hotkey.cpp +++ b/aegisub/src/hotkey.cpp @@ -55,6 +55,15 @@ namespace { { 0 } }; + const char *removed_commands_7070[] = { 0 }; + const char *added_hotkeys_7070[][4] = { + { "edit/color/primary", "Subtitle Edit Box", "Alt", "1" }, + { "edit/color/secondary", "Subtitle Edit Box", "Alt", "2" }, + { "edit/color/outline", "Subtitle Edit Box", "Alt", "3" }, + { "edit/color/shadow", "Subtitle Edit Box", "Alt", "4" }, + { 0 } + }; + void migrate_hotkeys(const char *removed[], const char *added[][4]) { agi::hotkey::Hotkey::HotkeyMap hk_map = hotkey::inst->GetHotkeyMap(); @@ -127,6 +136,8 @@ void init() { rename_commands(); if (last_version < 7035) migrate_hotkeys(removed_commands_7035, added_hotkeys_7035); + if (last_version < 7070) + migrate_hotkeys(removed_commands_7070, added_hotkeys_7070); } void clear() { diff --git a/aegisub/src/libresrc/default_hotkey.json b/aegisub/src/libresrc/default_hotkey.json index a839be806..e1db8484c 100644 --- a/aegisub/src/libresrc/default_hotkey.json +++ b/aegisub/src/libresrc/default_hotkey.json @@ -603,6 +603,30 @@ "modifiers" : [], "key" : "Enter" } + ], + "edit/color/primary" : [ + { + "modifiers" : [ "Alt" ], + "key" : "1" + } + ], + "edit/color/secondary" : [ + { + "modifiers" : [ "Alt" ], + "key" : "2" + } + ], + "edit/color/outline" : [ + { + "modifiers" : [ "Alt" ], + "key" : "3" + } + ], + "edit/color/shadow" : [ + { + "modifiers" : [ "Alt" ], + "key" : "4" + } ] }, diff --git a/aegisub/src/libresrc/osx/default_hotkey.json b/aegisub/src/libresrc/osx/default_hotkey.json index 64a2ee90d..aef3be665 100644 --- a/aegisub/src/libresrc/osx/default_hotkey.json +++ b/aegisub/src/libresrc/osx/default_hotkey.json @@ -613,6 +613,30 @@ "modifiers" : [], "key" : "Enter" } + ], + "edit/color/primary" : [ + { + "modifiers" : [ "Alt" ], + "key" : "1" + } + ], + "edit/color/secondary" : [ + { + "modifiers" : [ "Alt" ], + "key" : "2" + } + ], + "edit/color/outline" : [ + { + "modifiers" : [ "Alt" ], + "key" : "3" + } + ], + "edit/color/shadow" : [ + { + "modifiers" : [ "Alt" ], + "key" : "4" + } ] },