Revision: 23247 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23247 Author: billrey Date: 2009-09-15 14:45:05 +0200 (Tue, 15 Sep 2009)
Log Message: ----------- UI tweaks *Cleaned up Transform panel in n-key area. It's now single column so that this view can be nice and slim, while you can still access everything. This is especially important in edit mode where you cannot change the transform values numerically from the Properties. Transform properties don't seem to work for Metaball edit yet, so wasn't able to test this *Removed some lingering tools in curve transform and put them in the toolbar instead. *Improved alignment in toolbar *Made Image Properties use regular checkmark toggle buttons *Added Delete as an alternative to X key, as it was in 2.4x Modified Paths: -------------- trunk/blender/release/ui/space_view3d.py trunk/blender/release/ui/space_view3d_toolbar.py trunk/blender/source/blender/editors/metaball/mball_ops.c trunk/blender/source/blender/editors/object/object_ops.c trunk/blender/source/blender/editors/space_image/image_buttons.c trunk/blender/source/blender/editors/space_node/node_ops.c trunk/blender/source/blender/editors/space_view3d/space_view3d.c trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c Modified: trunk/blender/release/ui/space_view3d.py =================================================================== --- trunk/blender/release/ui/space_view3d.py 2009-09-15 11:35:10 UTC (rev 23246) +++ trunk/blender/release/ui/space_view3d.py 2009-09-15 12:45:05 UTC (rev 23247) @@ -1136,16 +1136,17 @@ scene = context.scene col = layout.column() - col.itemR(view, "camera") + col.itemL(text="Camera:") + col.itemR(view, "camera", text="") col.itemR(view, "lens") - layout.itemL(text="Clip:") col = layout.column(align=True) + col.itemL(text="Clip:") col.itemR(view, "clip_start", text="Start") col.itemR(view, "clip_end", text="End") - layout.itemL(text="Grid:") col = layout.column(align=True) + col.itemL(text="Grid:") col.itemR(view, "grid_lines", text="Lines") col.itemR(view, "grid_spacing", text="Spacing") col.itemR(view, "grid_subdivisions", text="Subdivisions") @@ -1156,7 +1157,8 @@ __space_type__ = 'VIEW_3D' __region_type__ = 'UI' __label__ = "Display" - + __default_closed__ = True + def poll(self, context): view = context.space_data return (view) @@ -1177,7 +1179,7 @@ layout.itemS() - layout.itemO("screen.region_foursplit") + layout.itemO("screen.region_foursplit", text="Toggle Quad View") col = layout.column() col.itemR(view, "lock_rotation") @@ -1272,9 +1274,10 @@ #col.itemR(bg, "image_user") col.itemR(bg, "size") col.itemR(bg, "transparency", slider=True) - col.itemL(text="Offset:") + col = layout.column(align=True) + col.itemL(text="Offset:") col.itemR(bg, "offset_x", text="X") col.itemR(bg, "offset_y", text="Y") Modified: trunk/blender/release/ui/space_view3d_toolbar.py =================================================================== --- trunk/blender/release/ui/space_view3d_toolbar.py 2009-09-15 11:35:10 UTC (rev 23246) +++ trunk/blender/release/ui/space_view3d_toolbar.py 2009-09-15 12:45:05 UTC (rev 23247) @@ -14,36 +14,32 @@ def draw(self, context): layout = self.layout - layout.itemL(text="Transform:") - col = layout.column(align=True) + col.itemL(text="Transform:") col.itemO("tfm.translate") col.itemO("tfm.rotate") col.itemO("tfm.resize", text="Scale") - layout.itemL(text="Object:") - col = layout.column(align=True) + col.itemL(text="Object:") col.itemO("object.duplicate") col.itemO("object.delete") active_object= context.active_object if active_object and active_object.type == 'MESH': - layout.itemL(text="Shading:") - + col = layout.column(align=True) + col.itemL(text="Shading:") col.itemO("object.shade_smooth", text="Smooth") col.itemO("object.shade_flat", text="Flat") - layout.itemL(text="Keyframes:") - 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") - layout.itemL(text="Repeat:") - 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...") @@ -57,43 +53,37 @@ def draw(self, context): layout = self.layout - layout.itemL(text="Transform:") - col = layout.column(align=True) + col.itemL(text="Transform:") col.itemO("tfm.translate") col.itemO("tfm.rotate") col.itemO("tfm.resize", text="Scale") - layout.itemL(text="Mesh:") - col = layout.column(align=True) + col.itemL(text="Mesh:") col.itemO("mesh.duplicate") col.itemO("mesh.delete") - layout.itemL(text="Modeling:") - col = layout.column(align=True) + col.itemL(text="Modeling:") col.itemO("mesh.extrude") col.itemO("mesh.subdivide") col.itemO("mesh.spin") col.itemO("mesh.screw") - layout.itemL(text="Shading:") - 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") - layout.itemL(text="UV Mapping:") - col = layout.column(align=True) + col.itemL(text="UV Mapping:") col.itemO("uv.mapping_menu", text="Unwrap") col.itemO("mesh.uvs_rotate") col.itemO("mesh.uvs_mirror") - layout.itemL(text="Repeat:") - 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...") @@ -107,31 +97,34 @@ def draw(self, context): layout = self.layout - layout.itemL(text="Transform:") - col = layout.column(align=True) + col.itemL(text="Transform:") col.itemO("tfm.translate") col.itemO("tfm.rotate") col.itemO("tfm.resize", text="Scale") - - layout.itemL(text="Curve:") col = layout.column(align=True) + col.itemL(text="Curve:") col.itemO("curve.duplicate") col.itemO("curve.delete") col.itemO("curve.cyclic_toggle") col.itemO("curve.switch_direction") col.itemO("curve.spline_type_set") - layout.itemL(text="Modeling:") - col = layout.column(align=True) + col.itemL(text="Handles:") + col.item_enumO("curve.handle_type_set", "type", 'AUTOMATIC') + col.item_enumO("curve.handle_type_set", "type", 'VECTOR') + col.item_enumO("curve.handle_type_set", "type", 'ALIGN') + col.item_enumO("curve.handle_type_set", "type", 'FREE_ALIGN') + + col = layout.column(align=True) + col.itemL(text="Modeling:") col.itemO("curve.extrude") col.itemO("curve.subdivide") - layout.itemL(text="Repeat:") - 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...") @@ -145,30 +138,26 @@ def draw(self, context): layout = self.layout - layout.itemL(text="Transform:") - col = layout.column(align=True) + col.itemL(text="Transform:") col.itemO("tfm.translate") col.itemO("tfm.rotate") col.itemO("tfm.resize", text="Scale") - layout.itemL(text="Curve:") - col = layout.column(align=True) + col.itemL(text="Curve:") col.itemO("curve.duplicate") col.itemO("curve.delete") col.itemO("curve.cyclic_toggle") col.itemO("curve.switch_direction") - layout.itemL(text="Modeling:") - col = layout.column(align=True) + col.itemL(text="Modeling:") col.itemO("curve.extrude") col.itemO("curve.subdivide") - layout.itemL(text="Repeat:") - 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...") @@ -182,22 +171,21 @@ def draw(self, context): layout = self.layout - layout.itemL(text="Text Edit:") + col = layout.column(align=True) + col.itemL(text="Text Edit:") col.itemO("font.text_copy", text="Copy") col.itemO("font.text_cut", text="Cut") col.itemO("font.text_paste", text="Paste") - layout.itemL(text="Style:") - col = layout.column(align=True) + col.itemL(text="Style:") col.itemO("font.case_set") col.itemO("font.style_toggle") - - layout.itemL(text="Repeat:") - + 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...") @@ -211,26 +199,26 @@ def draw(self, context): layout = self.layout - layout.itemL(text="Transform:") + col = layout.column(align=True) + col.itemL(text="Transform:") col.itemO("tfm.translate") col.itemO("tfm.rotate") col.itemO("tfm.resize", text="Scale") - - layout.itemL(text="Bones:") col = layout.column(align=True) + col.itemL(text="Bones:") col.itemO("armature.bone_primitive_add", text="Add") col.itemO("armature.duplicate", text="Duplicate") col.itemO("armature.delete", text="Delete") - layout.itemL(text="Modeling:") - layout.itemO("armature.extrude") + col = layout.column(align=True) + col.itemL(text="Modeling:") + col.itemO("armature.extrude") - layout.itemL(text="Repeat:") - 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...") @@ -244,16 +232,14 @@ def draw(self, context): layout = self.layout - layout.itemL(text="Transform:") - col = layout.column(align=True) + col.itemL(text="Transform:") col.itemO("tfm.translate") col.itemO("tfm.rotate") col.itemO("tfm.resize", text="Scale") - layout.itemL(text="Repeat:") - 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...") @@ -267,16 +253,14 @@ def draw(self, context): layout = self.layout - layout.itemL(text="Transform:") - col = layout.column(align=True) + col.itemL(text="Transform:") col.itemO("tfm.translate") col.itemO("tfm.rotate") col.itemO("tfm.resize", text="Scale") - layout.itemL(text="Repeat:") - 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...") @@ -290,40 +274,36 @@ def draw(self, context): layout = self.layout - layout.itemL(text="Transform:") + col = layout.column(align=True) + col.itemL(text="Transform:") col.itemO("tfm.translate") col.itemO("tfm.rotate") col.itemO("tfm.resize", text="Scale") - layout.itemL(text="Bones:") - col = layout.column(align=True) + col.itemL(text="Bones:") col.itemO("pose.hide", text="Hide") col.itemO("pose.reveal", text="Reveal") - layout.itemL(text="Keyframes:") - col = layout.column(align=True) + layout.itemL(text="Keyframes:") col.itemO("anim.insert_keyframe_menu", text="Insert") col.itemO("anim.delete_keyframe_v3d", text="Remove") - layout.itemL(text="Pose:") - col = layout.column(align=True) + col.itemL(text="Pose:") col.itemO("pose.copy", text="Copy") col.itemO("pose.paste", text="Paste") - layout.itemL(text="Library:") - col = layout.column(align=True) + col.itemL(text="Library:") col.itemO("poselib.pose_add", text="Add") col.itemO("poselib.pose_remove", text="Remove") - layout.itemL(text="Repeat:") - @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs