From 6994413ed62a149bc24e70535485fced3fc7228d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 13 Jul 2023 15:02:00 +0200 Subject: [PATCH] Use new property names for 'use automatic values' button Adjustment of the job settings property names, making them more widely usable than just the 'use automatic values' button (also known as 'eval-on-submit'). --- addon/flamenco/gui.py | 2 +- addon/flamenco/job_types.py | 6 +++--- .../job_compilers/scripts/simple_blender_render.js | 9 +++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/addon/flamenco/gui.py b/addon/flamenco/gui.py index 9d6a27da..abad6c86 100644 --- a/addon/flamenco/gui.py +++ b/addon/flamenco/gui.py @@ -152,7 +152,7 @@ class FLAMENCO_PT_job_submission(bpy.types.Panel): split.label(text=label) row = split.row(align=True) - row.label(text=setting.eval_on_submit.placeholder) + row.label(text=getattr(setting.eval_info, "description") or "") row.prop( propgroup, job_types.setting_autoeval_propname(setting), diff --git a/addon/flamenco/job_types.py b/addon/flamenco/job_types.py index 407d7f54..b693d9ca 100644 --- a/addon/flamenco/job_types.py +++ b/addon/flamenco/job_types.py @@ -83,11 +83,11 @@ def setting_should_autoeval( def show_eval_on_submit_button(setting: _AvailableJobSetting) -> bool: """Return whether this setting should show the 'eval on submit' toggle button.""" - eval_on_submit = setting.get("eval_on_submit", None) - if not eval_on_submit: + eval_info = setting.get("eval_info", None) + if not eval_info: return False - show_button: bool = eval_on_submit.get("show_button", False) + show_button: bool = eval_info.get("show_link_button", False) return show_button diff --git a/internal/manager/job_compilers/scripts/simple_blender_render.js b/internal/manager/job_compilers/scripts/simple_blender_render.js index d39d00c2..1ca26866 100644 --- a/internal/manager/job_compilers/scripts/simple_blender_render.js +++ b/internal/manager/job_compilers/scripts/simple_blender_render.js @@ -4,10 +4,11 @@ const JOB_TYPE = { label: "Simple Blender Render", settings: [ // Settings for artists to determine: - { key: "frames", type: "string", required: true, eval: "f'{C.scene.frame_start}-{C.scene.frame_end}'", - evalOnSubmit: { - showButton: true, - placeholder: "Scene frame range", + { key: "frames", type: "string", required: true, + eval: "f'{C.scene.frame_start}-{C.scene.frame_end}'", + evalInfo: { + showLinkButton: true, + description: "Scene frame range", }, description: "Frame range to render. Examples: '47', '1-30', '3, 5-10, 47-327'" }, { key: "chunk_size", type: "int32", default: 1, description: "Number of frames to render in one Blender render task",