[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24563] trunk/blender/source/blender/ editors/space_sequencer: sequencer select linked time option, (Selectmouse /w Ctrl & Ctrl+Shift), selects all strips that have the same start/ end as the active strip or..

[Campbell Barton]

Revision: 24563
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24563
Author:   campbellbarton
Date:     2009-11-14 21:46:18 +0100 (Sat, 14 Nov 2009)

Log Message:
-----------
sequencer select linked time option, (Selectmouse /w Ctrl & Ctrl+Shift), selects all strips that have the same start/end as the active strip or.. if your selecting a handle select all strips and handles on the same time

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c
    trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c	2009-11-14 20:17:05 UTC (rev 24562)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c	2009-11-14 20:46:18 UTC (rev 24563)
@@ -158,6 +158,7 @@
 	WM_keymap_add_item(keymap, "SEQUENCER_OT_select", SELECTMOUSE, KM_PRESS, 0, 0);
 	RNA_boolean_set(WM_keymap_add_item(keymap, "SEQUENCER_OT_select", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "extend", 1);
 
+
 	/* 2.4x method, now use Alt for handles and select the side based on which handle was selected */
 	/*
 	RNA_boolean_set(WM_keymap_add_item(keymap, "SEQUENCER_OT_select", SELECTMOUSE, KM_PRESS, KM_CTRL, 0)->ptr, "linked_left", 1);
@@ -189,9 +190,15 @@
 	RNA_boolean_set(kmi->ptr, "linked_handle", 1);
 
 	/* match action editor */
-	RNA_boolean_set(WM_keymap_add_item(keymap, "SEQUENCER_OT_select", SELECTMOUSE, KM_PRESS, KM_CTRL, 0)->ptr, "left_right", 1);
+	kmi= WM_keymap_add_item(keymap, "SEQUENCER_OT_select", SELECTMOUSE, KM_PRESS, KM_CTRL, 0);
+	RNA_boolean_set(kmi->ptr, "left_right", 1); /* grr, these conflict - only use left_right if not over an active seq */
+	RNA_boolean_set(kmi->ptr, "linked_time", 1);
 	/* adjusted since 2.4 */
 
+	kmi= WM_keymap_add_item(keymap, "SEQUENCER_OT_select", SELECTMOUSE, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
+	RNA_boolean_set(kmi->ptr, "extend", 1);
+	RNA_boolean_set(kmi->ptr, "linked_time", 1);
+
 	WM_keymap_add_item(keymap, "SEQUENCER_OT_select_more", PADPLUSKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "SEQUENCER_OT_select_less", PADMINUS, KM_PRESS, KM_CTRL, 0);
 	

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c	2009-11-14 20:17:05 UTC (rev 24562)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c	2009-11-14 20:46:18 UTC (rev 24563)
@@ -128,6 +128,40 @@
 	}
 }
 
+/* used for mouse selection and for SEQUENCER_OT_select_active_side() */
+static void select_linked_time(ListBase *seqbase, Sequence *seq_link)
+{
+	Sequence *seq;
+
+	for(seq= seqbase->first; seq; seq=seq->next) {
+		if(seq_link->machine != seq->machine) {
+			int left_match = (seq->startdisp == seq_link->startdisp) ? 1:0;
+			int right_match = (seq->enddisp == seq_link->enddisp) ? 1:0;
+
+			if(left_match && right_match) {
+				/* a direct match, copy the selection settinhs */
+				seq->flag &= ~(SELECT|SEQ_LEFTSEL|SEQ_RIGHTSEL);
+				seq->flag |= seq_link->flag & (SELECT|SEQ_LEFTSEL|SEQ_RIGHTSEL);
+
+				recurs_sel_seq(seq);
+			}
+			else if(seq_link->flag & SELECT && (left_match || right_match)) {
+
+				/* clear for reselection */
+				seq->flag &= ~(SEQ_LEFTSEL|SEQ_RIGHTSEL);
+
+				if(left_match && seq_link->flag & SEQ_LEFTSEL)
+					seq->flag |= SELECT|SEQ_LEFTSEL;
+
+				if(right_match && seq_link->flag & SEQ_RIGHTSEL)
+					seq->flag |= SELECT|SEQ_RIGHTSEL;
+
+				recurs_sel_seq(seq);
+			}
+		}
+	}
+}
+
 #if 0 // BRING BACK
 void select_surround_from_last(Scene *scene)
 {
@@ -293,6 +327,7 @@
 	short extend= RNA_boolean_get(op->ptr, "extend");
 	short linked_handle= RNA_boolean_get(op->ptr, "linked_handle");
 	short left_right= RNA_boolean_get(op->ptr, "left_right");
+	short linked_time= RNA_boolean_get(op->ptr, "linked_time");
 
 	short mval[2];	
 	
@@ -308,6 +343,13 @@
 	mval[0]= event->x - ar->winrct.xmin;
 	mval[1]= event->y - ar->winrct.ymin;
 	
+	seq= find_nearest_seq(scene, v2d, &hand, mval);
+
+	// XXX - not nice, Ctrl+RMB needs to do left_right only when not over a strip
+	if(seq && linked_time && left_right)
+		left_right= FALSE;
+
+
 	if (marker) {
 		int oldflag;
 		/* select timeline marker */
@@ -342,12 +384,11 @@
 					recurs_sel_seq(seq);
 				}
 			}
-
 		}
 		SEQ_END
 	} else {
-	
-		seq= find_nearest_seq(scene, v2d, &hand, mval);
+		// seq= find_nearest_seq(scene, v2d, &hand, mval);
+
 		act_orig= ed->act_seq;
 
 		if(extend == 0 && linked_handle==0)
@@ -442,6 +483,10 @@
 				}
 			}
 			recurs_sel_seq(seq);
+
+			if(linked_time) {
+				select_linked_time(ed->seqbasep, seq);
+			}
 		}
 	}
 	
@@ -487,6 +532,7 @@
 	RNA_def_boolean(ot->srna, "linked_handle", 0, "Linked Handle", "Select handles next to the active strip.");
 	/* for animation this is an enum but atm having an enum isnt useful for us */
 	RNA_def_boolean(ot->srna, "left_right", 0, "Left/Right", "select based on the frame side the cursor is on.");
+	RNA_def_boolean(ot->srna, "linked_time", 0, "Linked Time", "Select other strips at the same time.");
 }