diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-04-04 18:52:15 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-04-04 18:52:15 +0400 |
commit | bc149e0fbe85819935eceb1ae5d54578e37d5247 (patch) | |
tree | 57378648167ae9f62a6b8b3d78ee12134d6979b0 /release/scripts/ui | |
parent | 97454d7b85e2be0259318e73a8d4ec662eb75985 (diff) |
pep8 cleanup
Diffstat (limited to 'release/scripts/ui')
-rw-r--r-- | release/scripts/ui/properties_data_modifier.py | 5 | ||||
-rw-r--r-- | release/scripts/ui/properties_object.py | 4 | ||||
-rw-r--r-- | release/scripts/ui/properties_physics_cloth.py | 2 | ||||
-rw-r--r-- | release/scripts/ui/properties_physics_fluid.py | 8 | ||||
-rw-r--r-- | release/scripts/ui/properties_scene.py | 6 | ||||
-rw-r--r-- | release/scripts/ui/space_image.py | 2 | ||||
-rw-r--r-- | release/scripts/ui/space_sequencer.py | 2 | ||||
-rw-r--r-- | release/scripts/ui/space_userpref.py | 6 | ||||
-rw-r--r-- | release/scripts/ui/space_view3d.py | 4 | ||||
-rw-r--r-- | release/scripts/ui/space_view3d_toolbar.py | 2 |
10 files changed, 23 insertions, 18 deletions
diff --git a/release/scripts/ui/properties_data_modifier.py b/release/scripts/ui/properties_data_modifier.py index 6e6a7e9e3c0..5ae971bce6f 100644 --- a/release/scripts/ui/properties_data_modifier.py +++ b/release/scripts/ui/properties_data_modifier.py @@ -497,14 +497,14 @@ class DATA_PT_modifiers(DataButtonsPanel): def SCREW(self, layout, ob, md, wide_ui): split = layout.split() - + col = split.column() col.prop(md, "axis") col.prop(md, "object", text="AxisOb") col.prop(md, "angle") col.prop(md, "steps") col.prop(md, "render_steps") - + if wide_ui: col = split.column() row = col.row() @@ -516,7 +516,6 @@ class DATA_PT_modifiers(DataButtonsPanel): col.prop(md, "use_normal_calculate") col.prop(md, "use_normal_flip") col.prop(md, "iterations") - def SHRINKWRAP(self, layout, ob, md, wide_ui): split = layout.split() diff --git a/release/scripts/ui/properties_object.py b/release/scripts/ui/properties_object.py index 36aa5c9c29e..7169d936904 100644 --- a/release/scripts/ui/properties_object.py +++ b/release/scripts/ui/properties_object.py @@ -272,6 +272,8 @@ class OBJECT_PT_duplication(ObjectButtonsPanel): layout.prop(ob, "dupli_group", text="") # XXX: the following options are all quite buggy, ancient hacks that should be dropped + + class OBJECT_PT_animation(ObjectButtonsPanel): bl_label = "Animation Hacks" bl_default_closed = True @@ -297,7 +299,7 @@ class OBJECT_PT_animation(ObjectButtonsPanel): row.prop(ob, "slow_parent") row.active = (ob.parent is not None) col.prop(ob, "time_offset", text="Offset") - + # XXX: these are still used for a few curve-related tracking features if wide_ui: col = split.column() diff --git a/release/scripts/ui/properties_physics_cloth.py b/release/scripts/ui/properties_physics_cloth.py index 7ea9e60ebbb..8761e8a38c0 100644 --- a/release/scripts/ui/properties_physics_cloth.py +++ b/release/scripts/ui/properties_physics_cloth.py @@ -135,6 +135,7 @@ class PHYSICS_PT_cloth(PhysicButtonsPanel): col.label(text="Rest Shape Key:") col.prop_object(cloth, "rest_shape_key", key, "keys", text="") + class PHYSICS_PT_cloth_cache(PhysicButtonsPanel): bl_label = "Cloth Cache" bl_default_closed = True @@ -186,6 +187,7 @@ class PHYSICS_PT_cloth_collision(PhysicButtonsPanel): layout.prop(cloth, "group") + class PHYSICS_PT_cloth_stiffness(PhysicButtonsPanel): bl_label = "Cloth Stiffness Scaling" bl_default_closed = True diff --git a/release/scripts/ui/properties_physics_fluid.py b/release/scripts/ui/properties_physics_fluid.py index c6fd7e930d9..c033b6b6870 100644 --- a/release/scripts/ui/properties_physics_fluid.py +++ b/release/scripts/ui/properties_physics_fluid.py @@ -53,7 +53,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel): row = split.row(align=True) row.prop(md, "render", text="") row.prop(md, "realtime", text="") - + fluid = md.settings else: @@ -75,11 +75,11 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel): layout.prop(fluid, "type", text="") if fluid.type not in ('NONE', 'DOMAIN', 'PARTICLE'): layout.prop(fluid, "active", text="") - + layout = layout.column() if fluid.type not in ('NONE', 'DOMAIN', 'PARTICLE'): layout.active = fluid.active - + if fluid.type == 'DOMAIN': layout.operator("fluid.bake", text="Bake Fluid Simulation", icon='MOD_FLUIDSIM') split = layout.split() @@ -243,7 +243,7 @@ class PHYSICS_PT_domain_gravity(PhysicButtonsPanel): else: col.label(text="Gravity:") col.prop(fluid, "gravity", text="") - + if scene.unit_settings.system != 'NONE': col.label(text="Using Scene Size Units", icon="SCENE_DATA") sub = col.column() diff --git a/release/scripts/ui/properties_scene.py b/release/scripts/ui/properties_scene.py index ff1de25673e..4b48ec926a6 100644 --- a/release/scripts/ui/properties_scene.py +++ b/release/scripts/ui/properties_scene.py @@ -89,7 +89,7 @@ class SCENE_PT_keying_sets(SceneButtonsPanel): row = layout.row() col = row.column() - # XXX: this fails because index is not what this expects... + # XXX: this fails because index is not what this expects... col.template_list(scene, "keying_sets", scene, "active_keying_set_index", rows=2) col = row.column(align=True) @@ -120,7 +120,7 @@ class SCENE_PT_keying_set_paths(SceneButtonsPanel): bl_label = "Active Keying Set" def poll(self, context): - return (context.scene.active_keying_set and context.scene.active_keying_set.absolute); + return (context.scene.active_keying_set and context.scene.active_keying_set.absolute) def draw(self, context): layout = self.layout @@ -163,7 +163,7 @@ class SCENE_PT_keying_set_paths(SceneButtonsPanel): col.prop(ksp, "grouping") if ksp.grouping == 'NAMED': col.prop(ksp, "group") - + col.label(text="Keyframing Settings:") col.prop(ksp, "insertkey_needed", text="Needed") col.prop(ksp, "insertkey_visual", text="Visual") diff --git a/release/scripts/ui/space_image.py b/release/scripts/ui/space_image.py index 626188a1b97..1c48b99939d 100644 --- a/release/scripts/ui/space_image.py +++ b/release/scripts/ui/space_image.py @@ -408,6 +408,7 @@ class IMAGE_PT_view_histogram(bpy.types.Panel): layout.template_histogram(sima, "histogram") + class IMAGE_PT_sample_line(bpy.types.Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'PREVIEW' @@ -423,6 +424,7 @@ class IMAGE_PT_sample_line(bpy.types.Panel): sima = context.space_data layout.template_histogram(sima, "sample_histogram") + class IMAGE_PT_view_properties(bpy.types.Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'UI' diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py index aada58806ad..4516499b47c 100644 --- a/release/scripts/ui/space_sequencer.py +++ b/release/scripts/ui/space_sequencer.py @@ -377,7 +377,7 @@ class SEQUENCER_PT_preview(bpy.types.Panel): col = layout.column() col.active = render.use_sequencer_gl_preview col.prop(render, "sequencer_gl_preview", text="") - + col = layout.column() col.prop(render, "use_sequencer_gl_render", text="Open GL Render") col = layout.column() diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/ui/space_userpref.py index 66c5860642a..83693ed2dff 100644 --- a/release/scripts/ui/space_userpref.py +++ b/release/scripts/ui/space_userpref.py @@ -164,9 +164,9 @@ class USERPREF_HT_header(bpy.types.Header): layout.operator_context = 'EXEC_AREA' layout.operator("wm.save_homefile", text="Save As Default") - + layout.operator_context = 'INVOKE_DEFAULT' - + if userpref.active_section == 'INPUT': op = layout.operator("wm.keyconfig_export") op.path = "keymap.py" @@ -175,7 +175,7 @@ class USERPREF_HT_header(bpy.types.Header): elif userpref.active_section == 'ADDONS': op = layout.operator("wm.addon_install") op.path = "*.py" - elif userpref.active_section == 'THEMES': + elif userpref.active_section == 'THEMES': op = layout.operator("ui.reset_default_theme") diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index 5a738ade684..fa0c5029416 100644 --- a/release/scripts/ui/space_view3d.py +++ b/release/scripts/ui/space_view3d.py @@ -1922,12 +1922,12 @@ class VIEW3D_PT_3dview_display(bpy.types.Panel): col.active = display_all split = col.split(percentage=0.55) split.prop(view, "display_floor", text="Grid Floor") - + row = split.row(align=True) row.prop(view, "display_x_axis", text="X", toggle=True) row.prop(view, "display_y_axis", text="Y", toggle=True) row.prop(view, "display_z_axis", text="Z", toggle=True) - + sub = col.column(align=True) sub.active = (display_all and view.display_floor) sub.prop(view, "grid_lines", text="Lines") diff --git a/release/scripts/ui/space_view3d_toolbar.py b/release/scripts/ui/space_view3d_toolbar.py index 603ed93efed..099e7944784 100644 --- a/release/scripts/ui/space_view3d_toolbar.py +++ b/release/scripts/ui/space_view3d_toolbar.py @@ -606,7 +606,7 @@ class VIEW3D_PT_tools_brush(PaintPanel): col = layout.column() col.active = (brush.blend not in ('ERASE_ALPHA', 'ADD_ALPHA')) col.prop(brush, "use_alpha") - + # Weight Paint Mode # |