Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
{
|
2011-08-27 08:30:42 +02:00
|
|
|
"audio" : [
|
|
|
|
"time/prev",
|
|
|
|
"time/next",
|
|
|
|
"audio/play/selection",
|
2012-10-05 01:49:55 +02:00
|
|
|
"audio/play/line",
|
2011-08-27 08:30:42 +02:00
|
|
|
"audio/stop",
|
|
|
|
"",
|
|
|
|
"audio/play/selection/before",
|
|
|
|
"audio/play/selection/after",
|
|
|
|
"audio/play/selection/begin",
|
|
|
|
"audio/play/selection/end",
|
|
|
|
"audio/play/to_end",
|
|
|
|
"",
|
|
|
|
"time/lead/in",
|
|
|
|
"time/lead/out",
|
|
|
|
"",
|
|
|
|
"audio/commit",
|
|
|
|
"audio/go_to",
|
|
|
|
"",
|
|
|
|
"audio/opt/autocommit",
|
|
|
|
"audio/opt/autonext",
|
|
|
|
"audio/opt/autoscroll",
|
|
|
|
"audio/opt/spectrum",
|
2011-09-28 21:44:07 +02:00
|
|
|
"app/toggle/global_hotkeys",
|
|
|
|
"",
|
|
|
|
"audio/karaoke"
|
2011-08-27 08:30:42 +02:00
|
|
|
],
|
2011-07-15 06:06:23 +02:00
|
|
|
"main" : [
|
|
|
|
"subtitle/new",
|
|
|
|
"subtitle/open",
|
|
|
|
"subtitle/save",
|
|
|
|
"",
|
|
|
|
"video/jump",
|
|
|
|
"video/zoom/in",
|
|
|
|
"video/zoom/out",
|
|
|
|
"video/jump/start",
|
|
|
|
"video/jump/end",
|
|
|
|
"",
|
|
|
|
"time/snap/start_video",
|
|
|
|
"time/snap/end_video",
|
|
|
|
"subtitle/select/visible",
|
|
|
|
"time/snap/scene",
|
2011-10-13 01:08:11 +02:00
|
|
|
"time/frame/current",
|
2011-07-15 06:06:23 +02:00
|
|
|
"",
|
|
|
|
"tool/style/manager",
|
|
|
|
"subtitle/properties",
|
|
|
|
"subtitle/attachment",
|
|
|
|
"tool/font_collector",
|
|
|
|
"",
|
2012-02-29 02:24:04 +01:00
|
|
|
"am/meta",
|
2011-07-15 06:06:23 +02:00
|
|
|
"",
|
|
|
|
"tool/assdraw",
|
|
|
|
"",
|
|
|
|
"time/shift",
|
|
|
|
"tool/style/assistant",
|
|
|
|
"tool/translation_assistant",
|
|
|
|
"tool/resampleres",
|
|
|
|
"tool/time/postprocess",
|
|
|
|
"tool/time/kanji",
|
|
|
|
"subtitle/spellcheck",
|
|
|
|
"",
|
|
|
|
"app/options",
|
|
|
|
"grid/tag/cycle_hiding"
|
2011-11-06 18:18:20 +01:00
|
|
|
],
|
2012-12-10 17:58:30 +01:00
|
|
|
"video" : [
|
|
|
|
"video/play",
|
|
|
|
"video/play/line",
|
|
|
|
"video/stop",
|
|
|
|
"video/opt/autoscroll"
|
|
|
|
],
|
2011-11-06 18:18:20 +01:00
|
|
|
"visual_tools" : [
|
|
|
|
"video/tool/cross",
|
|
|
|
"video/tool/drag",
|
|
|
|
"video/tool/rotate/z",
|
|
|
|
"video/tool/rotate/xy",
|
|
|
|
"video/tool/scale",
|
|
|
|
"video/tool/clip",
|
|
|
|
"video/tool/vector_clip",
|
|
|
|
"",
|
|
|
|
"help/video"
|
2011-07-15 06:06:23 +02:00
|
|
|
]
|
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
|
|
|
}
|