[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18878] branches/blender2.5/blender/source /blender/editors: 2.5 - Animation UI tweaks

[Joshua Leung]

Revision: 18878
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18878
Author:   aligorith
Date:     2009-02-09 04:06:52 +0100 (Mon, 09 Feb 2009)

Log Message:
-----------
2.5 - Animation UI tweaks

* Frame-change (scrubbing) now works when using LMB select. It now uses ACTIONMOUSE, so it doesn't conflict with selection. However, the check for exiting the modal op currently needs to check for LEFTMOUSE and/or RIGHTMOUSE instead of ACTIONMOUSE otherwise errors occur.

* Renamed the 'DopeSheet Editor' entry to simply 'DopeSheet'

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/animation/anim_ops.c
    branches/blender2.5/blender/source/blender/editors/screen/area.c

Modified: branches/blender2.5/blender/source/blender/editors/animation/anim_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/anim_ops.c	2009-02-09 02:54:40 UTC (rev 18877)
+++ branches/blender2.5/blender/source/blender/editors/animation/anim_ops.c	2009-02-09 03:06:52 UTC (rev 18878)
@@ -172,12 +172,20 @@
 {
 	/* execute the events */
 	switch (event->type) {
+		case ESCKEY:
+			change_frame_exit(C, op);
+			return OPERATOR_FINISHED;
+		
 		case MOUSEMOVE:
 			RNA_int_set(op->ptr, "frame", frame_from_event(C, event));
 			change_frame_apply(C, op);
 			break;
-			
-		case LEFTMOUSE:
+		
+		case LEFTMOUSE: 
+		case RIGHTMOUSE:
+			/* we check for either mouse-button to end, as checking for ACTIONMOUSE (which is used to init 
+			 * the modal op) doesn't work for some reason
+			 */
 			if (event->val==0) {
 				change_frame_exit(C, op);
 				return OPERATOR_FINISHED;
@@ -378,11 +386,12 @@
 {
 	ListBase *keymap= WM_keymap_listbase(wm, "Animation", 0, 0);
 	
-		/* frame management */
-	WM_keymap_verify_item(keymap, "ANIM_OT_change_frame", LEFTMOUSE, KM_PRESS, 0, 0);
+	/* frame management */
+		/* NOTE: 'ACTIONMOUSE' not 'LEFTMOUSE', as user may have swapped mouse-buttons */
+	WM_keymap_verify_item(keymap, "ANIM_OT_change_frame", ACTIONMOUSE, KM_PRESS, 0, 0);
 	WM_keymap_verify_item(keymap, "ANIM_OT_time_toggle", TKEY, KM_PRESS, KM_CTRL, 0);
 	
-		/* preview range */
+	/* preview range */
 	WM_keymap_verify_item(keymap, "ANIM_OT_previewrange_define", PKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_verify_item(keymap, "ANIM_OT_previewrange_clear", PKEY, KM_PRESS, KM_ALT, 0);
 }

Modified: branches/blender2.5/blender/source/blender/editors/screen/area.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/area.c	2009-02-09 02:54:40 UTC (rev 18877)
+++ branches/blender2.5/blender/source/blender/editors/screen/area.c	2009-02-09 03:06:52 UTC (rev 18878)
@@ -771,7 +771,7 @@
 		   "|%l" // 33
 		   
 		   "|Graph Editor %x2" //54
-		   "|DopeSheet Editor %x12" //73
+		   "|DopeSheet %x12" //73
 		   "|NLA Editor %x13" //94
 		   
 		   "|%l" //97