[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23790] trunk/blender: *Moved the texture reordering buttons to the side

[William Reynish]

Revision: 23790
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23790
Author:   billrey
Date:     2009-10-12 19:00:38 +0200 (Mon, 12 Oct 2009)

Log Message:
-----------
*Moved the texture reordering buttons to the side
*Use same icons for reordering in constraints, modifiers.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/buttons_texture.py
    trunk/blender/source/blender/editors/interface/interface_templates.c

Modified: trunk/blender/release/scripts/ui/buttons_texture.py
===================================================================
--- trunk/blender/release/scripts/ui/buttons_texture.py	2009-10-12 16:51:36 UTC (rev 23789)
+++ trunk/blender/release/scripts/ui/buttons_texture.py	2009-10-12 17:00:38 UTC (rev 23790)
@@ -67,18 +67,20 @@
 
 		if idblock:
 			row = layout.row()
+			
 			row.template_list(idblock, "textures", idblock, "active_texture_index", rows=2)
 			
+			col = row.column(align=True)
+			col.item_enumO("texture.slot_move", "type", 'UP', text="", icon='ICON_TRIA_UP')
+			col.item_enumO("texture.slot_move", "type", 'DOWN', text="", icon='ICON_TRIA_DOWN')
+			
+			
 		split = layout.split(percentage=0.65)
 
 		if idblock:
 			split.template_ID(idblock, "active_texture", new="texture.new")
 		elif tex:
 			split.template_ID(space, "pin_id")
-		
-		row = split.row(align=True)
-		row.item_enumO("texture.slot_move", "type", 'UP', text="", icon='ICON_TRIA_UP')
-		row.item_enumO("texture.slot_move", "type", 'DOWN', text="", icon='ICON_TRIA_DOWN')
 
 		if (not space.pin_id) and (
 			context.sculpt_object or

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2009-10-12 16:51:36 UTC (rev 23789)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2009-10-12 17:00:38 UTC (rev 23790)
@@ -560,14 +560,14 @@
 	if(!isVirtual) {
 		/* XXX uiBlockSetCol(block, TH_BUT_ACTION); */
 		uiBlockBeginAlign(block);
-		uiItemO(row, "", VICON_MOVE_UP, "OBJECT_OT_modifier_move_up");
-		uiItemO(row, "", VICON_MOVE_DOWN, "OBJECT_OT_modifier_move_down");
+		uiItemO(row, "", ICON_TRIA_UP, "OBJECT_OT_modifier_move_up");
+		uiItemO(row, "", ICON_TRIA_DOWN, "OBJECT_OT_modifier_move_down");
 		uiBlockEndAlign(block);
 		
 		uiBlockSetEmboss(block, UI_EMBOSSN);
 
 		if(modifier_can_delete(md))
-			uiItemO(row, "", VICON_X, "OBJECT_OT_modifier_remove");
+			uiItemO(row, "", ICON_X, "OBJECT_OT_modifier_remove");
 
 		/* XXX uiBlockSetCol(block, TH_AUTO); */
 	}
@@ -923,10 +923,10 @@
 				uiBlockSetEmboss(block, UI_EMBOSS);
 				
 				if (show_upbut)
-					uiDefIconButO(block, BUT, "CONSTRAINT_OT_move_up", WM_OP_INVOKE_DEFAULT, VICON_MOVE_UP, xco+width-50, yco, 16, 18, "Move constraint up in constraint stack");
+					uiDefIconButO(block, BUT, "CONSTRAINT_OT_move_up", WM_OP_INVOKE_DEFAULT, ICON_TRIA_UP, xco+width-50, yco, 16, 18, "Move constraint up in constraint stack");
 				
 				if (show_downbut)
-					uiDefIconButO(block, BUT, "CONSTRAINT_OT_move_down", WM_OP_INVOKE_DEFAULT, VICON_MOVE_DOWN, xco+width-50+18, yco, 16, 18, "Move constraint down in constraint stack");
+					uiDefIconButO(block, BUT, "CONSTRAINT_OT_move_down", WM_OP_INVOKE_DEFAULT, ICON_TRIA_DOWN, xco+width-50+18, yco, 16, 18, "Move constraint down in constraint stack");
 			uiBlockEndAlign(block);
 		}
 	
@@ -1184,7 +1184,7 @@
 	
 	xco = 290;
 	if(group->id.lib==0) { /* cant remove objects from linked groups */
-		but = uiDefIconBut(block, BUT, B_NOP, VICON_X, xco, 120-yco, 20, 20, NULL, 0.0, 0.0, 0.0, 0.0, "Remove Group membership");
+		but = uiDefIconBut(block, BUT, B_NOP, ICON_X, xco, 120-yco, 20, 20, NULL, 0.0, 0.0, 0.0, 0.0, "Remove Group membership");
 		uiButSetFunc(but, group_ob_rem, group, ob);
 	}
 }