Bugfix [#26438]: Hotkey conflict between add meta-strip and add marker
authorJoshua Leung <aligorith@gmail.com>
Thu, 10 Mar 2011 23:26:59 +0000 (23:26 +0000)
committerJoshua Leung <aligorith@gmail.com>
Thu, 10 Mar 2011 23:26:59 +0000 (23:26 +0000)
The sequencer made it's own copy of the Markers keymap, which was
inconsistent with the rest of Blender, making things confusing to use.
I've removed these duplicate keymap entries, and also changed the
conflicting hotkeys for Metastrips.

Metastrips now use the same hotkeys that their NLA cousins use:
Shift-G to add, Alt-G to remove; These were chosen since in user-
terms, metastrips are more like "strip groups"

source/blender/editors/space_sequencer/sequencer_ops.c

index 04edbfd5593d79c920f90b23af9daa416529188f..f476f911ab6f680ba9743a00d1095fb7a15b0955 100644 (file)
@@ -124,12 +124,7 @@ void sequencer_keymap(wmKeyConfig *keyconf)
 
        /* operators for sequence */
        keymap= WM_keymap_find(keyconf, "Sequencer", SPACE_SEQ, 0);
-
-        WM_keymap_add_item(keymap, "MARKER_OT_add", MKEY, KM_PRESS, KM_CTRL | KM_ALT, 0);
-        WM_keymap_add_item(keymap, "MARKER_OT_move", GKEY, KM_PRESS, KM_CTRL, 0);
-        WM_keymap_add_item(keymap, "MARKER_OT_duplicate", DKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0);
-       WM_keymap_add_item(keymap, "MARKER_OT_delete", XKEY, KM_PRESS, KM_SHIFT, 0);
+       
        WM_keymap_add_item(keymap, "SEQUENCER_OT_properties", NKEY, KM_PRESS, 0, 0);
        
        WM_keymap_add_item(keymap, "SEQUENCER_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0);
@@ -162,8 +157,8 @@ void sequencer_keymap(wmKeyConfig *keyconf)
 
        WM_keymap_add_item(keymap, "SEQUENCER_OT_meta_toggle", TABKEY, KM_PRESS, 0, 0);
 
-       WM_keymap_add_item(keymap, "SEQUENCER_OT_meta_make", MKEY, KM_PRESS, 0, 0);
-       WM_keymap_add_item(keymap, "SEQUENCER_OT_meta_separate", MKEY, KM_PRESS, KM_ALT, 0);
+       WM_keymap_add_item(keymap, "SEQUENCER_OT_meta_make", GKEY, KM_PRESS, KM_SHIFT, 0);
+       WM_keymap_add_item(keymap, "SEQUENCER_OT_meta_separate", GKEY, KM_PRESS, KM_ALT, 0);
 
        WM_keymap_add_item(keymap, "SEQUENCER_OT_view_all", HOMEKEY, KM_PRESS, 0, 0);
        WM_keymap_add_item(keymap, "SEQUENCER_OT_view_selected", PADPERIOD, KM_PRESS, 0, 0);