[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2278] trunk/py/scripts/addons: Addon UI Cleanup, Part 1

Thomas Dinges blender at dingto.org
Sat Aug 27 14:51:35 CEST 2011


Revision: 2278
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2278
Author:   dingto
Date:     2011-08-27 12:51:34 +0000 (Sat, 27 Aug 2011)
Log Message:
-----------
Addon UI Cleanup, Part 1
* General Rule (for Ivygen and Sapling): If you need more code for declaring the layouts than for the props itself, something is wrong. ;-)
* if > elif

Modified Paths:
--------------
    trunk/py/scripts/addons/add_curve_ivygen.py
    trunk/py/scripts/addons/add_curve_sapling/__init__.py
    trunk/py/scripts/addons/add_curve_torus_knots.py
    trunk/py/scripts/addons/add_mesh_BoltFactory/original_script_add_mesh_bolt.py
    trunk/py/scripts/addons/add_mesh_ant_landscape.py
    trunk/py/scripts/addons/add_mesh_extra_objects/add_mesh_gears.py
    trunk/py/scripts/addons/animation_rotobezier.py

Modified: trunk/py/scripts/addons/add_curve_ivygen.py
===================================================================
--- trunk/py/scripts/addons/add_curve_ivygen.py	2011-08-27 10:44:22 UTC (rev 2277)
+++ trunk/py/scripts/addons/add_curve_ivygen.py	2011-08-27 12:51:34 UTC (rev 2278)
@@ -607,12 +607,10 @@
 
     def draw(self, context):
         layout = self.layout
-        row = layout.row()
-        row.alignment = 'EXPAND'
-        row.prop(self, 'updateIvy', icon='CURVE_DATA')
+        
+        layout.prop(self, 'updateIvy', icon='CURVE_DATA')
 
-        row = layout.row()
-        properties = row.operator('curve.ivy_gen', text="Add New Ivy")
+        properties = layout.operator('curve.ivy_gen', text="Add New Ivy")
         properties.randomSeed = self.randomSeed
         properties.maxTime = self.maxTime
         properties.maxIvyLength = self.maxIvyLength
@@ -629,53 +627,40 @@
         properties.ivyLeafSize = self.ivyLeafSize
         properties.updateIvy = True
 
-        row = layout.row()
-        prop_def = row.operator('curve.ivy_gen', text="Add New Default Ivy")
+        prop_def = layout.operator('curve.ivy_gen', text="Add New Default Ivy")
         prop_def.updateIvy = True
 
-        row = layout.row()
-        row.prop(self, 'growLeaves')
+        layout.prop(self, 'growLeaves')
 
         box = layout.box()
-        box.label("Generation Settings")
-        row = box.row()
-        row.prop(self, 'randomSeed')
-        row = box.row()
-        row.prop(self, 'maxTime')
+        box.label("Generation Settings:")
+        box.prop(self, 'randomSeed')
+        box.prop(self, 'maxTime')
+        
         box = layout.box()
-        box.label("Size Settings")
-        row = box.row()
-        row.prop(self, 'maxIvyLength')
-        row = box.row()
-        row.prop(self, 'ivySize')
-        row = box.row()
-        row.prop(self, 'maxFloatLength')
-        row = box.row()
-        row.prop(self, 'maxAdhesionDistance')
+        box.label("Size Settings:")
+        box.prop(self, 'maxIvyLength')
+        box.prop(self, 'ivySize')
+        box.prop(self, 'maxFloatLength')
+        box.prop(self, 'maxAdhesionDistance')
+        
         box = layout.box()
-        box.label("Weight Settings")
-        row = box.row()
-        row.prop(self, 'primaryWeight')
-        row = box.row()
-        row.prop(self, 'randomWeight')
-        row = box.row()
-        row.prop(self, 'gravityWeight')
-        row = box.row()
-        row.prop(self, 'adhesionWeight')
+        box.label("Weight Settings:")
+        box.prop(self, 'primaryWeight')
+        box.prop(self, 'randomWeight')
+        box.prop(self, 'gravityWeight')
+        box.prop(self, 'adhesionWeight')
+        
         box = layout.box()
-        box.label("Branch Settings")
-        row = box.row()
-        row.prop(self, 'branchingProbability')
-        row = box.row()
-        row.prop(self, 'ivyBranchSize')
+        box.label("Branch Settings:")
+        box.prop(self, 'branchingProbability')
+        box.prop(self, 'ivyBranchSize')
 
         if self.growLeaves:
             box = layout.box()
-            box.label("Leaf Settings")
-            row = box.row()
-            row.prop(self, 'ivyLeafSize')
-            row = box.row()
-            row.prop(self, 'leafProbability')
+            box.label("Leaf Settings:")
+            box.prop(self, 'ivyLeafSize')
+            box.prop(self, 'leafProbability')
 
 
 def menu_func(self, context):

Modified: trunk/py/scripts/addons/add_curve_sapling/__init__.py
===================================================================
--- trunk/py/scripts/addons/add_curve_sapling/__init__.py	2011-08-27 10:44:22 UTC (rev 2277)
+++ trunk/py/scripts/addons/add_curve_sapling/__init__.py	2011-08-27 12:51:34 UTC (rev 2278)
@@ -403,35 +403,29 @@
         # Branch specs
         #layout.label('Tree Definition')
 
-        row = layout.row(align=True)
-        row.prop(self, 'chooseSet')
+        layout.prop(self, 'chooseSet')
 
         if self.chooseSet == '0':
             box = layout.box()
-            box.label('Geometry')
+            box.label("Geometry:")
+            box.prop(self, 'bevel')
+            
             row = box.row()
-            row.prop(self, 'bevel')
-            row = box.row()
             row.prop(self, 'bevelRes')
             row.prop(self, 'resU')
