[Bf-blender-cvs] [cc2cdfb] master: Code cleanup: de-triplicate add menu/toolbars, also style edits
Campbell Barton
noreply at git.blender.org
Wed Mar 19 15:34:36 CET 2014
Commit: cc2cdfb08a969f3f6728ba56f83aabe5f0b16c6b
Author: Campbell Barton
Date: Thu Mar 20 01:32:44 2014 +1100
https://developer.blender.org/rBcc2cdfb08a969f3f6728ba56f83aabe5f0b16c6b
Code cleanup: de-triplicate add menu/toolbars, also style edits
===================================================================
M release/scripts/startup/bl_ui/properties_mask_common.py
M release/scripts/startup/bl_ui/space_clip.py
M release/scripts/startup/bl_ui/space_userpref.py
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_mask_common.py b/release/scripts/startup/bl_ui/properties_mask_common.py
index 4af311d..cd659e1 100644
--- a/release/scripts/startup/bl_ui/properties_mask_common.py
+++ b/release/scripts/startup/bl_ui/properties_mask_common.py
@@ -308,8 +308,8 @@ class MASK_PT_add():
layout = self.layout
col = layout.column(align=True)
- col.operator("mask.primitive_circle_add", icon="MESH_CIRCLE")
- col.operator("mask.primitive_square_add", icon="MESH_PLANE")
+ col.operator("mask.primitive_circle_add", icon='MESH_CIRCLE')
+ col.operator("mask.primitive_square_add", icon='MESH_PLANE')
class MASK_MT_mask(Menu):
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index dc01c2c..bcc68c0 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -371,10 +371,10 @@ class CLIP_PT_tools_tracking(CLIP_PT_tracking_panel, Panel):
row.label(text="Clear:")
row.scale_x = 2.0
- props = row.operator("clip.clear_track_path", icon="BACK", text="")
+ props = row.operator("clip.clear_track_path", text="", icon='BACK')
props.action = 'UPTO'
- props = row.operator("clip.clear_track_path", icon="FORWARD", text="")
+ props = row.operator("clip.clear_track_path", text="", icon='FORWARD')
props.action = 'REMAINED'
col = layout.column()
@@ -382,10 +382,10 @@ class CLIP_PT_tools_tracking(CLIP_PT_tracking_panel, Panel):
row.label(text="Refine:")
row.scale_x = 2.0
- props = row.operator("clip.refine_markers", icon='LOOP_BACK', text="")
+ props = row.operator("clip.refine_markers", text="", icon='LOOP_BACK')
props.backwards = True
- props = row.operator("clip.refine_markers", icon='LOOP_FORWARDS', text="")
+ props = row.operator("clip.refine_markers", text="", icon='LOOP_FORWARDS')
props.backwards = False
col = layout.column(align=True)
@@ -794,7 +794,7 @@ class CLIP_PT_display(CLIP_PT_clip_view_panel, Panel):
row.separator()
row.prop(sc, "use_grayscale_preview", text="B/W", toggle=True)
row.separator()
- row.prop(sc, "use_mute_footage", text="", icon="VISIBLE_IPO_ON", toggle=True)
+ row.prop(sc, "use_mute_footage", text="", icon='VISIBLE_IPO_ON', toggle=True)
col = layout.column(align=True)
col.prop(sc.clip_user, "use_render_undistorted", text="Render Undistorted")
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 832c426..18f7c53 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -61,7 +61,7 @@ class USERPREF_HT_header(Header):
layout.operator("wm.keyconfig_import")
layout.operator("wm.keyconfig_export")
elif userpref.active_section == 'ADDONS':
- layout.operator("wm.addon_install", icon="FILESEL")
+ layout.operator("wm.addon_install", icon='FILESEL')
layout.operator("wm.addon_refresh", icon='FILE_REFRESH')
layout.menu("USERPREF_MT_addons_dev_guides")
elif userpref.active_section == 'THEMES':
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 8d5170a..5a76f1d 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -880,20 +880,13 @@ class INFO_MT_mesh_add(Menu):
bl_label = "Mesh"
def draw(self, context):
+ from .space_view3d_toolbar import VIEW3D_PT_tools_add_object
+
layout = self.layout
layout.operator_context = 'INVOKE_REGION_WIN'
- layout.operator("mesh.primitive_plane_add", icon='MESH_PLANE', text="Plane")
- layout.operator("mesh.primitive_cube_add", icon='MESH_CUBE', text="Cube")
- layout.operator("mesh.primitive_circle_add", icon='MESH_CIRCLE', text="Circle")
- layout.operator("mesh.primitive_uv_sphere_add", icon='MESH_UVSPHERE', text="UV Sphere")
- layout.operator("mesh.primitive_ico_sphere_add", icon='MESH_ICOSPHERE', text="Icosphere")
- layout.operator("mesh.primitive_cylinder_add", icon='MESH_CYLINDER', text="Cylinder")
- layout.operator("mesh.primitive_cone_add", icon='MESH_CONE', text="Cone")
- layout.separator()
- layout.operator("mesh.primitive_grid_add", icon='MESH_GRID', text="Grid")
- layout.operator("mesh.primitive_monkey_add", icon='MESH_MONKEY', text="Monkey")
- layout.operator("mesh.primitive_torus_add", icon='MESH_TORUS', text="Torus")
+
+ VIEW3D_PT_tools_add_object.draw_add_mesh(layout)
class INFO_MT_curve_add(Menu):
@@ -901,14 +894,13 @@ class INFO_MT_curve_add(Menu):
bl_label = "Curve"
def draw(self, context):
+ from .space_view3d_toolbar import VIEW3D_PT_tools_add_object
layout = self.layout
layout.operator_context = 'INVOKE_REGION_WIN'
- layout.operator("curve.primitive_bezier_curve_add", icon='CURVE_BEZCURVE', text="Bezier")
- layout.operator("curve.primitive_bezier_circle_add", icon='CURVE_BEZCIRCLE', text="Circle")
- layout.operator("curve.primitive_nurbs_curve_add", icon='CURVE_NCURVE', text="Nurbs Curve")
- layout.operator("curve.primitive_nurbs_circle_add", icon='CURVE_NCIRCLE', text="Nurbs Circle")
- layout.operator("curve.primitive_nurbs_path_add", icon='CURVE_PATH', text="Path")
+
+ VIEW3D_PT_tools_add_object.draw_add_curve(layout)
+
class INFO_MT_surface_add(Menu):
@@ -916,15 +908,12 @@ class INFO_MT_surface_add(Menu):
bl_label = "Surface"
def draw(self, context):
+ from .space_view3d_toolbar import VIEW3D_PT_tools_add_object
layout = self.layout
layout.operator_context = 'INVOKE_REGION_WIN'
- layout.operator("surface.primitive_nurbs_surface_curve_add", icon='SURFACE_NCURVE', text="NURBS Curve")
- layout.operator("surface.primitive_nurbs_surface_circle_add", icon='SURFACE_NCIRCLE', text="NURBS Circle")
- layout.operator("surface.primitive_nurbs_surface_surface_add", icon='SURFACE_NSURFACE', text="NURBS Surface")
- layout.operator("surface.primitive_nurbs_surface_cylinder_add", icon='SURFACE_NCYLINDER', text="NURBS Cylinder")
- layout.operator("surface.primitive_nurbs_surface_sphere_add", icon='SURFACE_NSPHERE', text="NURBS Sphere")
- layout.operator("surface.primitive_nurbs_surface_torus_add", icon='SURFACE_NTORUS', text="NURBS Torus")
+
+ VIEW3D_PT_tools_add_object.draw_add_surface(layout)
class INFO_MT_metaball_add(Menu):
@@ -3144,7 +3133,7 @@ class VIEW3D_PT_transform_orientations(Panel):
if orientation:
row = layout.row(align=True)
row.prop(orientation, "name", text="")
- row.operator("transform.delete_orientation", text="", icon="X")
+ row.operator("transform.delete_orientation", text="", icon='X')
class VIEW3D_PT_etch_a_ton(Panel):
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index cc85471..e39d719 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -123,45 +123,93 @@ class VIEW3D_PT_tools_objectmode(View3DPanel, Panel):
draw_repeat_tools(context, layout)
-class VIEW3D_PT_tools_add_mesh(View3DPanel, Panel):
+class VIEW3D_PT_tools_add_object(View3DPanel, Panel):
bl_category = "Create"
bl_context = "objectmode"
bl_label = "Add Primitive"
+ @staticmethod
+ def draw_add_mesh(layout, label=False):
+ if label:
+ layout.label(text="Primitives:")
+ layout.operator("mesh.primitive_plane_add", text="Plane", icon='MESH_PLANE')
+ layout.operator("mesh.primitive_cube_add", text="Cube", icon='MESH_CUBE')
+ layout.operator("mesh.primitive_circle_add", text="Circle", icon='MESH_CIRCLE')
+ layout.operator("mesh.primitive_uv_sphere_add", text="UV Sphere", icon='MESH_UVSPHERE')
+ layout.operator("mesh.primitive_ico_sphere_add", text="Ico Sphere", icon='MESH_ICOSPHERE')
+ layout.operator("mesh.primitive_cylinder_add", text="Cylinder", icon='MESH_CYLINDER')
+ layout.operator("mesh.primitive_cone_add", text="Cone", icon='MESH_CONE')
+ layout.operator("mesh.primitive_torus_add", text="Torus", icon='MESH_TORUS')
+
+ if label:
+ layout.label(text="Special:")
+ else:
+ layout.separator()
+ layout.operator("mesh.primitive_grid_add", text="Grid", icon='MESH_GRID')
+ layout.operator("mesh.primitive_monkey_add", text="Monkey", icon='MESH_MONKEY')
+
+ @staticmethod
+ def draw_add_curve(layout, label=False):
+ if label:
+ layout.label(text="Bezier:")
+ layout.operator("curve.primitive_bezier_curve_add", text="Bezier", icon='CURVE_BEZCURVE')
+ layout.operator("curve.primitive_bezier_circle_add", text="Circle", icon='CURVE_BEZCIRCLE')
+
+ if label:
+ layout.label(text="Nurbs:")
+ else:
+ layout.separator()
+ layout.operator("curve.primitive_nurbs_curve_add", text="Nurbs Curve", icon='CURVE_NCURVE')
+ layout.operator("curve.primitive_nurbs_circle_add", text="Nurbs Circle", icon='CURVE_NCIRCLE')
+ layout.operator("curve.primitive_nurbs_path_add", text="Path", icon='CURVE_PATH')
+
+ @staticmethod
+ def draw_add_surface(layout):
+ layout.operator("surface.primitive_nurbs_surface_curve_add", text="Nurbs Curve", icon='SURFACE_NCURVE')
+ layout.operator("surface.primitive_nurbs_surface_circle_add", text="Nurbs Circle", icon='SURFACE_NCIRCLE')
+ layout.operator("surface.primitive_nurbs_surface_surface_add", text="Nurbs Surface", icon='SURFACE_NSURFACE')
+ layout.operator("surface.primitive_nurbs_surface_cylinder_add", text="Nurbs Cylinder", icon='SURFACE_NCYLINDER')
+ layout.operator("surface.primitive_nurbs_surface_sphere
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list