archive/blender-cloud-addon
Archived
1
3
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Some code unindentation

Browse Source
This commit is contained in:
Sybren A. Stüvel 2018-03-16 12:40:05 +01:00
parent 5f58f8b6f7
commit 1d81f4bc38
1 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
blender_cloud/flamenco/__init__.py
View File

@ -675,52 +675,54 @@ class FLAMENCO_PT_render(bpy.types.Panel, FlamencoPollMixin):
render_output = render_output_path(context) render_output = render_output_path(context)
if render_output is None: if render_output is None:
paths_layout.label('Unable to render with Flamenco, outside of project directory.') paths_layout.label('Unable to render with Flamenco, outside of project directory.')
return
labeled_row = paths_layout.split(0.25, align=True)
labeled_row.label('Output:')
prop_btn_row = labeled_row.row(align=True)
if context.scene.flamenco_do_override_output_path:
prop_btn_row.prop(context.scene, 'flamenco_override_output_path', text='')
op = FLAMENCO_OT_disable_output_path_override.bl_idname
icon = 'X'
else: else:
prop_btn_row.label(str(render_output))
op = FLAMENCO_OT_enable_output_path_override.bl_idname
icon = 'GREASEPENCIL'
prop_btn_row.operator(op, icon=icon, text='')
props = prop_btn_row.operator(FLAMENCO_OT_explore_file_path.bl_idname,
text='', icon='DISK_DRIVE')
props.path = str(render_output.parent)
if context.scene.flamenco_do_override_output_path:
labeled_row = paths_layout.split(0.25, align=True) labeled_row = paths_layout.split(0.25, align=True)
labeled_row.label('Output:') labeled_row.label('Effective Output Path:')
prop_btn_row = labeled_row.row(align=True) labeled_row.label(str(render_output))
if context.scene.flamenco_do_override_output_path: # Show current status of Flamenco.
prop_btn_row.prop(context.scene, 'flamenco_override_output_path', text='') flamenco_status = context.window_manager.flamenco_status
op = FLAMENCO_OT_disable_output_path_override.bl_idname if flamenco_status in {'IDLE', 'ABORTED', 'DONE'}:
icon = 'X' layout.operator(FLAMENCO_OT_render.bl_idname,
else: text='Render on Flamenco',
prop_btn_row.label(str(render_output)) icon='RENDER_ANIMATION')
op = FLAMENCO_OT_enable_output_path_override.bl_idname elif flamenco_status == 'INVESTIGATING':
icon = 'GREASEPENCIL' row = layout.row(align=True)
prop_btn_row.operator(op, icon=icon, text='') row.label('Investigating your files')
row.operator(FLAMENCO_OT_abort.bl_idname, text='', icon='CANCEL')
props = prop_btn_row.operator(FLAMENCO_OT_explore_file_path.bl_idname, elif flamenco_status == 'COMMUNICATING':
text='', icon='DISK_DRIVE') layout.label('Communicating with Flamenco Server')
props.path = str(render_output.parent) elif flamenco_status == 'ABORTING':
row = layout.row(align=True)
if context.scene.flamenco_do_override_output_path: row.label('Aborting, please wait.')
labeled_row = paths_layout.split(0.25, align=True) row.operator(FLAMENCO_OT_abort.bl_idname, text='', icon='CANCEL')
labeled_row.label('Effective Output Path:') if flamenco_status == 'TRANSFERRING':
labeled_row.label(str(render_output)) row = layout.row(align=True)
row.prop(context.window_manager, 'flamenco_progress',
flamenco_status = context.window_manager.flamenco_status text=context.window_manager.flamenco_status_txt)
if flamenco_status in {'IDLE', 'ABORTED', 'DONE'}: row.operator(FLAMENCO_OT_abort.bl_idname, text='', icon='CANCEL')
layout.operator(FLAMENCO_OT_render.bl_idname, elif flamenco_status != 'IDLE' and context.window_manager.flamenco_status_txt:
text='Render on Flamenco', layout.label(context.window_manager.flamenco_status_txt)
icon='RENDER_ANIMATION')
elif flamenco_status == 'INVESTIGATING':
row = layout.row(align=True)
row.label('Investigating your files')
row.operator(FLAMENCO_OT_abort.bl_idname, text='', icon='CANCEL')
elif flamenco_status == 'COMMUNICATING':
layout.label('Communicating with Flamenco Server')
elif flamenco_status == 'ABORTING':
row = layout.row(align=True)
row.label('Aborting, please wait.')
row.operator(FLAMENCO_OT_abort.bl_idname, text='', icon='CANCEL')
if flamenco_status == 'TRANSFERRING':
row = layout.row(align=True)
row.prop(context.window_manager, 'flamenco_progress',
text=context.window_manager.flamenco_status_txt)
row.operator(FLAMENCO_OT_abort.bl_idname, text='', icon='CANCEL')
elif flamenco_status != 'IDLE' and context.window_manager.flamenco_status_txt:
layout.label(context.window_manager.flamenco_status_txt)
def activate(): def activate():