+            
+            box.prop(self, 'handleType')
+            box.prop(self, 'shape')
+            box.prop(self, 'seed')
+            box.prop(self, 'ratio')
+            
             row = box.row()
-            row.prop(self, 'handleType')
+            row.prop(self, 'scale')
+            row.prop(self, 'scaleV')
+            
             row = box.row()
-            row.prop(self, 'shape')
-            row = box.row()
-            row.prop(self, 'seed')
-            row = box.row()
-            row.prop(self, 'ratio')
-            row = box.row()
-            col = row.column()
-            col.prop(self, 'scale')
-            col = row.column()
-            col.prop(self, 'scaleV')
-            row = box.row()
-            col = row.column()
-            col.prop(self, 'scale0')
-            col = row.column()
-            col.prop(self, 'scaleV0')
+            row.prop(self, 'scale0')
+            row.prop(self, 'scaleV0')
 
             # Here we create a dict of all the properties.
             # Unfortunately as_keyword doesn't work with vector properties,
@@ -457,110 +451,88 @@
             row.menu('sapling.presetmenu', text='Load Preset')
             row.prop(self, 'limitImport')
 
-        if self.chooseSet == '1':
+        elif self.chooseSet == '1':
             box = layout.box()
-            box.label('Branch Splitting')
-            row = box.row()
-            row.prop(self, 'levels')
-            row = box.row()
-            row.prop(self, 'baseSplits')
-            row = box.row()
-            row.prop(self, 'baseSize')
-            row = box.row()
-            col = row.column()
+            box.label("Branch Splitting:")
+            box.prop(self, 'levels')
+            box.prop(self, 'baseSplits')
+            box.prop(self, 'baseSize')
+            
+            split = box.split()
+            
+            col = split.column()
             col.prop(self, 'branches')
-            col = row.column()
-            col.prop(self, 'segSplits')
-            row = box.row()
-            col = row.column()
             col.prop(self, 'splitAngle')
-            col = row.column()
-            col.prop(self, 'splitAngleV')
-            row = box.row()
-            col = row.column()
             col.prop(self, 'downAngle')
-            col = row.column()
-            col.prop(self, 'downAngleV')
-            row = box.row()
-            col = row.column()
             col.prop(self, 'rotate')
-            col = row.column()
+            
+            col = split.column()
+            col.prop(self, 'segSplits')
+            col.prop(self, 'splitAngleV')
+            col.prop(self, 'downAngleV')
             col.prop(self, 'rotateV')
-            row = box.row()
-            col = row.column()
-            col.prop(self, 'ratioPower')
 
-        if self.chooseSet == '2':
+            box.prop(self, 'ratioPower')
+
+        elif self.chooseSet == '2':
             box = layout.box()
-            box.label('Branch Growth')
-            row = box.row()
-            row.prop(self, 'startCurv')
-            row = box.row()
-            row.prop(self, 'attractUp')
-            row = box.row()
-            col = row.column()
+            box.label("Branch Growth:")
+            box.prop(self, 'startCurv')
+            box.prop(self, 'attractUp')
+            
+            split = box.split()
+            
+            col = split.column()
             col.prop(self, 'length')
-            col = row.column()
-            col.prop(self, 'lengthV')
-            row = box.row()
-            col = row.column()
             col.prop(self, 'curve')
-            col = row.column()
-            col.prop(self, 'curveV')
-            row = box.row()
-            col = row.column()
             col.prop(self, 'curveBack')
-            col = row.column()
+            
+            col = split.column()
+            col.prop(self, 'lengthV')
+            col.prop(self, 'curveV')
             col.prop(self, 'taper')
-            row = box.row()
-            col = row.column()
-            col.prop(self, 'curveRes')
+            
+            box.column().prop(self, 'curveRes')
 
-        if self.chooseSet == '3':
+        elif self.chooseSet == '3':
             box = layout.box()
-            box.label('Pruning')
+            box.label("Pruning:")
+            box.prop(self, 'prune')
+            box.prop(self, 'pruneRatio')
+            box.prop(self, 'pruneWidth')
+            box.prop(self, 'pruneWidthPeak')
+            
             row = box.row()
-            row.prop(self, 'prune')
-            row = box.row()
-            row.prop(self, 'pruneRatio')
-            row = box.row()
-            row.prop(self, 'pruneWidth')
-            row = box.row()
-            row.prop(self, 'pruneWidthPeak')
-            row = box.row()
             row.prop(self, 'prunePowerHigh')
             row.prop(self, 'prunePowerLow')
 
-        if self.chooseSet == '4':
+        elif self.chooseSet == '4':
             box = layout.box()
-            box.label('Leaves')
+            box.label("Leaves:")
+            box.prop(self, 'showLeaves')
+            box.prop(self, 'leafShape')
+            box.prop(self, 'leaves')
+            box.prop(self, 'leafDist')
+            
             row = box.row()
-            row.prop(self, 'showLeaves')
-            row = box.row()
-            row.prop(self, 'leafShape')
-            row = box.row()
-            row.prop(self, 'leaves')
-            row = box.row()
-            row.prop(self, 'leafDist')
-            row = box.row()
-            col = row.column()
-            col.prop(self, 'leafScale')
-            col = row.column()
-            col.prop(self, 'leafScaleX')
-            row = box.row()
-            row.prop(self, 'bend')
+            row.prop(self, 'leafScale')
+            row.prop(self, 'leafScaleX')
+            
+            box.prop(self, 'bend')
 
-        if self.chooseSet == '5':
+        elif self.chooseSet == '5':
             box = layout.box()
-            box.label('Armature and Animation')
+            box.label("Armature and Animation:")
+            
             row = box.row()

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-extensions-cvs mailing list