Add command to toggle medusa mode and fix the command names for many hotkeys

Originally committed to SVN as r5528.
This commit is contained in:
Thomas Goyne 2011-07-27 22:59:11 +00:00
parent 6d8d1a48d3
commit 59755b5bb5
3 changed files with 27 additions and 10 deletions

View file

@ -227,11 +227,28 @@ struct app_options : public Command {
} }
}; };
/// Toggle global override hotkeys (aka medusa mode).
struct app_toggle_global_hotkeys : public Command {
CMD_NAME("app/toggle/global_hotkeys")
STR_MENU("Toggle global hotkey overrides")
STR_DISP("Toggle global hotkey overrides")
STR_HELP("Toggle global hotkey overrides.")
CMD_TYPE(COMMAND_TOGGLE)
bool IsActive(const agi::Context *c) {
return OPT_GET("Audio/Medusa Timing Hotkeys")->GetBool();
}
void operator()(agi::Context *c) {
agi::OptionValue *opt = OPT_SET("Audio/Medusa Timing Hotkeys");
opt->SetBool(!opt->GetBool());
}
};
/// Check to see if there is a new version of Aegisub available. /// Check to see if there is a new version of Aegisub available.
struct app_updates : public Command { struct app_updates : public Command {
CMD_NAME("app/updates") CMD_NAME("app/updates")
STR_MENU("&Check for Updates..") STR_MENU("&Check for Updates...")
STR_DISP("Check for Updates") STR_DISP("Check for Updates")
STR_HELP("Check to see if there is a new version of Aegisub available.") STR_HELP("Check to see if there is a new version of Aegisub available.")
@ -255,6 +272,7 @@ namespace cmd {
reg(new app_log); reg(new app_log);
reg(new app_new_window); reg(new app_new_window);
reg(new app_options); reg(new app_options);
reg(new app_toggle_global_hotkeys);
reg(new app_updates); reg(new app_updates);
} }
} }

View file

@ -85,7 +85,6 @@ namespace cmd {
void init_grid(); void init_grid();
void init_help(); void init_help();
void init_keyframe(); void init_keyframe();
void init_medusa();
void init_menu(); void init_menu();
void init_recent(); void init_recent();
void init_subtitle(); void init_subtitle();

View file

@ -1,12 +1,12 @@
{ {
"Always" : { "Always" : {
"audio play" : [ "audio/play/selection" : [
{ {
"modifiers" : [], "modifiers" : [],
"key" : "KP_5" "key" : "KP_5"
} }
], ],
"audio stop" : [ "audio/stop" : [
{ {
"modifiers" : [], "modifiers" : [],
"key" : "KP_8" "key" : "KP_8"
@ -36,31 +36,31 @@
"key" : "KP_9" "key" : "KP_9"
} }
], ],
"audio play before selection begin" : [ "audio/play/selection/before" : [
{ {
"modifiers" : [], "modifiers" : [],
"key" : "KP_1" "key" : "KP_1"
} }
], ],
"audio play after selection end" : [ "audio/play/selection/after" : [
{ {
"modifiers" : [], "modifiers" : [],
"key" : "KP_3" "key" : "KP_3"
} }
], ],
"timing move to prev item" : [ "time/prev" : [
{ {
"modifiers" : [], "modifiers" : [],
"key" : "KP_0" "key" : "KP_0"
} }
], ],
"timing move to next item" : [ "time/next" : [
{ {
"modifiers" : [], "modifiers" : [],
"key" : "KP_2" "key" : "KP_2"
} }
], ],
"timing commit" : [ "audio/commit" : [
{ {
"modifiers" : [], "modifiers" : [],
"key" : "KP_Enter" "key" : "KP_Enter"
@ -417,7 +417,7 @@
"key" : "Left" "key" : "Left"
} }
], ],
"toggle global timing mode" : [ "app/toggle/global_hotkeys" : [
{ {
"modifiers" : [ "Ctrl" ], "modifiers" : [ "Ctrl" ],
"key" : "KP_Multiply" "key" : "KP_Multiply"