[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24192] trunk/blender: small change to strip-swap, Made keys Alt+L/RArrowKey, added in menu, dont treat color strips like other effects

[Campbell Barton]

Revision: 24192
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24192
Author:   campbellbarton
Date:     2009-10-30 22:40:07 +0100 (Fri, 30 Oct 2009)

Log Message:
-----------
small change to strip-swap, Made keys Alt+L/RArrowKey, added in menu, dont treat color strips like other effects

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_sequencer.py
    trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
    trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c

Modified: trunk/blender/release/scripts/ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/ui/space_sequencer.py	2009-10-30 20:47:13 UTC (rev 24191)
+++ trunk/blender/release/scripts/ui/space_sequencer.py	2009-10-30 21:40:07 UTC (rev 24192)
@@ -246,6 +246,9 @@
 		layout.item_booleanO("sequencer.mute", "unselected", 1, text="Mute Deselected Strips")
 
 		layout.itemO("sequencer.snap")
+		
+		layout.itemO("sequencer.swap_right")
+		layout.itemO("sequencer.swap_left")
 
 # Panels
 class SequencerButtonsPanel(bpy.types.Panel):

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c	2009-10-30 20:47:13 UTC (rev 24191)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c	2009-10-30 21:40:07 UTC (rev 24192)
@@ -2602,9 +2602,9 @@
 	if(seq) {
 		
 		/* disallow effect strips */
-		if (seq->effectdata || seq->seq1 || seq->seq2 || seq->seq3)
+		if ((seq->type!=SEQ_COLOR) && (seq->effectdata || seq->seq1 || seq->seq2 || seq->seq3))
 			return OPERATOR_CANCELLED;
-		if (active_seq->effectdata || active_seq->seq1 || active_seq->seq2 || active_seq->seq3)
+		if ((active_seq->type!=SEQ_COLOR) && (active_seq->effectdata || active_seq->seq1 || active_seq->seq2 || active_seq->seq3))
 			return OPERATOR_CANCELLED;
 
 		/* disallow if parent strip (effect strip) is attached */
@@ -2668,4 +2668,4 @@
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
 	/* properties */
-}
\ No newline at end of file
+}

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c	2009-10-30 20:47:13 UTC (rev 24191)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c	2009-10-30 21:40:07 UTC (rev 24192)
@@ -149,8 +149,9 @@
 	WM_keymap_add_item(keymap, "SEQUENCER_OT_next_edit", PAGEUPKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "SEQUENCER_OT_previous_edit", PAGEDOWNKEY, KM_PRESS, 0, 0);
 
-	WM_keymap_add_item(keymap, "SEQUENCER_OT_swap_right", RKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "SEQUENCER_OT_swap_left", LKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "SEQUENCER_OT_swap_left", LEFTARROWKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_add_item(keymap, "SEQUENCER_OT_swap_right", RIGHTARROWKEY, KM_PRESS, KM_ALT, 0);
+	
 
 	/* Mouse selection, a bit verbose :/ */
 	WM_keymap_add_item(keymap, "SEQUENCER_OT_select", SELECTMOUSE, KM_PRESS, 0, 0);