Revision: 20530
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20530
Author: dingto
Date: 2009-05-31 13:47:45 +0200 (Sun, 31 May 2009)
Log Message:
-----------
2.5 Constraints:
* Wrapped Action Constraint to Python.
* Some layout tweaks by William Reynish.
* Cleaned up the code a bit.
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/buttons_object_constraint.py
branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
Modified: branches/blender2.5/blender/release/ui/buttons_object_constraint.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_object_constraint.py
2009-05-31 11:22:11 UTC (rev 20529)
+++ branches/blender2.5/blender/release/ui/buttons_object_constraint.py
2009-05-31 11:47:45 UTC (rev 20530)
@@ -33,8 +33,8 @@
self.copy_scale(box, con)
#elif con.type == "SCRIPT":
# self.script(box, con)
- #elif con.type == "ACTION":
- # self.action(box, con)
+ elif con.type == "ACTION":
+ self.action(box, con)
elif con.type == "LOCKED_TRACK":
self.locked_track(box, con)
elif con.type == "LIMIT_DISTANCE":
@@ -87,24 +87,27 @@
def child_of(self, layout, con):
self.target_template(layout, con)
+
+ split = layout.split()
- layout.itemL(text="Use Channel(s):")
+ sub = split.column()
+ sub.itemL(text="Location:")
+ sub.itemR(con, "locationx", text="X")
+ sub.itemR(con, "locationy", text="Y")
+ sub.itemR(con, "locationz", text="Z")
- row = layout.row(align=True)
- row.itemR(con, "locationx", text="Loc X", toggle=True)
- row.itemR(con, "locationy", text="Loc Y", toggle=True)
- row.itemR(con, "locationz", text="Loc Z", toggle=True)
+ sub = split.column()
+ sub.itemL(text="Rotation:")
+ sub.itemR(con, "rotationx", text="X")
+ sub.itemR(con, "rotationy", text="Y")
+ sub.itemR(con, "rotationz", text="Z")
- row = layout.row(align=True)
- row.itemR(con, "rotationx", text="Rot X", toggle=True)
- row.itemR(con, "rotationy", text="Rot X", toggle=True)
- row.itemR(con, "rotationz", text="Rot X", toggle=True)
+ sub = split.column()
+ sub.itemL(text="Scale:")
+ sub.itemR(con, "sizex", text="X")
+ sub.itemR(con, "sizey", text="Y")
+ sub.itemR(con, "sizez", text="Z")
- row = layout.row(align=True)
- row.itemR(con, "sizex", text="Scale X", toggle=True)
- row.itemR(con, "sizey", text="Scale X", toggle=True)
- row.itemR(con, "sizez", text="Scale X", toggle=True)
-
# Missing
row = layout.row()
row.itemL(text="SET OFFSET")
@@ -114,15 +117,13 @@
self.target_template(layout, con)
row = layout.row()
- row.itemL(text="Align:")
- row.itemR(con, "target_z", toggle=True)
-
- row = layout.row()
row.itemL(text="To:")
row.itemR(con, "track", expand=True)
- row.itemL(text="Up:")
- row.itemR(con, "up", expand=True)
+ row = layout.row()
+ row.itemR(con, "up", text="Up")
+ row.itemR(con, "target_z")
+
self.space_template(layout, con)
#def ik(self, layout, con):
@@ -137,27 +138,38 @@
row = layout.row()
row.itemL(text="Forward:")
row.itemR(con, "forward", expand=True)
- row.itemL(text="Up:")
- row.itemR(con, "up", expand=True)
+ row = layout.row()
+ row.itemR(con, "up", text="Up")
+ row.itemL()
+
def limit_rotation(self, layout, con):
- row = layout.row(align=True)
- row.itemR(con, "use_limit_x", toggle=True)
- row.itemR(con, "minimum_x", text="Min")
- row.itemR(con, "maximum_x", text="Max")
- row = layout.row(align=True)
- row.itemR(con, "use_limit_y", toggle=True)
- row.itemR(con, "minimum_y", text="Min")
- row.itemR(con, "maximum_y", text="Max")
+ split = layout.split()
- row = layout.row(align=True)
- row.itemR(con, "use_limit_z", toggle=True)
- row.itemR(con, "minimum_z", text="Min")
- row.itemR(con, "maximum_z", text="Max")
+ col = split.column()
+ col.itemR(con, "use_limit_x")
+ colsub = col.column()
+ colsub.active = con.use_limit_x
+ colsub.itemR(con, "minimum_x", text="Min")
+ colsub.itemR(con, "maximum_x", text="Max")
+ col = split.column()
+ col.itemR(con, "use_limit_y")
+ colsub = col.column()
+ colsub.active = con.use_limit_y
+ colsub.itemR(con, "minimum_y", text="Min")
+ colsub.itemR(con, "maximum_y", text="Max")
+
+ col = split.column()
+ col.itemR(con, "use_limit_z")
+ colsub = col.column()
+ colsub.active = con.use_limit_z
+ colsub.itemR(con, "minimum_z", text="Min")
+ colsub.itemR(con, "maximum_z", text="Max")
+
row = layout.row()
- row.itemR(con, "limit_transform", toggle=True)
+ row.itemR(con, "limit_transform")
row.itemL()
row = layout.row()
@@ -168,29 +180,37 @@
split = layout.split()
col = split.column()
- sub = col.row(align=True)
- sub.itemR(con, "use_minimum_x", toggle=True)
- sub.itemR(con, "minimum_x", text="")
- sub = col.row(align=True)
- sub.itemR(con, "use_minimum_y", toggle=True)
- sub.itemR(con, "minimum_y", text="")
- sub = col.row(align=True)
- sub.itemR(con, "use_minimum_z", toggle=True)
- sub.itemR(con, "minimum_z", text="")
+ col.itemR(con, "use_minimum_x")
+ colsub = col.column()
+ colsub.active = con.use_minimum_x
+ colsub.itemR(con, "minimum_x", text="")
+ col.itemR(con, "use_maximum_x")
+ colsub = col.column()
+ colsub.active = con.use_maximum_x
+ colsub.itemR(con, "maximum_x", text="")
col = split.column()
- sub = col.row(align=True)
- sub.itemR(con, "use_maximum_x", toggle=True)
- sub.itemR(con, "maximum_x", text="")
- sub = col.row(align=True)
- sub.itemR(con, "use_maximum_y", toggle=True)
- sub.itemR(con, "maximum_y", text="")
- sub = col.row(align=True)
- sub.itemR(con, "use_maximum_z", toggle=True)
- sub.itemR(con, "maximum_z", text="")
+ col.itemR(con, "use_minimum_y")
+ colsub = col.column()
+ colsub.active = con.use_minimum_y
+ colsub.itemR(con, "minimum_y", text="")
+ col.itemR(con, "use_maximum_y")
+ colsub = col.column()
+ colsub.active = con.use_maximum_y
+ colsub.itemR(con, "maximum_y", text="")
+ col = split.column()
+ col.itemR(con, "use_minimum_z")
+ colsub = col.column()
+ colsub.active = con.use_minimum_z
+ colsub.itemR(con, "minimum_z", text="")
+ col.itemR(con, "use_maximum_z")
+ colsub = col.column()
+ colsub.active = con.use_maximum_z
+ colsub.itemR(con, "maximum_z", text="")
+
row = layout.row()
- row.itemR(con, "limit_transform", toggle=True)
+ row.itemR(con, "limit_transform")
row.itemL()
row = layout.row()
@@ -199,31 +219,39 @@
def limit_scale(self, layout, con):
split = layout.split()
+
+ col = split.column()
+ col.itemR(con, "use_minimum_x")
+ colsub = col.column()
+ colsub.active = con.use_minimum_x
+ colsub.itemR(con, "minimum_x", text="")
+ col.itemR(con, "use_maximum_x")
+ colsub = col.column()
+ colsub.active = con.use_maximum_x
+ colsub.itemR(con, "maximum_x", text="")
col = split.column()
- sub = col.row(align=True)
- sub.itemR(con, "use_minimum_x", toggle=True)
- sub.itemR(con, "minimum_x", text="")
- sub = col.row(align=True)
- sub.itemR(con, "use_minimum_y", toggle=True)
- sub.itemR(con, "minimum_y", text="")
- sub = col.row(align=True)
- sub.itemR(con, "use_minimum_z", toggle=True)
- sub.itemR(con, "minimum_z", text="")
+ col.itemR(con, "use_minimum_y")
+ colsub = col.column()
+ colsub.active = con.use_minimum_y
+ colsub.itemR(con, "minimum_y", text="")
+ col.itemR(con, "use_maximum_y")
+ colsub = col.column()
+ colsub.active = con.use_maximum_y
+ colsub.itemR(con, "maximum_y", text="")
col = split.column()
- sub = col.row(align=True)
- sub.itemR(con, "use_maximum_x", toggle=True)
- sub.itemR(con, "maximum_x", text="")
- sub = col.row(align=True)
- sub.itemR(con, "use_maximum_y", toggle=True)
- sub.itemR(con, "maximum_y", text="")
- sub = col.row(align=True)
- sub.itemR(con, "use_maximum_z", toggle=True)
- sub.itemR(con, "maximum_z", text="")
+ col.itemR(con, "use_minimum_z")
+ colsub = col.column()
+ colsub.active = con.use_minimum_z
+ colsub.itemR(con, "minimum_z", text="")
+ col.itemR(con, "use_maximum_z")
+ colsub = col.column()
+ colsub.active = con.use_maximum_z
+ colsub.itemR(con, "maximum_z", text="")
row = layout.row()
- row.itemR(con, "limit_transform", toggle=True)
+ row.itemR(con, "limit_transform")
row.itemL()
row = layout.row()
@@ -233,54 +261,99 @@
def copy_rotation(self, layout, con):
self.target_template(layout, con)
- row = layout.row(align=True)
- row.itemR(con, "rotate_like_x", text="X", toggle=True)
- row.itemR(con, "invert_x", text="-", toggle=True)
- row.itemR(con, "rotate_like_y", text="Y", toggle=True)
- row.itemR(con, "invert_y", text="-", toggle=True)
- row.itemR(con, "rotate_like_z", text="Z", toggle=True)
- row.itemR(con, "invert_z", text="-", toggle=True)
+ split = layout.split()
+
+ col = split.column()
+ col.itemR(con, "rotate_like_x", text="X")
+ colsub = col.column()
+ colsub.active = con.rotate_like_x
+ colsub.itemR(con, "invert_x", text="Invert")
+
+ col = split.column()
+ col.itemR(con, "rotate_like_y", text="Y")
+ colsub = col.column()
+ colsub.active = con.rotate_like_y
+ colsub.itemR(con, "invert_y", text="Invert")
+
+ col = split.column()
+ col.itemR(con, "rotate_like_z", text="Z")
+ colsub = col.column()
+ colsub.active = con.rotate_like_z
+ colsub.itemR(con, "invert_z", text="Invert")
- layout.itemR(con, "offset", toggle=True)
+ layout.itemR(con, "offset")
self.space_template(layout, con)
def copy_location(self, layout, con):
self.target_template(layout, con)
- row = layout.row(align=True)
- row.itemR(con, "locate_like_x", text="X", toggle=True)
- row.itemR(con, "invert_x", text="-", toggle=True)
- row.itemR(con, "locate_like_y", text="Y", toggle=True)
- row.itemR(con, "invert_y", text="-", toggle=True)
- row.itemR(con, "locate_like_z", text="Z", toggle=True)
- row.itemR(con, "invert_z", text="-", toggle=True)
+ split = layout.split()
+
+ col = split.column()
+ col.itemR(con, "locate_like_x", text="X")
+ colsub = col.column()
+ colsub.active = con.locate_like_x
+ colsub.itemR(con, "invert_x", text="Invert")
+
+ col = split.column()
+ col.itemR(con, "locate_like_y", text="Y")
+ colsub = col.column()
+ colsub.active = con.locate_like_y
+ colsub.itemR(con, "invert_y", text="Invert")
+
+ col = split.column()
+ col.itemR(con, "locate_like_z", text="Z")
+ colsub = col.column()
+ colsub.active = con.locate_like_z
+ colsub.itemR(con, "invert_z", text="Invert")
- layout.itemR(con, "offset", toggle=True)
-
+ layout.itemR(con, "offset")
+
self.space_template(layout, con)
def copy_scale(self, layout, con):
self.target_template(layout, con)
row = layout.row(align=True)
- row.itemR(con, "size_like_x", text="X", toggle=True)
- row.itemR(con, "size_like_y", text="Y", toggle=True)
- row.itemR(con, "size_like_z", text="Z", toggle=True)
+ row.itemR(con, "size_like_x", text="X")
+ row.itemR(con, "size_like_y", text="Y")
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
