From 0370600f86d00c4e3394da794003d1e294ce5970 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Thu, 26 Nov 2020 18:19:44 +0100 Subject: [PATCH] add burnin and families SP --- .../defaults/project_settings/global.json | 9 +- .../project_settings/standalonepublisher.json | 12 -- .../schema_project_global.json | 179 ++++++++++++------ .../schema_project_standalonepublisher.json | 150 ++++----------- .../schemas/template_creatorfamily.json | 43 ----- 5 files changed, 167 insertions(+), 226 deletions(-) delete mode 100644 pype/tools/settings/settings/gui_schemas/projects_schema/schemas/template_creatorfamily.json diff --git a/pype/settings/defaults/project_settings/global.json b/pype/settings/defaults/project_settings/global.json index b68f6d87bd..dd379b6180 100644 --- a/pype/settings/defaults/project_settings/global.json +++ b/pype/settings/defaults/project_settings/global.json @@ -57,17 +57,18 @@ "y_offset": 5, "bg_padding": 5 }, - "fields": {}, "profiles": [ { + "families": [], + "hosts": [], "burnins": { "burnin": { "TOP_LEFT": "{yy}-{mm}-{dd}", - "TOP_RIGHT": "{anatomy[version]}", "TOP_CENTERED": "", - "BOTTOM_RIGHT": "{frame_start}-{current_frame}-{frame_end}", + "TOP_RIGHT": "{anatomy[version]}", + "BOTTOM_LEFT": "{username}", "BOTTOM_CENTERED": "{asset}", - "BOTTOM_LEFT": "{username}" + "BOTTOM_RIGHT": "{frame_start}-{current_frame}-{frame_end}" } } } diff --git a/pype/settings/defaults/project_settings/standalonepublisher.json b/pype/settings/defaults/project_settings/standalonepublisher.json index 21ea3db586..85b7a55b9c 100644 --- a/pype/settings/defaults/project_settings/standalonepublisher.json +++ b/pype/settings/defaults/project_settings/standalonepublisher.json @@ -97,18 +97,6 @@ "icon": "", "defaults": [], "help": "" - }, - "other_families": { - "create_background": { - "name": "background", - "label": "Background", - "family": "background", - "icon": "image", - "defaults": [ - "Main" - ], - "help": "Layered background from PSD." - } } } } \ No newline at end of file diff --git a/pype/tools/settings/settings/gui_schemas/projects_schema/schema_project_global.json b/pype/tools/settings/settings/gui_schemas/projects_schema/schema_project_global.json index ef8fc58257..a4c98ecddb 100644 --- a/pype/tools/settings/settings/gui_schemas/projects_schema/schema_project_global.json +++ b/pype/tools/settings/settings/gui_schemas/projects_schema/schema_project_global.json @@ -195,58 +195,120 @@ "checkbox_key": "enabled", "is_group": true, "children": [ - { - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "dict", - "collapsable": true, - "key": "options", - "label": "Burnin formating options", - "children": [ { - "type": "number", - "key": "font_size", - "label": "Font size" + "type": "boolean", + "key": "enabled", + "label": "Enabled" }, { - "type": "number", - "key": "opacity", - "label": "Font opacity" + "type": "dict", + "collapsable": true, + "key": "options", + "label": "Burnin formating options", + "children": [ + { + "type": "number", + "key": "font_size", + "label": "Font size" + }, + { + "type": "number", + "key": "opacity", + "label": "Font opacity" + }, + { + "type": "number", + "key": "bg_opacity", + "label": "Background opacity" + }, + { + "type": "number", + "key": "x_offset", + "label": "X Offset" + }, + { + "type": "number", + "key": "y_offset", + "label": "Y Offset" + }, + { + "type": "number", + "key": "bg_padding", + "label": "Padding aroung text" + }, + { + "type": "splitter" + }] }, + { - "type": "number", - "key": "bg_opacity", - "label": "Background opacity" - }, - { - "type": "number", - "key": "x_offset", - "label": "X Offset" - }, - { - "type": "number", - "key": "y_offset", - "label": "Y Offset" - }, - { - "type": "number", - "key": "bg_padding", - "label": "Padding aroung text" - }] - }, - { - "type": "raw-json", - "key": "fields", - "label": "Burnin Fields" - }, - { - "type": "raw-json", - "key": "profiles", - "label": "Burnin profiles" - }] + "type": "list", + "key": "profiles", + "label": "Profiles", + "object_type": + { + "type": "dict", + "children": [ + { + "key": "families", + "label": "Families", + "type": "list", + "object_type": "text" + }, + { + "key": "hosts", + "label": "Hosts", + "type": "list", + "object_type": "text" + }, + { + "type": "splitter" + }, + { + "key": "burnins", + "label": "Burnins", + "type": "dict-modifiable", + "highlight_content": true, + "collapsable": false, + "object_type": + { + "type": "dict", + "children": [ + { + "key": "TOP_LEFT", + "label": "Top Left", + "type": "text" + }, + { + "key": "TOP_CENTERED", + "label": "Top Centered", + "type": "text" + }, + { + "key": "TOP_RIGHT", + "label": "top Right", + "type": "text" + }, + { + "key": "BOTTOM_LEFT", + "label": "Bottom Left", + "type": "text" + }, + { + "key": "BOTTOM_CENTERED", + "label": "Bottom Centered", + "type": "text" + }, + { + "key": "BOTTOM_RIGHT", + "label": "BottomRight", + "type": "text" + }] + } + }] + } + } + ] }, { "type": "dict", @@ -308,35 +370,38 @@ "type": "list", "key": "maya", "label": "Maya", - "object_type":{ - "type":"text" + "object_type": + { + "type": "text" } }, { "type": "list", "key": "nuke", "label": "Nuke", - "object_type":{ - "type":"text" + "object_type": + { + "type": "text" } }, { "type": "list", "key": "aftereffects", "label": "After Effects", - "object_type":{ - "type":"text" + "object_type": + { + "type": "text" } }, { "type": "list", "key": "celaction", "label": "Celaction", - "object_type":{ - "type":"text" + "object_type": + { + "type": "text" } - } - ] + }] }] }] }] diff --git a/pype/tools/settings/settings/gui_schemas/projects_schema/schema_project_standalonepublisher.json b/pype/tools/settings/settings/gui_schemas/projects_schema/schema_project_standalonepublisher.json index 5e07d82de6..4a6e5f76ec 100644 --- a/pype/tools/settings/settings/gui_schemas/projects_schema/schema_project_standalonepublisher.json +++ b/pype/tools/settings/settings/gui_schemas/projects_schema/schema_project_standalonepublisher.json @@ -41,119 +41,49 @@ }] }, { - "type": "dict", + "type": "dict-modifiable", "collapsable": true, "key": "create", "label": "Creator plugins", "is_file": true, - "children": [ - { - "type": "schema_template", - "name": "template_creatorfamily", - "template_data": [ - { - "label": "Workfile", - "name": "workfile" - }] - }, - { - "type": "schema_template", - "name": "template_creatorfamily", - "template_data": [ - { - "label": "Model", - "name": "model" - }] - }, - { - "type": "schema_template", - "name": "template_creatorfamily", - "template_data": [ - { - "label": "Look", - "name": "look" - }] - }, - { - "type": "schema_template", - "name": "template_creatorfamily", - "template_data": [ - { - "label": "Rig", - "name": "rig" - }] - }, - { - "type": "schema_template", - "name": "template_creatorfamily", - "template_data": [ - { - "label": "Pointcache", - "name": "pointcache" - }] - }, - { - "type": "schema_template", - "name": "template_creatorfamily", - "template_data": [ - { - "label": "Plate", - "name": "plate" - }] - }, - { - "type": "schema_template", - "name": "template_creatorfamily", - "template_data": [ - { - "label": "Camera", - "name": "camera" - }] - }, - { - "type": "schema_template", - "name": "template_creatorfamily", - "template_data": [ - { - "label": "Maya Scene", - "name": "mayaAscii" - }] - }, - { - "type": "schema_template", - "name": "template_creatorfamily", - "template_data": [ - { - "label": "Editorial", - "name": "editorial" - }] - }, - { - "type": "schema_template", - "name": "template_creatorfamily", - "template_data": [ - { - "label": "Image", - "name": "image" - }] - }, - { - "type": "schema_template", - "name": "template_creatorfamily", - "template_data": [ - { - "label": "Matchmove", - "name": "matchmove" - }] - }, - { - "type": "dict-modifiable", - "key": "other_families", - "label": "Other Families", - "object_type": { - "type": "raw-json" - } - }] + "object_type": + { + "type": "dict", + "children": [ + { + "type": "text", + "key": "name", + "label": "Name" + }, + { + "type": "text", + "key": "label", + "label": "Label" + }, + { + "type": "text", + "key": "family", + "label": "Family" + }, + { + "type": "text", + "key": "icon", + "label": "Icon" + }, + { + "type": "list", + "key": "defaults", + "label": "Defaults", + "object_type": + { + "type": "text" + } + }, + { + "type": "text", + "key": "help", + "label": "Help" + }] + } }] - } diff --git a/pype/tools/settings/settings/gui_schemas/projects_schema/schemas/template_creatorfamily.json b/pype/tools/settings/settings/gui_schemas/projects_schema/schemas/template_creatorfamily.json deleted file mode 100644 index eaeccf2c87..0000000000 --- a/pype/tools/settings/settings/gui_schemas/projects_schema/schemas/template_creatorfamily.json +++ /dev/null @@ -1,43 +0,0 @@ -[ - { - "type": "dict", - "collapsable": true, - "key": "create_{name}", - "label": "{label}", - "children": [ - { - "type": "text", - "key": "name", - "label": "Name" - }, - { - "type": "text", - "key": "label", - "label": "Label" - }, - { - "type": "text", - "key": "family", - "label": "Family" - }, - { - "type": "text", - "key": "icon", - "label": "Icon" - }, - { - "type": "list", - "key": "defaults", - "label": "Defaults", - "object_type": { - "type": "text" - } - }, - { - "type": "text", - "key": "help", - "label": "Help" - } - ] - } -]