Revision: 59442 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59442 Author: mont29 Date: 2013-08-23 20:41:21 +0000 (Fri, 23 Aug 2013) Log Message: ----------- Followup to r59434 : py UI scripts edits.
Notes: * Made those edits by full checking of py files, so I should have spoted most needed edits, yet it remains quite probable I missed a few ones, we'll fix if/when someone notice it... * Also made some cleanup "on the road"! Revision Links: -------------- http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59434 Modified Paths: -------------- trunk/blender/intern/cycles/blender/addon/ui.py trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py trunk/blender/release/scripts/startup/bl_ui/properties_constraint.py trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py trunk/blender/release/scripts/startup/bl_ui/properties_freestyle.py trunk/blender/release/scripts/startup/bl_ui/properties_mask_common.py trunk/blender/release/scripts/startup/bl_ui/properties_material.py trunk/blender/release/scripts/startup/bl_ui/properties_object.py trunk/blender/release/scripts/startup/bl_ui/properties_particle.py trunk/blender/release/scripts/startup/bl_ui/properties_physics_common.py trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py trunk/blender/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py trunk/blender/release/scripts/startup/bl_ui/properties_render.py trunk/blender/release/scripts/startup/bl_ui/properties_texture.py trunk/blender/release/scripts/startup/bl_ui/space_clip.py trunk/blender/release/scripts/startup/bl_ui/space_image.py trunk/blender/release/scripts/startup/bl_ui/space_outliner.py trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py trunk/blender/release/scripts/startup/bl_ui/space_text.py trunk/blender/release/scripts/startup/bl_ui/space_time.py trunk/blender/release/scripts/startup/bl_ui/space_userpref.py trunk/blender/release/scripts/startup/bl_ui/space_view3d.py trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py Modified: trunk/blender/intern/cycles/blender/addon/ui.py =================================================================== --- trunk/blender/intern/cycles/blender/addon/ui.py 2013-08-23 20:38:36 UTC (rev 59441) +++ trunk/blender/intern/cycles/blender/addon/ui.py 2013-08-23 20:41:21 UTC (rev 59442) @@ -252,8 +252,8 @@ col = split.column(align=True) col.label(text="Threads:") - col.row().prop(rd, "threads_mode", expand=True) - sub = col.column() + col.row(align=True).prop(rd, "threads_mode", expand=True) + sub = col.column(align=True) sub.enabled = rd.threads_mode == 'FIXED' sub.prop(rd, "threads") @@ -266,7 +266,7 @@ sub.prop(cscene, "use_progressive_refine") - subsub = sub.column() + subsub = sub.column(align=True) subsub.enabled = not rd.use_border subsub.prop(rd, "use_save_buffers") Modified: trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py =================================================================== --- trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py 2013-08-23 20:38:36 UTC (rev 59441) +++ trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py 2013-08-23 20:41:21 UTC (rev 59442) @@ -150,18 +150,19 @@ layout = self.layout col = layout.column(align=True) col.prop(self, 'view_align') + col = layout.column(align=True) - col.label(text="Location") col.prop(self, 'location', text="") + col = layout.column(align=True) - col.label(text="Rotation") col.prop(self, 'rotation', text="") col = layout.column(align=True) col.label(text="Major Segments") col.prop(self, 'major_segments', text="") + col = layout.column(align=True) col.label(text="Minor Segments") col.prop(self, 'minor_segments', text="") @@ -174,6 +175,7 @@ col = layout.column(align=True) col.label(text="Major Radius") col.prop(self, 'major_radius', text="") + col = layout.column(align=True) col.label(text="Minor Radius") col.prop(self, 'minor_radius', text="") @@ -181,6 +183,7 @@ col = layout.column(align=True) col.label(text="Exterior Radius") col.prop(self, 'abso_major_rad', text="") + col = layout.column(align=True) col.label(text="Interior Radius") col.prop(self, 'abso_minor_rad', text="") Modified: trunk/blender/release/scripts/startup/bl_ui/properties_constraint.py =================================================================== --- trunk/blender/release/scripts/startup/bl_ui/properties_constraint.py 2013-08-23 20:38:36 UTC (rev 59441) +++ trunk/blender/release/scripts/startup/bl_ui/properties_constraint.py 2013-08-23 20:41:21 UTC (rev 59442) @@ -161,14 +161,14 @@ col = split.column() row = col.row(align=True) row.prop(con, "use_location", text="") - sub = row.row() + sub = row.row(align=True) sub.active = con.use_location sub.prop(con, "weight", text="Position", slider=True) col = split.column() row = col.row(align=True) row.prop(con, "use_rotation", text="") - sub = row.row() + sub = row.row(align=True) sub.active = con.use_rotation sub.prop(con, "orient_weight", text="Rotation", slider=True) @@ -247,21 +247,21 @@ col = split.column(align=True) col.prop(con, "use_limit_x") - sub = col.column() + sub = col.column(align=True) sub.active = con.use_limit_x sub.prop(con, "min_x", text="Min") sub.prop(con, "max_x", text="Max") col = split.column(align=True) col.prop(con, "use_limit_y") - sub = col.column() + sub = col.column(align=True) sub.active = con.use_limit_y sub.prop(con, "min_y", text="Min") sub.prop(con, "max_y", text="Max") col = split.column(align=True) col.prop(con, "use_limit_z") - sub = col.column() + sub = col.column(align=True) sub.active = con.use_limit_z sub.prop(con, "min_z", text="Min") sub.prop(con, "max_z", text="Max") @@ -577,21 +577,21 @@ col = split.column(align=True) col.prop(con, "use_limit_x", text="X") - sub = col.column() + sub = col.column(align=True) sub.active = con.use_limit_x sub.prop(con, "limit_min_x", text="Min") sub.prop(con, "limit_max_x", text="Max") col = split.column(align=True) col.prop(con, "use_limit_y", text="Y") - sub = col.column() + sub = col.column(align=True) sub.active = con.use_limit_y sub.prop(con, "limit_min_y", text="Min") sub.prop(con, "limit_max_y", text="Max") col = split.column(align=True) col.prop(con, "use_limit_z", text="Z") - sub = col.column() + sub = col.column(align=True) sub.active = con.use_limit_z sub.prop(con, "limit_min_z", text="Min") sub.prop(con, "limit_max_z", text="Max") @@ -600,21 +600,21 @@ col = split.column(align=True) col.prop(con, "use_angular_limit_x", text="Angle X") - sub = col.column() + sub = col.column(align=True) sub.active = con.use_angular_limit_x sub.prop(con, "limit_angle_min_x", text="Min") sub.prop(con, "limit_angle_max_x", text="Max") col = split.column(align=True) col.prop(con, "use_angular_limit_y", text="Angle Y") - sub = col.column() + sub = col.column(align=True) sub.active = con.use_angular_limit_y sub.prop(con, "limit_angle_min_y", text="Min") sub.prop(con, "limit_angle_max_y", text="Max") col = split.column(align=True) col.prop(con, "use_angular_limit_z", text="Angle Z") - sub = col.column() + sub = col.column(align=True) sub.active = con.use_angular_limit_z sub.prop(con, "limit_angle_min_z", text="Min") sub.prop(con, "limit_angle_max_z", text="Max") Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py =================================================================== --- trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py 2013-08-23 20:38:36 UTC (rev 59441) +++ trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py 2013-08-23 20:41:21 UTC (rev 59442) @@ -136,7 +136,6 @@ col.operator("pose.group_move", icon='TRIA_UP', text="").direction = 'UP' col.operator("pose.group_move", icon='TRIA_DOWN', text="").direction = 'DOWN' - if group: col = layout.column() col.active = (ob.proxy is None) col.prop(group, "name") @@ -211,7 +210,7 @@ layout.prop(pose_marker_active, "name") -# TODO: this panel will soon be deprecated deprecated too +# TODO: this panel will soon be deprecated too class DATA_PT_ghost(ArmatureButtonsPanel, Panel): bl_label = "Ghost" Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py =================================================================== --- trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py 2013-08-23 20:38:36 UTC (rev 59441) +++ trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py 2013-08-23 20:41:21 UTC (rev 59442) @@ -127,13 +127,16 @@ col.label(text="Y:") col.label(text="Z:") - col = split.row() - sub = col.row() - sub.active = not (bone.parent and bone.use_connect) - sub.column().prop(pchan, "lock_location", text="Location") - col.column().prop(pchan, "lock_rotation", text="Rotation") - col.column().prop(pchan, "lock_scale", text="Scale") + col = split.column() + col.active = not (bone.parent and bone.use_connect) + col.prop(pchan, "lock_location", text="Location") + col = split.column() + col.prop(pchan, "lock_rotation", text="Rotation") + + col = split.column() + col.prop(pchan, "lock_scale", text="Scale") + if pchan.rotation_mode in {'QUATERNION', 'AXIS_ANGLE'}: row = layout.row() row.prop(pchan, "lock_rotations_4d", text="Lock Rotation") Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py =================================================================== --- trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py 2013-08-23 20:38:36 UTC (rev 59441) +++ trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py 2013-08-23 20:41:21 UTC (rev 59442) @@ -142,10 +142,10 @@ if cam.sensor_fit == 'AUTO': col.prop(cam, "sensor_width", text="Size") else: - sub = col.column() + sub = col.column(align=True) sub.active = cam.sensor_fit == 'HORIZONTAL' sub.prop(cam, "sensor_width", text="Width") - sub = col.column() + sub = col.column(align=True) sub.active = cam.sensor_fit == 'VERTICAL' sub.prop(cam, "sensor_height", text="Height") Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py =================================================================== --- trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py 2013-08-23 20:38:36 UTC (rev 59441) +++ trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py 2013-08-23 20:41:21 UTC (rev 59442) @@ -81,7 +81,7 @@ if self.layout_type in {'DEFAULT', 'COMPACT'}: split = layout.split(0.66, False) split.label(text=item.name, translate=False, icon_value=icon) - row = split.row(True) + row = split.row(align=True) if key_block.mute or (obj.mode == 'EDIT' and not (obj.use_shape_key_edit_mode and obj.type == 'MESH')): row.active = False if not item.relative_key or index > 0: @@ -207,7 +207,6 @@ @@ 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