[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22408] branches/blender2.5/blender/source /blender/editors/space_time/time_header.c: Edited timeline header layout slightly.

William Reynish william at reynish.com
Wed Aug 12 17:55:15 CEST 2009


Revision: 22408
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22408
Author:   billrey
Date:     2009-08-12 17:55:15 +0200 (Wed, 12 Aug 2009)

Log Message:
-----------
Edited timeline header layout slightly. 

-Made the 'PR' button not align itself to the start/end frame fields, as this makes for a nicer visual rounding of those two numbers.
-Made current frame indicator longer, to allow for display of higher frame numbers
-Removed the auto-keyframe dropdown menu. This exists as a preference, and doesn't need to take up space here. This is not something you're likely to change much after all.
-Made the keying sets menu stay put in the UI. It was moving about depending on what options are selected to the left of it. This sort of moving around should be avoided as much as possible.
-Swapped Add/Delete keyframe buttons. It's more intuitive to have the add key button first.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_time/time_header.c

Modified: branches/blender2.5/blender/source/blender/editors/space_time/time_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_time/time_header.c	2009-08-12 15:03:48 UTC (rev 22407)
+++ branches/blender2.5/blender/source/blender/editors/space_time/time_header.c	2009-08-12 15:55:15 UTC (rev 22408)
@@ -430,15 +430,17 @@
 	
 	uiBlockSetEmboss(block, UI_EMBOSS);
 	
-	uiBlockBeginAlign(block);
 	
+	
 	uiDefButI(block, TOG, B_TL_PREVIEWON,"PR",	
 			  xco,yco, XIC*2, YIC,
 			  &scene->r.psfra,0, 1, 0, 0,
 			  "Show settings for frame range of animation preview");
 	
-	xco += XIC*2;
+	xco += XIC*2.5;
 	
+	uiBlockBeginAlign(block);
+	
 	if (scene->r.psfra) {
 		uiDefButI(block, NUM, B_REDRAWALL,"Start:",	
 				  xco,yco, (int)4.5*XIC, YIC,
@@ -473,11 +475,11 @@
 	 * to facilitate easier keyframing in some situations
 	 */
 	uiDefButI(block, NUM, B_NEWFRAME, "",
-			  xco,yco, (int)3.5*XIC,YIC,
+			  xco,yco, (int)4.5*XIC,YIC,
 			  &(scene->r.cfra), MINAFRAMEF, MAXFRAMEF, 0, 0,
 			  "Displays Current Frame of animation");
 	
-	xco += (short)(3.5 * XIC);
+	xco += (short)(4.5 * XIC);
 	
 	uiBlockBeginAlign(block);
 	
@@ -514,33 +516,36 @@
 	xco+= XIC;
 	uiBlockEndAlign(block);
 
-	xco+= 1.5*XIC;
+	xco+= 0.5*XIC;
 	
 	uiBlockBeginAlign(block);
 	uiDefIconButBitS(block, TOG, AUTOKEY_ON, B_REDRAWALL, ICON_REC,
 					 xco, yco, XIC, YIC, &(scene->toolsettings->autokey_mode), 0, 0, 0, 0, "Automatic keyframe insertion for Objects and Bones");
-	xco+= XIC;
-	
+	xco+= 1*XIC;
 	if (IS_AUTOKEY_ON(scene)) {
-		uiDefButS(block, MENU, B_REDRAWALL, 
-				  "Auto-Keying Mode %t|Add/Replace Keys%x3|Replace Keys %x5", 
-				  xco, yco, (int)5.5*XIC, YIC, &(scene->toolsettings->autokey_mode), 0, 1, 0, 0, 
-				  "Mode of automatic keyframe insertion for Objects and Bones");
-		xco+= (5.5*XIC);
+//		uiDefButS(block, MENU, B_REDRAWALL, 
+//				  "Auto-Keying Mode %t|Add/Replace Keys%x3|Replace Keys %x5", 
+//				  xco, yco, (int)5.5*XIC, YIC, &(scene->toolsettings->autokey_mode), 0, 1, 0, 0, 
+//				  "Mode of automatic keyframe insertion for Objects and Bones");
 		
 		if (animtimer) {
 			uiDefButBitS(block, TOG, ANIMRECORD_FLAG_WITHNLA, B_REDRAWALL, "Layered",	
-				  xco,yco, XIC*2.5, YIC,
+				  xco,yco, 70, YIC,
 				  &(scene->toolsettings->autokey_flag),0, 1, 0, 0,
 				  "Add a new NLA Track + Strip for every loop/pass made over the animation to allow non-destructive tweaking.");
-			xco+= (3*XIC);
+			uiBlockEndAlign(block);
 		}
+	
+		uiBlockEndAlign(block);
 	}
 	else
-		xco+= 6;
 
+	
+	
 	uiBlockEndAlign(block);
 	
+	xco+= (4.5*XIC);
+	
 	menustr= ANIM_build_keyingsets_menu(&scene->keyingsets, 0);
 	uiDefButI(block, MENU, B_DIFF, 
 				  menustr, 
@@ -550,10 +555,10 @@
 	xco+= (5.5*XIC);
 	
 	uiBlockBeginAlign(block);
+	uiDefIconButO(block, BUT, "ANIM_OT_insert_keyframe", WM_OP_INVOKE_REGION_WIN, ICON_KEY_HLT, xco,yco,XIC,YIC, "Insert Keyframes for the Active Keying Set (I)");
+	xco += XIC;
 	uiDefIconButO(block, BUT, "ANIM_OT_delete_keyframe", WM_OP_INVOKE_REGION_WIN, ICON_KEY_DEHLT, xco,yco,XIC,YIC, "Delete Keyframes for the Active Keying Set (Alt-I)");
 	xco += XIC;
-	uiDefIconButO(block, BUT, "ANIM_OT_insert_keyframe", WM_OP_INVOKE_REGION_WIN, ICON_KEY_HLT, xco,yco,XIC,YIC, "Insert Keyframes for the Active Keying Set (I)");
-	xco += XIC;
 	uiBlockEndAlign(block);
 	
 	xco+= XIC;





More information about the Bf-blender-cvs mailing list