[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13030] trunk/blender/source/blender/src/ header_action.c: == Action Editor - Header Buttons Shuffle ==

[Joshua Leung]

Revision: 13030
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13030
Author:   aligorith
Date:     2007-12-28 10:57:06 +0100 (Fri, 28 Dec 2007)

Log Message:
-----------
== Action Editor - Header Buttons Shuffle ==

* Changed the order of Copy/Paste and AutoSnap buttons
* Auto-snap menu now has more descriptive names (off --> No Snap)

Modified Paths:
--------------
    trunk/blender/source/blender/src/header_action.c

Modified: trunk/blender/source/blender/src/header_action.c
===================================================================
--- trunk/blender/source/blender/src/header_action.c	2007-12-28 08:04:37 UTC (rev 13029)
+++ trunk/blender/source/blender/src/header_action.c	2007-12-28 09:57:06 UTC (rev 13030)
@@ -1241,37 +1241,37 @@
 
 	uiClearButLock();
 
-	/* draw AUTOSNAP */
 	xco += 8;
 	
+	/* COPY PASTE */
+	uiBlockBeginAlign(block);
+	if (curarea->headertype==HEADERTOP) {
+		uiDefIconBut(block, BUT, B_ACTCOPYKEYS, ICON_COPYUP,	xco,0,XIC,YIC, 0, 0, 0, 0, 0, "Copies the selected keyframes from the selected channel(s) to the buffer");
+		uiDefIconBut(block, BUT, B_ACTPASTEKEYS, ICON_PASTEUP,	xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, "Pastes the keyframes from the buffer");
+	}
+	else {
+		uiDefIconBut(block, BUT, B_ACTCOPYKEYS, ICON_COPYDOWN,	xco,0,XIC,YIC, 0, 0, 0, 0, 0, "Copies the selected keyframes from the selected channel(s) to the buffer");
+		uiDefIconBut(block, BUT, B_ACTPASTEKEYS, ICON_PASTEDOWN,	xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, "Pastes the keyframes from the buffer");
+	}
+	uiBlockEndAlign(block);
+	xco += (XIC + 8);
+	
+	/* draw AUTOSNAP */
 	if (G.saction->flag & SACTION_DRAWTIME) {
 		uiDefButS(block, MENU, B_REDR,
-				"Auto-Snap Keyframes %t|Off %x0|Second Step %x1|Nearest Second %x2|Nearest Marker %x3", 
+				"Auto-Snap Keyframes %t|No Snap %x0|Second Step Snap %x1|Nearest Second Snap %x2|Nearest Marker Snap%x3", 
 				xco,0,70,YIC, &(G.saction->autosnap), 0, 1, 0, 0, 
 				"Auto-snapping mode for keyframes when transforming");
 	}
 	else {
 		uiDefButS(block, MENU, B_REDR, 
-				"Auto-Snap Keyframes %t|Off %x0|Frame Step %x1|Nearest Frame %x2|Nearest Marker %x3", 
+				"Auto-Snap Keyframes %t|No Snap %x0|Frame Step Snap %x1|Nearest Frame Snap %x2|Nearest Marker Snap %x3", 
 				xco,0,70,YIC, &(G.saction->autosnap), 0, 1, 0, 0, 
 				"Auto-snapping mode for keyframes when transforming");
 	}
 	
 	xco += (70 + 8);
 	
-	/* COPY PASTE */
-	uiBlockBeginAlign(block);
-	if (curarea->headertype==HEADERTOP) {
-		uiDefIconBut(block, BUT, B_ACTCOPYKEYS, ICON_COPYUP,	xco,0,XIC,YIC, 0, 0, 0, 0, 0, "Copies the selected keyframes from the selected channel(s) to the buffer");
-		uiDefIconBut(block, BUT, B_ACTPASTEKEYS, ICON_PASTEUP,	xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, "Pastes the keyframes from the buffer");
-	}
-	else {
-		uiDefIconBut(block, BUT, B_ACTCOPYKEYS, ICON_COPYDOWN,	xco,0,XIC,YIC, 0, 0, 0, 0, 0, "Copies the selected keyframes from the selected channel(s) to the buffer");
-		uiDefIconBut(block, BUT, B_ACTPASTEKEYS, ICON_PASTEDOWN,	xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, "Pastes the keyframes from the buffer");
-	}
-	uiBlockEndAlign(block);
-	xco += (XIC + 8);
-	
 	/* draw LOCK */
 	uiDefIconButS(block, ICONTOG, 1, ICON_UNLOCKED,	xco, 0, XIC, YIC, 
 				  &(G.saction->lock), 0, 0, 0, 0,