From fbf02c362507725fea95310ae252e0a502314fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 24 Jan 2017 15:15:08 +0100 Subject: [PATCH] Captialising labels/captions --- blender_cloud/blender.py | 14 +++++++------- blender_cloud/flamenco/__init__.py | 14 ++++++++------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/blender_cloud/blender.py b/blender_cloud/blender.py index 8082d53..ee6d254 100644 --- a/blender_cloud/blender.py +++ b/blender_cloud/blender.py @@ -155,12 +155,12 @@ class BlenderCloudPreferences(AddonPreferences): ) local_texture_dir = StringProperty( - name='Default Blender Cloud texture storage directory', + name='Default Blender Cloud Texture Storage Directory', subtype='DIR_PATH', default='//textures') open_browser_after_share = BoolProperty( - name='Open browser after sharing file', + name='Open Browser after Sharing File', description='When enabled, Blender will open a webbrowser', default=True ) @@ -169,7 +169,7 @@ class BlenderCloudPreferences(AddonPreferences): # can switch projects and the local path switches with it. attract_project = PointerProperty(type=BlenderCloudProjectGroup) attract_project_local_path = StringProperty( - name='Local project path', + name='Local Project Path', description='Local path of your Attract project, used to search for blend files; ' 'usually best to set to an absolute path', subtype='DIR_PATH', @@ -180,19 +180,19 @@ class BlenderCloudPreferences(AddonPreferences): # NOTE: The assumption is that the workers can also find the files in the same path. # This assumption is true for the Blender Institute. flamenco_job_file_path = StringProperty( - name='Job file path', + name='Job File Path', description='Path where to store job files, should be accesible for Workers too', subtype='DIR_PATH', default='/render/_flamenco/storage') # TODO: before making Flamenco public, change the defaults to something less Institute-specific. flamenco_job_output_path = StringProperty( - name='Job output path', + name='Job Output Path', description='Path where to store output files, should be accessible for Workers', subtype='DIR_PATH', default='/render/_flamenco/output') flamenco_job_output_strip_components = IntProperty( - name='Job output path strip components', + name='Job Output Path Strip Components', description='The final output path comprises of the job output path, and the blend file ' 'path relative to the project with this many path components stripped off ' 'the front', @@ -384,7 +384,7 @@ class BlenderCloudPreferences(AddonPreferences): props.path = self.flamenco_job_output_path job_output_box.prop(self, 'flamenco_job_output_strip_components', - text='Strip components') + text='Strip Components') from .flamenco import render_output_path diff --git a/blender_cloud/flamenco/__init__.py b/blender_cloud/flamenco/__init__.py index 1c458d1..d7cb277 100644 --- a/blender_cloud/flamenco/__init__.py +++ b/blender_cloud/flamenco/__init__.py @@ -216,6 +216,7 @@ class FLAMENCO_OT_render(async_loop.AsyncModalOperatorMixin, '; '.join(names)) else: self.report({'INFO'}, 'Flamenco job created.') + self.quit() def quit(self): @@ -455,18 +456,18 @@ class FLAMENCO_PT_render(bpy.types.Panel): layout.prop(context.scene, 'flamenco_render_job_priority') layout.prop(context.scene, 'flamenco_render_chunk_size') - labeled_row = layout.split(0.2, align=True) - labeled_row.label('Job type:') + labeled_row = layout.split(0.25, align=True) + labeled_row.label('Job Type:') labeled_row.prop(context.scene, 'flamenco_render_job_type', text='') - labeled_row = layout.split(0.2, align=True) - labeled_row.label('Frame range:') + labeled_row = layout.split(0.25, align=True) + labeled_row.label('Frame Range:') prop_btn_row = labeled_row.row(align=True) prop_btn_row.prop(context.scene, 'flamenco_render_frame_range', text='') prop_btn_row.operator('flamenco.scene_to_frame_range', text='', icon='ARROW_LEFTRIGHT') readonly_stuff = layout.column(align=True) - labeled_row = readonly_stuff.split(0.2, align=True) + labeled_row = readonly_stuff.split(0.25, align=True) labeled_row.label('Storage:') prop_btn_row = labeled_row.row(align=True) prop_btn_row.label(prefs.flamenco_job_file_path) @@ -474,7 +475,7 @@ class FLAMENCO_PT_render(bpy.types.Panel): text='', icon='DISK_DRIVE') props.path = prefs.flamenco_job_file_path - labeled_row = readonly_stuff.split(0.2, align=True) + labeled_row = readonly_stuff.split(0.25, align=True) labeled_row.label('Output:') prop_btn_row = labeled_row.row(align=True) render_output = render_output_path(context) @@ -552,6 +553,7 @@ def register(): description='Current status of the Flamenco add-on', update=redraw) + def unregister(): bpy.utils.unregister_module(__name__)