[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22732] branches/blender2.5/blender: Made menu text more consistent, using '...' when a menu item spawns a popup or confirmation, and removing redundant starting words in submenus.
William Reynish
william at reynish.com
Mon Aug 24 02:01:10 CEST 2009
Revision: 22732
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22732
Author: billrey
Date: 2009-08-24 02:01:09 +0200 (Mon, 24 Aug 2009)
Log Message:
-----------
Made menu text more consistent, using '...' when a menu item spawns a popup or confirmation, and removing redundant starting words in submenus.
Also added notifiers for user prefs, and tweaked wave modifier layout.
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/buttons_data_modifier.py
branches/blender2.5/blender/release/ui/space_view3d.py
branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c
Modified: branches/blender2.5/blender/release/ui/buttons_data_modifier.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_modifier.py 2009-08-23 22:22:58 UTC (rev 22731)
+++ branches/blender2.5/blender/release/ui/buttons_data_modifier.py 2009-08-24 00:01:09 UTC (rev 22732)
@@ -397,20 +397,30 @@
col = split.column()
col.itemR(md, "normals")
- sub = col.row(align=True)
+ sub = col.column()
sub.active = md.normals
- sub.itemR(md, "x_normal", text="X", toggle=True)
- sub.itemR(md, "y_normal", text="Y", toggle=True)
- sub.itemR(md, "z_normal", text="Z", toggle=True)
+ sub.itemR(md, "x_normal", text="X")
+ sub.itemR(md, "y_normal", text="Y")
+ sub.itemR(md, "z_normal", text="Z")
- flow = layout.column_flow()
- flow.itemR(md, "time_offset")
- flow.itemR(md, "lifetime")
- flow.itemR(md, "damping_time")
- flow.itemR(md, "falloff_radius")
- flow.itemR(md, "start_position_x")
- flow.itemR(md, "start_position_y")
+ split = layout.split()
+
+ col = split.column()
+ col.itemL(text="Time:")
+ sub = col.column(align=True)
+ sub.itemR(md, "time_offset", text="Offset")
+ sub.itemR(md, "lifetime", text="Life")
+ col.itemR(md, "damping_time", text="Damping")
+ col = split.column()
+ col.itemL(text="Position:")
+ sub = col.column(align=True)
+ sub.itemR(md, "start_position_x", text="X")
+ sub.itemR(md, "start_position_y", text="Y")
+ col.itemR(md, "falloff_radius", text="Falloff")
+
+ layout.itemS()
+
layout.itemR(md, "start_position_object")
layout.item_pointerR(md, "vertex_group", ob, "vertex_groups")
layout.itemR(md, "texture")
@@ -420,6 +430,8 @@
elif md.texture_coordinates == 'OBJECT':
layout.itemR(md, "texture_coordinates_object")
+ layout.itemS()
+
flow = layout.column_flow()
flow.itemR(md, "speed", slider=True)
flow.itemR(md, "height", slider=True)
Modified: branches/blender2.5/blender/release/ui/space_view3d.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_view3d.py 2009-08-23 22:22:58 UTC (rev 22731)
+++ branches/blender2.5/blender/release/ui/space_view3d.py 2009-08-24 00:01:09 UTC (rev 22732)
@@ -60,15 +60,15 @@
def draw(self, context):
layout = self.layout
- layout.itemO("view3d.snap_selected_to_grid")
- layout.itemO("view3d.snap_selected_to_cursor")
- layout.itemO("view3d.snap_selected_to_center")
+ layout.itemO("view3d.snap_selected_to_grid", text="Selection to Grid")
+ layout.itemO("view3d.snap_selected_to_cursor", text="Selection to Cursor")
+ layout.itemO("view3d.snap_selected_to_center", text="Selection to Center")
layout.itemS()
- layout.itemO("view3d.snap_cursor_to_selected")
- layout.itemO("view3d.snap_cursor_to_grid")
- layout.itemO("view3d.snap_cursor_to_active")
+ layout.itemO("view3d.snap_cursor_to_selected", text="Cursor to Selected")
+ layout.itemO("view3d.snap_cursor_to_grid", text="Cursor to Grid")
+ layout.itemO("view3d.snap_cursor_to_active", text="Cursor to Active")
# ********** View menus **********
@@ -104,8 +104,8 @@
layout.operator_context = "INVOKE_REGION_WIN"
- layout.itemO("view3d.clip_border")
- layout.itemO("view3d.zoom_border")
+ layout.itemO("view3d.clip_border", text="Clipping Border...")
+ layout.itemO("view3d.zoom_border", text="Zoom Border...")
layout.itemS()
@@ -168,8 +168,8 @@
layout.itemO("object.select_inverse", text="Inverse")
layout.itemO("object.select_random", text="Random")
layout.itemO("object.select_by_layer", text="Select All by Layer")
- layout.item_enumO("object.select_by_type", "type", "", text="Select All by Type")
- layout.itemO("object.select_grouped", text="Select Grouped")
+ layout.item_enumO("object.select_by_type", "type", "", text="Select All by Type...")
+ layout.itemO("object.select_grouped", text="Select Grouped...")
class VIEW3D_MT_select_POSE(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
@@ -178,7 +178,7 @@
def draw(self, context):
layout = self.layout
- layout.itemO("view3d.select_border")
+ layout.itemO("view3d.select_border", text="Border Select...")
layout.itemS()
@@ -227,7 +227,7 @@
def draw(self, context):
layout = self.layout
- layout.itemO("view3d.select_border")
+ layout.itemO("view3d.select_border", text="Border Select...")
layout.itemS()
@@ -271,8 +271,8 @@
def draw(self, context):
layout = self.layout
- layout.itemO("view3d.select_border")
- layout.itemO("view3d.select_circle")
+ layout.itemO("view3d.select_border", text="Border Select...")
+ layout.itemO("view3d.select_circle", text="Circle Select...")
layout.itemS()
@@ -300,8 +300,8 @@
def draw(self, context):
layout = self.layout
- layout.itemO("view3d.select_border")
- layout.itemO("view3d.select_circle")
+ layout.itemO("view3d.select_border", text="Border Select...")
+ layout.itemO("view3d.select_circle", text="Circle Select...")
layout.itemS()
@@ -357,7 +357,7 @@
def draw(self, context):
layout = self.layout
- layout.itemO("view3d.select_border")
+ layout.itemO("view3d.select_border", text="Border Select...")
layout.itemS()
@@ -403,15 +403,15 @@
layout.itemS()
- layout.itemO("anim.insert_keyframe_menu")
- layout.itemO("anim.delete_keyframe_v3d")
+ layout.itemO("anim.insert_keyframe_menu", text="Insert Keyframe...")
+ layout.itemO("anim.delete_keyframe_v3d", text="Delete Keyframe...")
layout.itemS()
layout.itemO("object.duplicate")
layout.item_booleanO("object.duplicate", "linked", True, text="Duplicate Linked")
- layout.itemO("object.delete")
- layout.itemO("object.proxy_make")
+ layout.itemO("object.delete", text="Delete...")
+ layout.itemO("object.proxy_make", text="Make Proxy...")
layout.itemS()
@@ -435,10 +435,10 @@
def draw(self, context):
layout = self.layout
- layout.itemO("object.location_clear")
- layout.itemO("object.rotation_clear")
- layout.itemO("object.scale_clear")
- layout.itemO("object.origin_clear")
+ layout.itemO("object.location_clear", text="Location")
+ layout.itemO("object.rotation_clear", text="Rotation")
+ layout.itemO("object.scale_clear", text="Scale")
+ layout.itemO("object.origin_clear", text="Origin")
class VIEW3D_MT_OBJECT_parent(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
@@ -447,8 +447,8 @@
def draw(self, context):
layout = self.layout
- layout.itemO("object.parent_set")
- layout.itemO("object.parent_clear")
+ layout.itemO("object.parent_set", text="Set")
+ layout.itemO("object.parent_clear", text="Clear")
class VIEW3D_MT_OBJECT_track(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
@@ -457,8 +457,8 @@
def draw(self, context):
layout = self.layout
- layout.itemO("object.track_set")
- layout.itemO("object.track_clear")
+ layout.itemO("object.track_set", text="Set")
+ layout.itemO("object.track_clear", text="Clear")
class VIEW3D_MT_OBJECT_group(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
@@ -595,8 +595,8 @@
layout.itemS()
- layout.itemO("anim.insert_keyframe_menu")
- layout.itemO("anim.delete_keyframe_v3d")
+ layout.itemO("anim.insert_keyframe_menu", text="Insert Keyframe...")
+ layout.itemO("anim.delete_keyframe_v3d", text="Delete Keyframe...")
layout.itemS()
@@ -629,8 +629,8 @@
layout.itemS()
- layout.itemO("pose.armature_layers")
- layout.itemO("pose.bone_layers")
+ layout.itemO("pose.armature_layers", text="Change Armature Layers...")
+ layout.itemO("pose.bone_layers", text="Change Bone Layers...")
layout.itemS()
@@ -644,13 +644,13 @@
def draw(self, context):
layout = self.layout
- layout.itemL(text="Clear User Transform")
+ layout.itemL(text="User Transform")
- layout.itemO("pose.loc_clear")
- layout.itemO("pose.rot_clear")
- layout.itemO("pose.scale_clear")
+ layout.itemO("pose.loc_clear", text="Location")
+ layout.itemO("pose.rot_clear", text="Rotation")
+ layout.itemO("pose.scale_clear", text="Scale")
- layout.itemL(text="Clear Origin")
+ layout.itemL(text="Origin")
class VIEW3D_MT_POSE_pose(bpy.types.Menu):
__space_type__ = "VIEW_3D"
@@ -659,13 +659,13 @@
def draw(self, context):
layout = self.layout
- layout.itemO("poselib.browse_interactive")
+ layout.itemO("poselib.browse_interactive", text="Browse Poses...")
layout.itemS()
- layout.itemO("poselib.pose_add")
- layout.itemO("poselib.pose_rename")
- layout.itemO("poselib.pose_remove")
+ layout.itemO("poselib.pose_add", text="Add Pose...")
+ layout.itemO("poselib.pose_rename", text="Rename Pose...")
+ layout.itemO("poselib.pose_remove", text="Remove Pose...")
class VIEW3D_MT_POSE_motion(bpy.types.Menu):
__space_type__ = "VIEW_3D"
@@ -674,8 +674,8 @@
def draw(self, context):
layout = self.layout
- layout.itemO("pose.paths_calculate")
- layout.itemO("pose.paths_clear")
+ layout.itemO("pose.paths_calculate", text="Calculate")
+ layout.itemO("pose.paths_clear", text="Clear")
class VIEW3D_MT_POSE_group(bpy.types.Menu):
__space_type__ = "VIEW_3D"
@@ -683,12 +683,15 @@
def draw(self, context):
layout = self.layout
+ layout.itemO("pose.group_add")
+ layout.itemO("pose.group_remove")
+ layout.itemS()
+
layout.itemO("pose.group_assign")
- layout.itemO("pose.group_add")
layout.itemO("pose.group_unassign")
- layout.itemO("pose.group_remove")
+
class VIEW3D_MT_POSE_ik(bpy.types.Menu):
__space_type__ = "VIEW_3D"
__label__ = "Inverse Kinematics"
@@ -706,7 +709,7 @@
def draw(self, context):
layout = self.layout
- layout.itemO("pose.constraint_add_with_targets")
+ layout.itemO("pose.constraint_add_with_targets", text="Add (With Targets)...")
layout.itemO("pose.constraints_clear")
class VIEW3D_MT_POSE_showhide(VIEW3D_MT_showhide):
@@ -733,13 +736,13 @@
layout.itemS()
- layout.itemO("uv.mapping_menu")
+ layout.itemO("uv.mapping_menu", text="UV Unwrap...")
layout.itemS()
layout.itemO("mesh.extrude")
layout.itemO("mesh.duplicate")
- layout.itemO("mesh.delete")
+ layout.itemO("mesh.delete", text="Delete...")
layout.itemS()
@@ -784,7 +787,6 @@
layout.itemO("mesh.edge_face_add")
layout.itemO("mesh.subdivide")
- layout.item_floatO("mesh.subdivide", "smoothness", 1.0, text="Subdivide Smooth")
layout.itemS()
@@ -857,7 +859,7 @@
layout.itemO("curve.separate")
layout.itemO("curve.make_segment")
layout.itemO("curve.cyclic_toggle")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list