diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-06-27 07:05:19 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-06-27 07:05:19 +0400 |
commit | 2085a42e52f5b0d18a4516af15132d112b11a8c1 (patch) | |
tree | 1cc22295204861157183fe73a6220734e25c6f42 /release/scripts/startup/bl_ui | |
parent | bb42703ea34e539e441dd90f5cbba16599e91506 (diff) |
pep8 cleanup
Diffstat (limited to 'release/scripts/startup/bl_ui')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 30 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_freestyle.py | 28 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_game.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_physics_fluid.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 3 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_clip.py | 5 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 5 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_node.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 12 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 8 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 19 |
11 files changed, 60 insertions, 58 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 6f4ffbf3616..89e90618383 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -120,7 +120,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): def BEVEL(self, layout, ob, md): split = layout.split() - + col = split.column() col.prop(md, "width") col.prop(md, "segments") @@ -982,26 +982,26 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): def VERTEX_WEIGHT_EDIT(self, layout, ob, md): split = layout.split() - + col = split.column() col.label(text="Vertex Group:") col.prop_search(md, "vertex_group", ob, "vertex_groups", text="") col.label(text="Default Weight:") col.prop(md, "default_weight", text="") - + col = split.column() col.prop(md, "use_add") sub = col.column() sub.active = md.use_add sub.prop(md, "add_threshold") - + col = col.column() col.prop(md, "use_remove") sub = col.column() sub.active = md.use_remove sub.prop(md, "remove_threshold") - + layout.separator() layout.prop(md, "falloff_type") @@ -1047,20 +1047,20 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col = split.column() col.label(text="Target Object:") col.prop(md, "target", text="") - + split = layout.split() - + col = split.column() col.label(text="Distance:") col.prop(md, "proximity_mode", text="") if md.proximity_mode == 'GEOMETRY': col.row().prop(md, "proximity_geometry") - + col = split.column() col.label() col.prop(md, "min_dist") col.prop(md, "max_dist") - + layout.separator() layout.prop(md, "falloff_type") @@ -1070,25 +1070,25 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): def SKIN(self, layout, ob, md): layout.operator("object.skin_armature_create", text="Create Armature") - + layout.separator() - + col = layout.column(align=True) col.prop(md, "branch_smoothing") col.prop(md, "use_smooth_shade") - + split = layout.split() - + col = split.column() col.label(text="Selected Vertices:") sub = col.column(align=True) sub.operator("object.skin_loose_mark_clear", text="Mark Loose").action = 'MARK' sub.operator("object.skin_loose_mark_clear", text="Clear Loose").action = 'CLEAR' - + sub = col.column() sub.operator("object.skin_root_mark", text="Mark Root") sub.operator("object.skin_radii_equalize", text="Equalize Radii") - + col = split.column() col.label(text="Symmetry Axes:") col.prop(md, "use_x_symmetry") diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py index 96321eded50..eec753e1d04 100644 --- a/release/scripts/startup/bl_ui/properties_freestyle.py +++ b/release/scripts/startup/bl_ui/properties_freestyle.py @@ -47,7 +47,7 @@ class RENDER_PT_freestyle(RenderFreestyleButtonsPanel, Panel): def draw(self, context): layout = self.layout - + rd = context.scene.render layout.active = rd.use_freestyle @@ -55,7 +55,7 @@ class RENDER_PT_freestyle(RenderFreestyleButtonsPanel, Panel): row = layout.row() row.label(text="Line Thickness:") row.prop(rd, "line_thickness_mode", expand=True) - + if (rd.line_thickness_mode == 'ABSOLUTE'): layout.prop(rd, "line_thickness") @@ -65,7 +65,7 @@ class RENDER_PT_freestyle(RenderFreestyleButtonsPanel, Panel): # Render layer properties - + class RenderLayerFreestyleButtonsPanel(): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -77,7 +77,7 @@ class RenderLayerFreestyleButtonsPanel(): scene = context.scene rd = context.scene.render with_freestyle = bpy.app.build_options.freestyle - + return (scene and with_freestyle and rd.use_freestyle and rd.layers.active and(scene.render.engine in cls.COMPAT_ENGINES)) @@ -119,28 +119,28 @@ class RENDERLAYER_PT_freestyle(RenderLayerFreestyleButtonsPanel, Panel): def draw(self, context): layout = self.layout - + rd = context.scene.render rl = rd.layers.active freestyle = rl.freestyle_settings layout.active = rl.use_freestyle - + layout.prop(freestyle, "mode", text="Control mode") layout.label(text="Edge Detection Options:") - + split = layout.split() - + col = split.column() col.prop(freestyle, "crease_angle") col.prop(freestyle, "use_culling") col.prop(freestyle, "use_advanced_options") - + col = split.column() col.prop(freestyle, "use_smoothness") if freestyle.mode == 'SCRIPT': col.prop(freestyle, "use_material_boundaries") - + # Advanced options are hidden by default to warn new users if freestyle.use_advanced_options: if freestyle.mode == 'SCRIPT': @@ -184,7 +184,7 @@ class RENDERLAYER_PT_freestyle_lineset(RenderLayerFreestyleEditorButtonsPanel, P def draw(self, context): layout = self.layout - + rd = context.scene.render rl = rd.layers.active freestyle = rl.freestyle_settings @@ -233,14 +233,14 @@ class RENDERLAYER_PT_freestyle_lineset(RenderLayerFreestyleEditorButtonsPanel, P row.prop(lineset, "edge_type_combination", expand=True) split = col.split() - + sub = split.column() self.draw_edge_type_buttons(sub, lineset, "silhouette") self.draw_edge_type_buttons(sub, lineset, "border") self.draw_edge_type_buttons(sub, lineset, "contour") self.draw_edge_type_buttons(sub, lineset, "suggestive_contour") self.draw_edge_type_buttons(sub, lineset, "ridge_valley") - + sub = split.column() self.draw_edge_type_buttons(sub, lineset, "crease") self.draw_edge_type_buttons(sub, lineset, "edge_mark") @@ -518,7 +518,7 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, def draw(self, context): layout = self.layout - + rd = context.scene.render rl = rd.layers.active lineset = rl.freestyle_settings.linesets.active diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py index 48cfb6f816a..38e49853454 100644 --- a/release/scripts/startup/bl_ui/properties_game.py +++ b/release/scripts/startup/bl_ui/properties_game.py @@ -643,7 +643,7 @@ class WORLD_PT_game_physics(WorldButtonsPanel, Panel): sub.prop(gs, "deactivation_angular_threshold", text="Angular Threshold") sub = col.row() sub.prop(gs, "deactivation_time", text="Time") - + col = layout.column() col.prop(gs, "use_occlusion_culling", text="Occlusion Culling") sub = col.column() diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index 1392d21cf15..1fc61b7714e 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -67,10 +67,10 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, Panel): # odd formatting here so translation script can extract string layout.operator("fluid.bake", text=iface_("Bake (Req. Memory: %s)") % fluid.memory_estimate, translate=False, icon='MOD_FLUIDSIM') - + if bpy.app.build_options.openmp: layout.prop(fluid, "threads", text="Simulation Threads") - + split = layout.split() col = split.column() diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 904667eb976..799c109ae0c 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -78,6 +78,7 @@ class RENDER_PT_dimensions(RenderButtonsPanel, Panel): _frame_rate_args_prev = None _preset_class = None + @staticmethod def _draw_framerate_label(*args): # avoids re-creating text string each draw @@ -85,7 +86,7 @@ class RENDER_PT_dimensions(RenderButtonsPanel, Panel): return RENDER_PT_dimensions._frame_rate_ret fps, fps_base, preset_label = args - + if fps_base == 1.0: fps_rate = round(fps) else: diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 46ffe6bb68a..5048a93d565 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -336,7 +336,8 @@ class CLIP_PT_tools_solve(CLIP_PT_tracking_panel, Panel): col.prop(settings, "use_keyframe_selection") col = layout.column(align=True) - col.active = not settings.use_tripod_solver and not settings.use_keyframe_selection + col.active = (not settings.use_tripod_solver and + not settings.use_keyframe_selection) col.prop(tracking_object, "keyframe_a") col.prop(tracking_object, "keyframe_b") @@ -408,7 +409,7 @@ class CLIP_PT_tools_orientation(CLIP_PT_reconstruction_panel, Panel): layout.separator() col = layout.column() - row = col.row(align=True); + row = col.row(align=True) row.operator("clip.set_scale") row.operator("clip.apply_solution_scale", text="Apply Scale") col.prop(settings, "distance") diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index fd0f6dbc6fd..eb0d9c5082d 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -756,7 +756,6 @@ class IMAGE_PT_tools_brush_texture(BrushButtonsPanel, Panel): sub.prop(brush, "use_primary_overlay_override", toggle=True, text="", icon='BRUSH_DATA') - class IMAGE_PT_tools_mask_texture(BrushButtonsPanel, Panel): bl_label = "Texture Mask" bl_options = {'DEFAULT_CLOSED'} @@ -783,7 +782,7 @@ class IMAGE_PT_tools_mask_texture(BrushButtonsPanel, Panel): row.prop(brush, "use_secondary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF') else: row.prop(brush, "use_secondary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON') - + sub = row.row() sub.prop(brush, "mask_overlay_alpha", text="Alpha") sub.prop(brush, "use_secondary_overlay_override", toggle=True, text="", icon='BRUSH_DATA') @@ -901,7 +900,7 @@ class IMAGE_PT_tools_brush_appearance(BrushButtonsPanel, Panel): return col = layout.column() - col.prop(toolsettings, "show_brush"); + col.prop(toolsettings, "show_brush") col = col.column() col.prop(brush, "cursor_color_add", text="") diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 91eeb3d07b4..da41f9c6bef 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -131,7 +131,7 @@ class NODE_MT_view(Menu): layout.operator("node.properties", icon='MENU_PANEL') layout.operator("node.toolbar", icon='MENU_PANEL') - + layout.separator() layout.operator("view2d.zoom_in") diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 7cd8cb8fb7c..54387f10a8d 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1171,12 +1171,12 @@ class USERPREF_PT_addons(Panel): continue # check if addon should be visible with current filters - if ((filter == "All") or - (filter == info["category"]) or - (filter == "Enabled" and is_enabled) or - (filter == "Disabled" and not is_enabled) or - (filter == "User" and (mod.__file__.startswith((scripts_addons_folder, userpref_addons_folder)))) - ): + if ((filter == "All") or + (filter == info["category"]) or + (filter == "Enabled" and is_enabled) or + (filter == "Disabled" and not is_enabled) or + (filter == "User" and (mod.__file__.startswith((scripts_addons_folder, userpref_addons_folder)))) + ): if search and search not in info["name"].lower(): if info["author"]: diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 3dedfac103a..5e2095354e7 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -238,8 +238,10 @@ class VIEW3D_MT_transform_armature(VIEW3D_MT_transform_base): layout.separator() obj = context.object - if (obj.type == 'ARMATURE' and obj.mode in {'EDIT', 'POSE'} and - obj.data.draw_type in {'BBONE', 'ENVELOPE'}): + if (obj.type == 'ARMATURE' and obj.mode in {'EDIT', 'POSE'} and + obj.data.draw_type in {'BBONE', 'ENVELOPE'} + ): + layout.operator("transform.transform", text="Scale Envelope/BBone").mode = 'BONE_SIZE' if context.edit_object and context.edit_object.type == 'ARMATURE': @@ -989,7 +991,7 @@ class VIEW3D_MT_object_specials(Menu): props.data_path_item = "data.size_y" props.header_text = "Lamp Size Y: %.3f" - elif lamp.type in {'SPOT', 'POINT', 'SUN'}: + elif lamp.type in {'SPOT', 'POINT', 'SUN'}: props = layout.operator("wm.context_modal_mouse", text="Size") props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.shadow_soft_size" diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index a892a91d505..7bc6d476a4b 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -563,7 +563,7 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): row = col.row(align=True) ups = toolsettings.unified_paint_settings - if ((ups.use_unified_size and ups.use_locked_size) or + if ((ups.use_unified_size and ups.use_locked_size) or ((not ups.use_unified_size) and brush.use_locked_size)): self.prop_unified_size(row, context, brush, "use_locked_size", icon='LOCKED') self.prop_unified_size(row, context, brush, "unprojected_radius", slider=True, text="Radius") @@ -681,7 +681,7 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): row.prop(brush, "use_cursor_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF') else: row.prop(brush, "use_cursor_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON') - + sub = row.row() sub.prop(brush, "cursor_overlay_alpha", text="Alpha") sub.prop(brush, "use_cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') @@ -714,17 +714,16 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): col = layout.column(align=True) col.label(text="Overlay:") - row = col.row() + row = col.row() if brush.use_cursor_overlay: row.prop(brush, "use_cursor_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF') else: row.prop(brush, "use_cursor_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON') - + sub = row.row() sub.prop(brush, "cursor_overlay_alpha", text="Alpha") sub.prop(brush, "use_cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') - # Weight Paint Mode # elif context.weight_paint_object and brush: layout.prop(toolsettings, "use_auto_normalize", text="Auto Normalize") @@ -776,7 +775,7 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): row.prop(brush, "use_cursor_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF') else: row.prop(brush, "use_cursor_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON') - + sub = row.row() sub.prop(brush, "cursor_overlay_alpha", text="Alpha") sub.prop(brush, "use_cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') @@ -816,7 +815,7 @@ class VIEW3D_PT_tools_brush_texture(Panel, View3DPaintPanel): row.prop(brush, "use_primary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF') else: row.prop(brush, "use_primary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON') - + sub = row.row() sub.prop(brush, "texture_overlay_alpha", text="Alpha") sub.prop(brush, "use_primary_overlay_override", toggle=True, text="", icon='BRUSH_DATA') @@ -843,7 +842,7 @@ class VIEW3D_PT_tools_mask_texture(View3DPanel, Panel): col.template_ID_preview(brush, "mask_texture", new="texture.new", rows=3, cols=8) brush_mask_texture_settings(col, brush) - + col = layout.column(align=True) col.active = brush.brush_capabilities.has_overlay col.label(text="Overlay:") @@ -854,7 +853,7 @@ class VIEW3D_PT_tools_mask_texture(View3DPanel, Panel): row.prop(brush, "use_secondary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF') else: row.prop(brush, "use_secondary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON') - + sub = row.row() sub.prop(brush, "mask_overlay_alpha", text="Alpha") sub.prop(brush, "use_secondary_overlay_override", toggle=True, text="", icon='BRUSH_DATA') @@ -1083,7 +1082,7 @@ class VIEW3D_PT_tools_brush_appearance(Panel, View3DPaintPanel): return col = layout.column() - col.prop(settings, "show_brush"); + col.prop(settings, "show_brush") col = col.column() col.active = settings.show_brush |