[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24708] trunk/blender/release/scripts/ui/ properties_data_modifier.py: Modifier Layout improvements ( single column and normal) by nudelZ.
Thomas Dinges
dingto at gmx.de
Fri Nov 20 19:01:40 CET 2009
Revision: 24708
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24708
Author: dingto
Date: 2009-11-20 19:01:39 +0100 (Fri, 20 Nov 2009)
Log Message:
-----------
Modifier Layout improvements (single column and normal) by nudelZ.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/properties_data_modifier.py
Modified: trunk/blender/release/scripts/ui/properties_data_modifier.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_modifier.py 2009-11-20 16:07:10 UTC (rev 24707)
+++ trunk/blender/release/scripts/ui/properties_data_modifier.py 2009-11-20 18:01:39 UTC (rev 24708)
@@ -52,22 +52,19 @@
# so each type must have a function here.
def ARMATURE(self, layout, ob, md, wide_ui):
- if wide_ui:
- layout.itemR(md, "object")
- else:
- layout.itemR(md, "object", text="")
+ split = layout.split()
- row = layout.row()
+ col = split.column()
+ col.itemL(text="Object:")
+ col.itemR(md, "object", text="")
if wide_ui:
- row.itemL(text="Vertex Group:")
- sub = row.split(percentage=0.7)
- sub.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
- subsub = sub.row()
- subsub.active = md.vertex_group
- subsub.itemR(md, "invert", text="Inv")
+ col = split.column()
+ col.itemL(text="Vertex Group::")
+ col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
+ sub = col.column()
+ sub.active = md.vertex_group
+ sub.itemR(md, "invert")
- layout.itemS()
-
split = layout.split()
col = split.column()
@@ -86,8 +83,7 @@
layout.itemR(md, "fit_type")
else:
layout.itemR(md, "fit_type", text="")
-
-
+
if md.fit_type == 'FIXED_COUNT':
layout.itemR(md, "count")
elif md.fit_type == 'FIT_LENGTH':
@@ -151,9 +147,17 @@
layout.row().itemR(md, "edge_weight_method", expand=True)
def BOOLEAN(self, layout, ob, md, wide_ui):
- layout.itemR(md, "operation")
- layout.itemR(md, "object")
+ split = layout.split()
+ col = split.column()
+ col.itemL(text="Operation:")
+ col.itemR(md, "operation", text="")
+
+ if wide_ui:
+ col = split.column()
+ col.itemL(text="Object:")
+ col.itemR(md, "object", text="")
+
def BUILD(self, layout, ob, md, wide_ui):
split = layout.split()
@@ -169,28 +173,39 @@
sub.itemR(md, "seed")
def CAST(self, layout, ob, md, wide_ui):
- layout.itemR(md, "cast_type")
- layout.itemR(md, "object")
- if md.object:
- layout.itemR(md, "use_transform")
+ split = layout.split(percentage=0.25)
- split = layout.split()
-
+ if wide_ui:
+ split.itemL(text="Cast Type:")
+ split.itemR(md, "cast_type", text="")
+ else:
+ layout.itemR(md, "cast_type", text="")
+
+ split = layout.split(percentage=0.25)
+
col = split.column()
col.itemR(md, "x")
col.itemR(md, "y")
col.itemR(md, "z")
-
- if wide_ui:
- col = split.column()
+
+ col = split.column()
col.itemR(md, "factor")
col.itemR(md, "radius")
col.itemR(md, "size")
+ col.itemR(md, "from_radius")
- layout.itemR(md, "from_radius")
+ split = layout.split()
+
+ col = split.column()
+ col.itemL(text="Vertex Group:")
+ col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
+ if wide_ui:
+ col = split.column()
+ col.itemL(text="Control Object:")
+ col.itemR(md, "object", text="")
+ if md.object:
+ col.itemR(md, "use_transform")
- layout.item_pointerR(md, "vertex_group", ob, "vertex_groups")
-
def CLOTH(self, layout, ob, md, wide_ui):
layout.itemL(text="See Cloth panel.")
@@ -198,35 +213,53 @@
layout.itemL(text="See Collision panel.")
def CURVE(self, layout, ob, md, wide_ui):
- layout.itemR(md, "object")
- layout.item_pointerR(md, "vertex_group", ob, "vertex_groups")
- layout.itemR(md, "deform_axis")
+ split = layout.split()
+ col = split.column()
+ col.itemL(text="Object:")
+ col.itemR(md, "object", text="")
+ if wide_ui:
+ col = split.column()
+ col.itemL(text="Vertex Group:")
+ col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
+ layout.itemL(text="Deformation Axis:")
+ layout.row().itemR(md, "deform_axis", expand=True)
+
def DECIMATE(self, layout, ob, md, wide_ui):
layout.itemR(md, "ratio")
layout.itemR(md, "face_count")
def DISPLACE(self, layout, ob, md, wide_ui):
-
split = layout.split()
-
+
col = split.column()
- col.itemR(md, "midlevel")
-
+ col.itemL(text="Texture:")
+ col.itemR(md, "texture", text="")
+ col.itemL(text="Vertex Group:")
+ col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
+
if wide_ui:
col = split.column()
- col.itemR(md, "strength")
-
- layout.itemS()
- layout.item_pointerR(md, "vertex_group", ob, "vertex_groups")
- layout.itemR(md, "texture")
- layout.itemR(md, "direction")
- layout.itemR(md, "texture_coordinates")
+ col.itemL(text="Direction:")
+ col.itemR(md, "direction", text="")
+ col.itemL(text="Texture Coordinates:")
+ col.itemR(md, "texture_coordinates", text="")
if md.texture_coordinates == 'OBJECT':
layout.itemR(md, "texture_coordinate_object", text="Object")
elif md.texture_coordinates == 'UV' and ob.type == 'MESH':
layout.item_pointerR(md, "uv_layer", ob.data, "uv_textures")
+ layout.itemS()
+
+ split = layout.split()
+
+ col = split.column()
+ col.itemR(md, "midlevel")
+
+ if wide_ui:
+ col = split.column()
+ col.itemR(md, "strength")
+
def EDGE_SPLIT(self, layout, ob, md, wide_ui):
split = layout.split()
@@ -261,12 +294,20 @@
layout.itemL(text="See Fluid panel.")
def HOOK(self, layout, ob, md, wide_ui):
- col = layout.column()
- col.itemR(md, "object")
+ split = layout.split()
+
+ col = split.column()
+ col.itemL(text="Object:")
+ col.itemR(md, "object", text="")
if md.object and md.object.type == 'ARMATURE':
- layout.item_pointerR(md, "subtarget", md.object.data, "bones", text="Bone")
+ col.itemL(text="Bone:")
+ col.item_pointerR(md, "subtarget", md.object.data, "bones", text="")
+ if wide_ui:
+ col = split.column()
+ col.itemL(text="Vertex Group:")
+ col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
- layout.item_pointerR(md, "vertex_group", ob, "vertex_groups")
+ layout.itemS()
split = layout.split()
@@ -294,22 +335,53 @@
row.itemO("object.hook_assign", text="Assign")
def LATTICE(self, layout, ob, md, wide_ui):
- layout.itemR(md, "object")
- layout.item_pointerR(md, "vertex_group", ob, "vertex_groups")
+ split = layout.split()
+ col = split.column()
+ col.itemL(text="Object:")
+ col.itemR(md, "object", text="")
+
+ if wide_ui:
+ col = split.column()
+ col.itemL(text="Vertex Group:")
+ col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
+
def MASK(self, layout, ob, md, wide_ui):
- layout.itemR(md, "mode")
+ split = layout.split()
+
+ col = split.column()
+ col.itemL(text="Mode:")
+ col.itemR(md, "mode", text="")
+ if wide_ui:
+ col = split.column()
+ col.itemL(text="Vertex Group:")
if md.mode == 'ARMATURE':
- layout.itemR(md, "armature")
+ col.itemR(md, "armature", text="")
elif md.mode == 'VERTEX_GROUP':
- layout.item_pointerR(md, "vertex_group", ob, "vertex_groups")
- layout.itemR(md, "inverse")
+ col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
+ sub = col.column()
+ sub.active = md.vertex_group
+ sub.itemR(md, "inverse", text="Invert")
+
def MESH_DEFORM(self, layout, ob, md, wide_ui):
- layout.itemR(md, "object")
- layout.item_pointerR(md, "vertex_group", ob, "vertex_groups")
- layout.itemR(md, "invert")
+ split = layout.split()
+ col = split.column()
+ col.itemL(text="Object:")
+ col.itemR(md, "object", text="")
+ if md.object and md.object.type == 'ARMATURE':
+ col.itemL(text="Bone:")
+ col.item_pointerR(md, "subtarget", md.object.data, "bones", text="")
+ if wide_ui:
+ col = split.column()
+ col.itemL(text="Vertex Group:")
+ col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="")
+
+ sub = col.column()
+ sub.active = md.vertex_group
+ sub.itemR(md, "invert")
+
layout.itemS()
if md.is_bound:
@@ -326,30 +398,36 @@
col.itemR(md, "dynamic")
def MIRROR(self, layout, ob, md, wide_ui):
+ layout.itemR(md, "merge_limit")
- split = layout.split()
+ if wide_ui:
+ split = layout.split(percentage=0.25)
+ else:
+ split = layout.split()
col = split.column()
+ col.itemL(text="Axis:")
col.itemR(md, "x")
col.itemR(md, "y")
col.itemR(md, "z")
if wide_ui:
col = split.column()
+ else:
+ subsplit = layout.split()
+ col = subsplit.column()
+ col.itemL(text="Options:")
+ col.itemR(md, "clip", text="Clipping")
+ col.itemR(md, "mirror_vertex_groups", text="Vertex Groups")
+
+ col = split.column()
col.itemL(text="Textures:")
col.itemR(md, "mirror_u", text="U")
col.itemR(md, "mirror_v", text="V")
-
- layout.itemR(md, "merge_limit")
-
- split = layout.split()
- col = split.column()
- col.itemR(md, "clip")
- if wide_ui:
- col = split.column()
- col.itemR(md, "mirror_vertex_groups", text="Vertex Groups")
- layout.itemR(md, "mirror_object")
+ col = layout.column()
+ col.itemL(text="Mirror Object:")
+ col.itemR(md, "mirror_object", text="")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list