[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24607] trunk/blender/release/scripts/ui/ space_view3d_toolbar.py: Toolbar reorganization
William Reynish
william at reynish.com
Tue Nov 17 13:59:55 CET 2009
Revision: 24607
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24607
Author: billrey
Date: 2009-11-17 13:59:55 +0100 (Tue, 17 Nov 2009)
Log Message:
-----------
Toolbar reorganization
Included more tools, such as Edge Slide and Shrink/Fatten in toolbar to make them easier to find.
Did some reorganization of tools in the mesh editing toolbar to categorize tools better.
Made some tools like Grease Pencil tools more compact in the UI
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_view3d_toolbar.py
Modified: trunk/blender/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d_toolbar.py 2009-11-17 12:54:29 UTC (rev 24606)
+++ trunk/blender/release/scripts/ui/space_view3d_toolbar.py 2009-11-17 12:59:55 UTC (rev 24607)
@@ -45,32 +45,38 @@
col.itemL(text="Object:")
col.itemO("object.duplicate_move")
col.itemO("object.delete")
+ col.itemO("object.join")
active_object = context.active_object
if active_object and active_object.type == 'MESH':
col = layout.column(align=True)
col.itemL(text="Shading:")
- col.itemO("object.shade_smooth", text="Smooth")
- col.itemO("object.shade_flat", text="Flat")
+ row = col.row()
+ row.itemO("object.shade_smooth", text="Smooth")
+ row.itemO("object.shade_flat", text="Flat")
col = layout.column(align=True)
col.itemL(text="Keyframes:")
- col.itemO("anim.insert_keyframe_menu", text="Insert")
- col.itemO("anim.delete_keyframe_v3d", text="Remove")
+ row = col.row()
+ row.itemO("anim.insert_keyframe_menu", text="Insert")
+ row.itemO("anim.delete_keyframe_v3d", text="Remove")
col = layout.column(align=True)
- col.itemL(text="Grease Pencil:")
- col.item_enumO("gpencil.draw", "mode", 'DRAW', text="Draw Freehand")
- col.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT', text="Straight Line")
- col.item_enumO("gpencil.draw", "mode", 'ERASER', text="Eraser")
-
- col = layout.column(align=True)
col.itemL(text="Repeat:")
col.itemO("screen.repeat_last")
col.itemO("screen.repeat_history", text="History...")
- col.itemO("screen.redo_last", text="Tweak...")
+ col = layout.column(align=True)
+ col.itemL(text="Grease Pencil:")
+ row = col.row()
+ row.item_enumO("gpencil.draw", "mode", 'DRAW', text="Draw")
+ row.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT', text="Line")
+ row.item_enumO("gpencil.draw", "mode", 'ERASER', text="Erase")
+
+
+
+
# ********** default tools for editmode_mesh ****************
@@ -86,27 +92,35 @@
col.itemO("tfm.translate")
col.itemO("tfm.rotate")
col.itemO("tfm.resize", text="Scale")
+ col.itemO("tfm.shrink_fatten", text="Along Normal")
+
col = layout.column(align=True)
- col.itemL(text="Mesh:")
- col.itemO("mesh.duplicate_move")
- col.itemO("mesh.delete")
+ col.itemL(text="Deform:")
+ col.itemO("tfm.edge_slide")
+ col.itemO("mesh.rip_move")
+ col.itemO("mesh.vertices_smooth")
+
col = layout.column(align=True)
- col.itemL(text="Modeling:")
+ col.itemL(text="Add:")
col.itemO("mesh.extrude_move")
col.itemO("mesh.subdivide")
col.itemO("mesh.loopcut")
+ col.itemO("mesh.duplicate_move")
col.itemO("mesh.spin")
col.itemO("mesh.screw")
+
+ col = layout.column(align=True)
+ col.itemL(text="Remove:")
+ col.itemO("mesh.delete")
col.itemO("mesh.merge")
- col.itemO("mesh.rip_move")
- col.itemO("mesh.flip_normals")
-
+ col.itemO("mesh.remove_doubles")
+
col = layout.column(align=True)
- col.itemL(text="Shading:")
- col.itemO("mesh.faces_shade_smooth", text="Smooth")
- col.itemO("mesh.faces_shade_flat", text="Flat")
+ col.itemL(text="Normals:")
+ col.itemO("mesh.normals_make_consistent", text="Recalculate")
+ col.itemO("mesh.flip_normals", text="Flip Direction")
col = layout.column(align=True)
col.itemL(text="UV Mapping:")
@@ -114,20 +128,26 @@
col.itemO("mesh.uvs_rotate")
col.itemO("mesh.uvs_mirror")
-
+
col = layout.column(align=True)
- col.itemL(text="Grease Pencil:")
- col.item_enumO("gpencil.draw", "mode", 'DRAW', text="Draw Freehand")
- col.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT', text="Straight Line")
- col.item_enumO("gpencil.draw", "mode", 'ERASER', text="Eraser")
-
+ col.itemL(text="Shading:")
+ row = col.row()
+ row.itemO("mesh.faces_shade_smooth", text="Smooth")
+ row.itemO("mesh.faces_shade_flat", text="Flat")
+
col = layout.column(align=True)
col.itemL(text="Repeat:")
col.itemO("screen.repeat_last")
col.itemO("screen.repeat_history", text="History...")
- col.itemO("screen.redo_last", text="Tweak...")
+ col = layout.column(align=True)
+ col.itemL(text="Grease Pencil:")
+ row = col.row()
+ row.item_enumO("gpencil.draw", "mode", 'DRAW', text="Draw")
+ row.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT', text="Line")
+ row.item_enumO("gpencil.draw", "mode", 'ERASER', text="Erase")
+
class VIEW3D_PT_tools_meshedit_options(View3DPanel):
bl_context = "mesh_edit"
bl_label = "Mesh Options"
@@ -177,19 +197,22 @@
col.itemL(text="Modeling:")
col.itemO("curve.extrude")
col.itemO("curve.subdivide")
-
+
col = layout.column(align=True)
- col.itemL(text="Grease Pencil:")
- col.item_enumO("gpencil.draw", "mode", 'DRAW', text="Draw Freehand")
- col.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT', text="Straight Line")
- col.item_enumO("gpencil.draw", "mode", 'ERASER', text="Eraser")
-
- col = layout.column(align=True)
col.itemL(text="Repeat:")
col.itemO("screen.repeat_last")
col.itemO("screen.repeat_history", text="History...")
- col.itemO("screen.redo_last", text="Tweak...")
+ col = layout.column(align=True)
+ col.itemL(text="Grease Pencil:")
+ row = col.row()
+ row.item_enumO("gpencil.draw", "mode", 'DRAW', text="Draw")
+ row.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT', text="Line")
+ row.item_enumO("gpencil.draw", "mode", 'ERASER', text="Erase")
+
+
+
+
# ********** default tools for editmode_surface ****************
@@ -217,19 +240,22 @@
col.itemL(text="Modeling:")
col.itemO("curve.extrude")
col.itemO("curve.subdivide")
-
+
col = layout.column(align=True)
- col.itemL(text="Grease Pencil:")
- col.item_enumO("gpencil.draw", "mode", 'DRAW', text="Draw Freehand")
- col.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT', text="Straight Line")
- col.item_enumO("gpencil.draw", "mode", 'ERASER', text="Eraser")
-
- col = layout.column(align=True)
col.itemL(text="Repeat:")
col.itemO("screen.repeat_last")
col.itemO("screen.repeat_history", text="History...")
- col.itemO("screen.redo_last", text="Tweak...")
+ col = layout.column(align=True)
+ col.itemL(text="Grease Pencil:")
+ row = col.row()
+ row.item_enumO("gpencil.draw", "mode", 'DRAW', text="Draw")
+ row.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT', text="Line")
+ row.item_enumO("gpencil.draw", "mode", 'ERASER', text="Erase")
+
+
+
+
# ********** default tools for editmode_text ****************
@@ -245,18 +271,24 @@
col.itemO("font.text_copy", text="Copy")
col.itemO("font.text_cut", text="Cut")
col.itemO("font.text_paste", text="Paste")
-
+
col = layout.column(align=True)
- col.itemL(text="Style:")
- col.itemO("font.case_set")
- col.itemO("font.style_toggle")
-
- col = layout.column(align=True)
col.itemL(text="Repeat:")
col.itemO("screen.repeat_last")
col.itemO("screen.repeat_history", text="History...")
- col.itemO("screen.redo_last", text="Tweak...")
+
+ col = layout.column(align=True)
+ col.itemL(text="Set Case:")
+ col.item_enumO("font.case_set", "case", 'UPPER', text="To Upper")
+ col.item_enumO("font.case_set", "case", 'LOWER', text="To Lower")
+
+ col = layout.column(align=True)
+ col.itemL(text="Style:")
+ col.item_enumO("font.style_toggle", "style", 'BOLD')
+ col.item_enumO("font.style_toggle", "style", 'ITALIC')
+ col.item_enumO("font.style_toggle", "style", 'UNDERLINE')
+
# ********** default tools for editmode_armature ****************
@@ -285,18 +317,21 @@
col.itemO("armature.subdivide_multi", text="Subdivide")
col = layout.column(align=True)
- col.itemL(text="Grease Pencil:")
- col.item_enumO("gpencil.draw", "mode", 'DRAW', text="Draw Freehand")
- col.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT', text="Straight Line")
- col.item_enumO("gpencil.draw", "mode", 'ERASER', text="Eraser")
-
- col = layout.column(align=True)
col.itemL(text="Repeat:")
col.itemO("screen.repeat_last")
col.itemO("screen.repeat_history", text="History...")
- col.itemO("screen.redo_last", text="Tweak...")
+ col = layout.column(align=True)
+ col.itemL(text="Grease Pencil:")
+ row = col.row()
+ row.item_enumO("gpencil.draw", "mode", 'DRAW', text="Draw")
+ row.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT', text="Line")
+ row.item_enumO("gpencil.draw", "mode", 'ERASER', text="Erase")
+
+
+
+
class VIEW3D_PT_tools_armatureedit_options(View3DPanel):
bl_context = "armature_edit"
bl_label = "Armature Options"
@@ -324,19 +359,22 @@
col.itemO("tfm.translate")
col.itemO("tfm.rotate")
col.itemO("tfm.resize", text="Scale")
-
+
col = layout.column(align=True)
- col.itemL(text="Grease Pencil:")
- col.item_enumO("gpencil.draw", "mode", 'DRAW', text="Draw Freehand")
- col.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT', text="Straight Line")
- col.item_enumO("gpencil.draw", "mode", 'ERASER', text="Eraser")
-
- col = layout.column(align=True)
col.itemL(text="Repeat:")
col.itemO("screen.repeat_last")
col.itemO("screen.repeat_history", text="History...")
- col.itemO("screen.redo_last", text="Tweak...")
+ col = layout.column(align=True)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list