From eb22b5248229494bcab091e68cf7a354fe0cc0e3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 15 May 2012 18:50:51 +0000 Subject: style cleanup: pep8 --- release/scripts/startup/bl_operators/image.py | 6 ++++-- release/scripts/startup/bl_operators/presets.py | 3 --- release/scripts/startup/bl_ui/properties_animviz.py | 17 ++++++++--------- .../scripts/startup/bl_ui/properties_data_armature.py | 4 ++-- release/scripts/startup/bl_ui/properties_object.py | 2 +- release/scripts/startup/bl_ui/space_clip.py | 1 + release/scripts/startup/bl_ui/space_text.py | 2 +- release/scripts/startup/bl_ui/space_time.py | 2 +- release/scripts/startup/bl_ui/space_view3d.py | 16 ++++++++-------- 9 files changed, 26 insertions(+), 27 deletions(-) (limited to 'release/scripts') diff --git a/release/scripts/startup/bl_operators/image.py b/release/scripts/startup/bl_operators/image.py index 6af6488e86b..f2e5e57fad8 100644 --- a/release/scripts/startup/bl_operators/image.py +++ b/release/scripts/startup/bl_operators/image.py @@ -121,12 +121,14 @@ class SaveDirty(Operator): if image.packed_file: if image.library: self.report({'WARNING'}, - "Packed library image: %r from library %r can't be re-packed" % + "Packed library image: %r from library %r" + " can't be re-packed" % (image.name, image.library.filepath)) else: image.pack(as_png=True) else: - filepath = bpy.path.abspath(image.filepath, library=image.library) + filepath = bpy.path.abspath(image.filepath, + library=image.library) if "\\" not in filepath and "/" not in filepath: self.report({'WARNING'}, "Invalid path: " + filepath) elif filepath in unique_paths: diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py index 564d6d7d8cf..05f7f3f0367 100644 --- a/release/scripts/startup/bl_operators/presets.py +++ b/release/scripts/startup/bl_operators/presets.py @@ -129,9 +129,6 @@ class AddPresetBase(): value = eval(rna_path) rna_recursive_attr_expand(value, rna_path, 1) - - - file_preset.close() preset_menu_class.bl_label = bpy.path.display_name(filename) diff --git a/release/scripts/startup/bl_ui/properties_animviz.py b/release/scripts/startup/bl_ui/properties_animviz.py index 1f798f46590..3c1f910814a 100644 --- a/release/scripts/startup/bl_ui/properties_animviz.py +++ b/release/scripts/startup/bl_ui/properties_animviz.py @@ -35,7 +35,7 @@ class MotionPathButtonsPanel(): layout = self.layout mps = avs.motion_path - + # Display Range layout.prop(mps, "type", expand=True) @@ -50,21 +50,21 @@ class MotionPathButtonsPanel(): elif (mps.type == 'RANGE'): sub.prop(mps, "frame_start", text="Start") sub.prop(mps, "frame_end", text="End") - + sub.prop(mps, "frame_step", text="Step") - + col = split.column() if bones: col.label(text="Cache for Bone:") else: col.label(text="Cache:") - + if mpath: sub = col.column(align=True) sub.enabled = False sub.prop(mpath, "frame_start", text="From") sub.prop(mpath, "frame_end", text="To") - + if bones: col.operator("pose.paths_update", text="Update Paths", icon='BONE_DATA') else: @@ -72,15 +72,14 @@ class MotionPathButtonsPanel(): else: col.label(text="Not available yet...", icon='ERROR') col.label(text="Calculate Paths first", icon='INFO') - - + # Display Settings split = layout.split() - + col = split.column() col.label(text="Show:") col.prop(mps, "show_frame_numbers", text="Frame Numbers") - + col = split.column() col.prop(mps, "show_keyframe_highlight", text="Keyframes") sub = col.column() diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py index 529d7c5f981..6bec652045e 100644 --- a/release/scripts/startup/bl_ui/properties_data_armature.py +++ b/release/scripts/startup/bl_ui/properties_data_armature.py @@ -305,10 +305,10 @@ class DATA_PT_motion_paths(MotionPathButtonsPanel, Panel): ob = context.object avs = ob.pose.animation_visualisation - + pchan = context.active_pose_bone mpath = pchan.motion_path if pchan else None - + self.draw_settings(context, avs, mpath, bones=True) diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index cdef7e703e5..4f3ca26725c 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -301,7 +301,7 @@ class OBJECT_PT_motion_paths(MotionPathButtonsPanel, Panel): ob = context.object avs = ob.animation_visualisation mpath = ob.motion_path - + self.draw_settings(context, avs, mpath) diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index bd3f087e38a..4ab23359fd8 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -101,6 +101,7 @@ class CLIP_PT_clip_view_panel: return clip and sc.view == 'CLIP' + class CLIP_PT_tracking_panel: @classmethod diff --git a/release/scripts/startup/bl_ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py index d1daa4a5554..9c24e48300a 100644 --- a/release/scripts/startup/bl_ui/space_text.py +++ b/release/scripts/startup/bl_ui/space_text.py @@ -277,7 +277,7 @@ class TEXT_MT_edit(Menu): layout.separator() - layout.operator("text.move_lines", + layout.operator("text.move_lines", text="Move line(s) up").direction = 'UP' layout.operator("text.move_lines", text="Move line(s) down").direction = 'DOWN' diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py index 8fb587e2634..0f573c46d69 100644 --- a/release/scripts/startup/bl_ui/space_time.py +++ b/release/scripts/startup/bl_ui/space_time.py @@ -83,7 +83,7 @@ class TIME_HT_header(Header): row.prop(toolsettings, "use_keyframe_insert_auto", text="", toggle=True) if toolsettings.use_keyframe_insert_auto: row.prop(toolsettings, "use_keyframe_insert_keyingset", text="", toggle=True) - + if screen.is_animation_playing: subsub = row.row() subsub.prop(toolsettings, "use_record_with_nla", toggle=True) diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index f9e8f2b7793..e069d78bff0 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -93,7 +93,7 @@ class VIEW3D_HT_header(Header): if snap_element != 'INCREMENT': row.prop(toolsettings, "snap_target", text="") if obj: - if obj.mode in {'OBJECT','POSE'} and snap_element != 'VOLUME': + if obj.mode in {'OBJECT', 'POSE'} and snap_element != 'VOLUME': row.prop(toolsettings, "use_snap_align_rotation", text="") elif obj.mode == 'EDIT': row.prop(toolsettings, "use_snap_self", text="") @@ -164,7 +164,7 @@ class VIEW3D_MT_transform(VIEW3D_MT_transform_base): def draw(self, context): # base menu VIEW3D_MT_transform_base.draw(self, context) - + # generic... layout = self.layout layout.separator() @@ -178,16 +178,16 @@ class VIEW3D_MT_transform_object(VIEW3D_MT_transform_base): def draw(self, context): # base menu VIEW3D_MT_transform_base.draw(self, context) - + # object-specific option follow... layout = self.layout layout.separator() layout.operator("transform.translate", text="Move Texture Space").texture_space = True layout.operator("transform.resize", text="Scale Texture Space").texture_space = True - + layout.separator() - + layout.operator_context = 'EXEC_REGION_WIN' layout.operator("transform.transform", text="Align to Transform Orientation").mode = 'ALIGN' # XXX see alignmenu() in edit.c of b2.4x to get this working @@ -214,13 +214,13 @@ class VIEW3D_MT_transform_armature(VIEW3D_MT_transform_base): def draw(self, context): # base menu VIEW3D_MT_transform_base.draw(self, context) - + # armature specific extensions follow... layout = self.layout layout.separator() obj = context.object - if (obj.type == 'ARMATURE' and obj.mode in {'EDIT', 'POSE'} and + 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' @@ -1288,7 +1288,7 @@ class VIEW3D_MT_hide_mask(Menu): op = layout.operator("paint.hide_show", text="Show Bounding Box") op.action = 'SHOW' op.area = 'INSIDE' - + op = layout.operator("paint.hide_show", text="Hide Masked") op.area = 'MASKED' op.action = 'HIDE' -- cgit v1.2.3