diff options
author | William Reynish <william@reynish.com> | 2009-10-12 21:00:38 +0400 |
---|---|---|
committer | William Reynish <william@reynish.com> | 2009-10-12 21:00:38 +0400 |
commit | 6b03b4285c005287f694aee75f85e9175fe44157 (patch) | |
tree | 93a1ca841ef523383e5357ab9f6dc2e303753410 | |
parent | 9c7fe13a575d73e21883164e06e8ff179aa2e907 (diff) |
*Moved the texture reordering buttons to the side
*Use same icons for reordering in constraints, modifiers.
-rw-r--r-- | release/scripts/ui/buttons_texture.py | 10 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_templates.c | 12 |
2 files changed, 12 insertions, 10 deletions
diff --git a/release/scripts/ui/buttons_texture.py b/release/scripts/ui/buttons_texture.py index a748a7ea155..5efdaf77839 100644 --- a/release/scripts/ui/buttons_texture.py +++ b/release/scripts/ui/buttons_texture.py @@ -67,18 +67,20 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel): 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 diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 7f768a42956..c092b1ca68b 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -560,14 +560,14 @@ static uiLayout *draw_modifier(uiLayout *layout, Object *ob, ModifierData *md, i 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 @@ static uiLayout *draw_constraint(uiLayout *layout, Object *ob, bConstraint *con) 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 @@ uiLayout *uiTemplateGroup(uiLayout *layout, Object *ob, Group *group) 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); } } |