From e7abb30da2dc4c8df14dd9ae173b87eca8b3e9c6 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Thu, 1 Oct 2020 23:57:12 +0200 Subject: [PATCH 1/5] add application schemas --- .../system_settings/global/applications.json | 286 ++++++++++++++++-- .../system_settings/global/hosts.json | 34 +++ .../system_schema/0_system_gui_schema.json | 3 + .../1_applications_gui_schema.json | 151 ++------- .../system_schema/1_hosts_gui_schema.json | 139 +++++++++ .../system_schema/system_harmony_schema.json | 86 ++++++ .../system_schema/system_hiero_schema.json | 128 ++++++++ .../system_schema/system_host_exe_schema.json | 39 +++ .../system_schema/system_houdini_schema.json | 52 ++++ .../system_schema/system_maya_schema.json | 69 +++++ .../system_schema/system_nuke_schema.json | 128 ++++++++ .../system_photoshop_schema.json | 35 +++ 12 files changed, 989 insertions(+), 161 deletions(-) create mode 100644 pype/settings/defaults/system_settings/global/hosts.json create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/1_hosts_gui_schema.json create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/system_harmony_schema.json create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/system_hiero_schema.json create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/system_host_exe_schema.json create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/system_houdini_schema.json create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/system_maya_schema.json create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/system_nuke_schema.json create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/system_photoshop_schema.json diff --git a/pype/settings/defaults/system_settings/global/applications.json b/pype/settings/defaults/system_settings/global/applications.json index e85e5864d9..2cf64e396b 100644 --- a/pype/settings/defaults/system_settings/global/applications.json +++ b/pype/settings/defaults/system_settings/global/applications.json @@ -1,34 +1,256 @@ { - "blender_2.80": false, - "blender_2.81": false, - "blender_2.82": false, - "blender_2.83": true, - "celaction_local": true, - "celaction_remote": true, - "harmony_17": true, - "maya_2017": false, - "maya_2018": false, - "maya_2019": true, - "maya_2020": true, - "nuke_10.0": false, - "nuke_11.2": false, - "nuke_11.3": true, - "nuke_12.0": true, - "nukex_10.0": false, - "nukex_11.2": false, - "nukex_11.3": true, - "nukex_12.0": true, - "nukestudio_10.0": false, - "nukestudio_11.2": false, - "nukestudio_11.3": true, - "nukestudio_12.0": true, - "houdini_16": false, - "houdini_16.5": false, - "houdini_17": false, - "houdini_18": true, - "premiere_2019": false, - "premiere_2020": true, - "resolve_16": true, - "storyboardpro_7": true, - "unreal_4.24": true + "maya": { + "enabled": true, + "environment": {}, + "maya_2020": { + "enabled": true, + "common": { + "executable": { + "windows": [], + "linux": [], + "mac": [] + }, + "environment": {} + } + }, + "maya_2019": { + "enabled": true, + "common": { + "executable": { + "windows": [], + "linux": [], + "mac": [] + }, + "environment": {} + } + }, + "maya_2018": { + "enabled": true, + "common": { + "executable": { + "windows": [], + "linux": [], + "mac": [] + }, + "environment": {} + } + } + }, + "nuke": { + "enabled": true, + "environment": {}, + "nuke_12.1": { + "enabled": true, + "nukeX": true, + "common": { + "executable": { + "windows": [], + "linux": [], + "mac": [] + }, + "environment": {} + } + }, + "nuke_11.3": { + "enabled": true, + "nukeX": true, + "common": { + "executable": { + "windows": [], + "linux": [], + "mac": [] + }, + "environment": {} + } + }, + "nuke_11.2": { + "enabled": true, + "nukeX": true, + "common": { + "executable": { + "windows": [], + "linux": [], + "mac": [] + }, + "environment": {} + } + }, + "nuke_11.1": { + "enabled": true, + "nukeX": true, + "common": { + "executable": { + "windows": [], + "linux": [], + "mac": [] + }, + "environment": {} + } + }, + "nuke_10": { + "enabled": true, + "nukeX": true, + "common": { + "executable": { + "windows": [], + "linux": [], + "mac": [] + }, + "environment": {} + } + } + }, + "hiero": { + "enabled": true, + "environment": {}, + "hiero_12.1": { + "enabled": true, + "nukestudio": true, + "common": { + "executable": { + "windows": [], + "linux": [], + "mac": [] + }, + "environment": {} + } + }, + "hiero_11.3": { + "enabled": true, + "nukestudio": true, + "common": { + "executable": { + "windows": [], + "linux": [], + "mac": [] + }, + "environment": {} + } + }, + "hiero_11.2": { + "enabled": true, + "nukestudio": true, + "common": { + "executable": { + "windows": [], + "linux": [], + "mac": [] + }, + "environment": {} + } + }, + "hiero_11.1": { + "enabled": true, + "nukestudio": true, + "common": { + "executable": { + "windows": [], + "linux": [], + "mac": [] + }, + "environment": {} + } + }, + "hiero_10": { + "enabled": true, + "nukestudio": true, + "common": { + "executable": { + "windows": [], + "linux": [], + "mac": [] + }, + "environment": {} + } + } + }, + "houdini": { + "enabled": true, + "environment": {}, + "houdini_18": { + "enabled": true, + "common": { + "executable": { + "windows": [], + "linux": [], + "mac": [] + }, + "environment": {} + } + }, + "houdini_17": { + "enabled": true, + "common": { + "executable": { + "windows": [], + "linux": [], + "mac": [] + }, + "environment": {} + } + } + }, + "harmony": { + "enabled": true, + "environment_maya": {}, + "harmony_20": { + "enabled": true, + "common": { + "executable": { + "windows": [], + "linux": [], + "mac": [] + }, + "environment": {} + } + }, + "harmony_19": { + "enabled": true, + "common": { + "executable": { + "windows": [], + "linux": [], + "mac": [] + }, + "environment": {} + } + }, + "harmony_18": { + "enabled": true, + "common": { + "executable": { + "windows": [], + "linux": [], + "mac": [] + }, + "environment": {} + } + }, + "harmony_17": { + "enabled": true, + "common": { + "executable": { + "windows": [], + "linux": [], + "mac": [] + }, + "environment": {} + } + } + }, + "photoshop": { + "enabled": true, + "environment": {}, + "photoshop_2020": { + "enabled": true, + "common": { + "executable": { + "windows": [], + "linux": [], + "mac": [] + }, + "environment": {} + } + } + } } \ No newline at end of file diff --git a/pype/settings/defaults/system_settings/global/hosts.json b/pype/settings/defaults/system_settings/global/hosts.json new file mode 100644 index 0000000000..35ee708df3 --- /dev/null +++ b/pype/settings/defaults/system_settings/global/hosts.json @@ -0,0 +1,34 @@ +{ + "blender_2.80": true, + "blender_2.81": true, + "blender_2.82": true, + "blender_2.83": true, + "celaction_local": true, + "celaction_remote": true, + "harmony_17": true, + "maya_2017": true, + "maya_2018": true, + "maya_2019": true, + "maya_2020": true, + "nuke_10.0": true, + "nuke_11.2": true, + "nuke_11.3": true, + "nuke_12.0": true, + "nukex_10.0": true, + "nukex_11.2": true, + "nukex_11.3": true, + "nukex_12.0": true, + "nukestudio_10.0": true, + "nukestudio_11.2": true, + "nukestudio_11.3": true, + "nukestudio_12.0": true, + "houdini_16": true, + "houdini_16.5": true, + "houdini_17": true, + "houdini_18": true, + "premiere_2019": true, + "premiere_2020": true, + "resolve_16": true, + "storyboardpro_7": true, + "unreal_4.24": true +} \ No newline at end of file diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/0_system_gui_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/0_system_gui_schema.json index c5f229fc2f..dbae81501e 100644 --- a/pype/tools/settings/settings/gui_schemas/system_schema/0_system_gui_schema.json +++ b/pype/tools/settings/settings/gui_schemas/system_schema/0_system_gui_schema.json @@ -14,6 +14,9 @@ }, { "type": "schema", "name": "1_applications_gui_schema" + }, { + "type": "schema", + "name": "1_hosts_gui_schema" }, { "type": "schema", "name": "1_tools_gui_schema" diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/1_applications_gui_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/1_applications_gui_schema.json index 3427f98253..95e2763f35 100644 --- a/pype/tools/settings/settings/gui_schemas/system_schema/1_applications_gui_schema.json +++ b/pype/tools/settings/settings/gui_schemas/system_schema/1_applications_gui_schema.json @@ -3,137 +3,30 @@ "type": "dict", "label": "Applications", "collapsable": true, - "is_group": true, "is_file": true, - "children": [ + "children": [{ + "type": "schema", + "name": "system_maya_schema" + }, { - "type": "boolean", - "key": "blender_2.80", - "label": "Blender 2.80" - }, { - "type": "boolean", - "key": "blender_2.81", - "label": "Blender 2.81" - }, { - "type": "boolean", - "key": "blender_2.82", - "label": "Blender 2.82" - }, { - "type": "boolean", - "key": "blender_2.83", - "label": "Blender 2.83" - }, { - "type": "boolean", - "key": "celaction_local", - "label": "Celaction Local" - }, { - "type": "boolean", - "key": "celaction_remote", - "label": "Celaction Remote" - }, { - "type": "boolean", - "key": "harmony_17", - "label": "Harmony 17" - }, { - "type": "boolean", - "key": "maya_2017", - "label": "Autodest Maya 2017" - }, { - "type": "boolean", - "key": "maya_2018", - "label": "Autodest Maya 2018" - }, { - "type": "boolean", - "key": "maya_2019", - "label": "Autodest Maya 2019" - }, { - "type": "boolean", - "key": "maya_2020", - "label": "Autodest Maya 2020" - }, { - "key": "nuke_10.0", - "type": "boolean", - "label": "Nuke 10.0" - }, { - "type": "boolean", - "key": "nuke_11.2", - "label": "Nuke 11.2" - }, { - "type": "boolean", - "key": "nuke_11.3", - "label": "Nuke 11.3" - }, { - "type": "boolean", - "key": "nuke_12.0", - "label": "Nuke 12.0" - }, { - "type": "boolean", - "key": "nukex_10.0", - "label": "NukeX 10.0" - }, { - "type": "boolean", - "key": "nukex_11.2", - "label": "NukeX 11.2" - }, { - "type": "boolean", - "key": "nukex_11.3", - "label": "NukeX 11.3" - }, { - "type": "boolean", - "key": "nukex_12.0", - "label": "NukeX 12.0" - }, { - "type": "boolean", - "key": "nukestudio_10.0", - "label": "NukeStudio 10.0" - }, { - "type": "boolean", - "key": "nukestudio_11.2", - "label": "NukeStudio 11.2" - }, { - "type": "boolean", - "key": "nukestudio_11.3", - "label": "NukeStudio 11.3" - }, { - "type": "boolean", - "key": "nukestudio_12.0", - "label": "NukeStudio 12.0" - }, { - "type": "boolean", - "key": "houdini_16", - "label": "Houdini 16" - }, { - "type": "boolean", - "key": "houdini_16.5", - "label": "Houdini 16.5" - }, { - "type": "boolean", - "key": "houdini_17", - "label": "Houdini 17" - }, { - "type": "boolean", - "key": "houdini_18", - "label": "Houdini 18" - }, { - "type": "boolean", - "key": "premiere_2019", - "label": "Premiere 2019" - }, { - "type": "boolean", - "key": "premiere_2020", - "label": "Premiere 2020" - }, { - "type": "boolean", - "key": "resolve_16", - "label": "BM DaVinci Resolve 16" - }, { - "type": "boolean", - "key": "storyboardpro_7", - "label": "Storyboard Pro 7" - }, { - "type": "boolean", - "key": "unreal_4.24", - "label": "Unreal Editor 4.24" + "type": "schema", + "name": "system_nuke_schema" + }, + { + "type": "schema", + "name": "system_hiero_schema" + }, + { + "type": "schema", + "name": "system_houdini_schema" + }, + { + "type": "schema", + "name": "system_harmony_schema" + }, + { + "type": "schema", + "name": "system_photoshop_schema" } ] } diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/1_hosts_gui_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/1_hosts_gui_schema.json new file mode 100644 index 0000000000..277b9d1d8e --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/1_hosts_gui_schema.json @@ -0,0 +1,139 @@ +{ + "key": "hosts", + "type": "dict", + "label": "Hosts", + "collapsable": true, + "is_group": true, + "is_file": true, + "children": [ + { + "type": "boolean", + "key": "blender_2.80", + "label": "Blender 2.80" + }, { + "type": "boolean", + "key": "blender_2.81", + "label": "Blender 2.81" + }, { + "type": "boolean", + "key": "blender_2.82", + "label": "Blender 2.82" + }, { + "type": "boolean", + "key": "blender_2.83", + "label": "Blender 2.83" + }, { + "type": "boolean", + "key": "celaction_local", + "label": "Celaction Local" + }, { + "type": "boolean", + "key": "celaction_remote", + "label": "Celaction Remote" + }, { + "type": "boolean", + "key": "harmony_17", + "label": "Harmony 17" + }, { + "type": "boolean", + "key": "maya_2017", + "label": "Autodest Maya 2017" + }, { + "type": "boolean", + "key": "maya_2018", + "label": "Autodest Maya 2018" + }, { + "type": "boolean", + "key": "maya_2019", + "label": "Autodest Maya 2019" + }, { + "type": "boolean", + "key": "maya_2020", + "label": "Autodest Maya 2020" + }, { + "key": "nuke_10.0", + "type": "boolean", + "label": "Nuke 10.0" + }, { + "type": "boolean", + "key": "nuke_11.2", + "label": "Nuke 11.2" + }, { + "type": "boolean", + "key": "nuke_11.3", + "label": "Nuke 11.3" + }, { + "type": "boolean", + "key": "nuke_12.0", + "label": "Nuke 12.0" + }, { + "type": "boolean", + "key": "nukex_10.0", + "label": "NukeX 10.0" + }, { + "type": "boolean", + "key": "nukex_11.2", + "label": "NukeX 11.2" + }, { + "type": "boolean", + "key": "nukex_11.3", + "label": "NukeX 11.3" + }, { + "type": "boolean", + "key": "nukex_12.0", + "label": "NukeX 12.0" + }, { + "type": "boolean", + "key": "nukestudio_10.0", + "label": "NukeStudio 10.0" + }, { + "type": "boolean", + "key": "nukestudio_11.2", + "label": "NukeStudio 11.2" + }, { + "type": "boolean", + "key": "nukestudio_11.3", + "label": "NukeStudio 11.3" + }, { + "type": "boolean", + "key": "nukestudio_12.0", + "label": "NukeStudio 12.0" + }, { + "type": "boolean", + "key": "houdini_16", + "label": "Houdini 16" + }, { + "type": "boolean", + "key": "houdini_16.5", + "label": "Houdini 16.5" + }, { + "type": "boolean", + "key": "houdini_17", + "label": "Houdini 17" + }, { + "type": "boolean", + "key": "houdini_18", + "label": "Houdini 18" + }, { + "type": "boolean", + "key": "premiere_2019", + "label": "Premiere 2019" + }, { + "type": "boolean", + "key": "premiere_2020", + "label": "Premiere 2020" + }, { + "type": "boolean", + "key": "resolve_16", + "label": "BM DaVinci Resolve 16" + }, { + "type": "boolean", + "key": "storyboardpro_7", + "label": "Storyboard Pro 7" + }, { + "type": "boolean", + "key": "unreal_4.24", + "label": "Unreal Editor 4.24" + } + ] +} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/system_harmony_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/system_harmony_schema.json new file mode 100644 index 0000000000..4ef97bc8a2 --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/system_harmony_schema.json @@ -0,0 +1,86 @@ +{ + "type": "dict", + "key": "harmony", + "label": "Toon Boom Harmony", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "raw-json", + "key": "environment_maya", + "label": "Environment" + }, + { + "type": "dict", + "key": "harmony_20", + "label": "20", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "schema", + "name": "system_host_exe_schema" + } + ] + }, + { + "type": "dict", + "key": "harmony_19", + "label": "19", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "schema", + "name": "system_host_exe_schema" + } + ] + }, + { + "type": "dict", + "key": "harmony_18", + "label": "18", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "schema", + "name": "system_host_exe_schema" + } + ] + }, + { + "type": "dict", + "key": "harmony_17", + "label": "17", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "schema", + "name": "system_host_exe_schema" + } + ] + } + ] +} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/system_hiero_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/system_hiero_schema.json new file mode 100644 index 0000000000..ecbb98b281 --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/system_hiero_schema.json @@ -0,0 +1,128 @@ +{ + "type": "dict", + "key": "hiero", + "label": "Foundry Hiero / Nuke Studio", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "raw-json", + "key": "environment", + "label": "Environment" + }, + { + "type": "dict", + "key": "hiero_12.1", + "label": "12.1", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "nukestudio", + "label": "Nuke Studio" + }, + { + "type": "schema", + "name": "system_host_exe_schema" + } + ] + }, + { + "type": "dict", + "key": "hiero_11.3", + "label": "11.3", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "nukestudio", + "label": "Nuke Studio" + }, + { + "type": "schema", + "name": "system_host_exe_schema" + } + ] + }, + { + "type": "dict", + "key": "hiero_11.2", + "label": "11.2", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "nukestudio", + "label": "Nuke Studio" + }, + { + "type": "schema", + "name": "system_host_exe_schema" + } + ] + }, + { + "type": "dict", + "key": "hiero_11.1", + "label": "11.1", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "nukestudio", + "label": "Nuke Studio" + }, + { + "type": "schema", + "name": "system_host_exe_schema" + } + ] + }, + { + "type": "dict", + "key": "hiero_10", + "label": "10", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "nukestudio", + "label": "Nuke Studio" + }, + { + "type": "schema", + "name": "system_host_exe_schema" + } + ] + } + ] +} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/system_host_exe_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/system_host_exe_schema.json new file mode 100644 index 0000000000..7bf40ba69e --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/system_host_exe_schema.json @@ -0,0 +1,39 @@ +{ + "type": "dict-invisible", + "key": "common", + "children": [{ + "type": "dict-invisible", + "key": "executable", + "children": [{ + "type": "list", + "key": "windows", + "label": "Windows Executable", + "object_type": { + "type": "text", + "multiline": false + } + }, { + "type": "list", + "key": "linux", + "label": "Linux Executable", + "object_type": { + "type": "text", + "multiline": false + } + }, { + "type": "list", + "key": "mac", + "label": "Mac Executable", + "object_type": { + "type": "text", + "multiline": false + } + }] + }, + { + "type": "raw-json", + "key": "environment", + "label": "Environment" + } + ] +} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/system_houdini_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/system_houdini_schema.json new file mode 100644 index 0000000000..a6f58da172 --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/system_houdini_schema.json @@ -0,0 +1,52 @@ +{ + "type": "dict", + "key": "houdini", + "label": "SideFX Houdini", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "raw-json", + "key": "environment", + "label": "Environment" + }, + { + "type": "dict", + "key": "houdini_18", + "label": "18", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "schema", + "name": "system_host_exe_schema" + } + ] + }, + { + "type": "dict", + "key": "houdini_17", + "label": "17", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "schema", + "name": "system_host_exe_schema" + } + ] + } + ] +} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/system_maya_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/system_maya_schema.json new file mode 100644 index 0000000000..5c76f65792 --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/system_maya_schema.json @@ -0,0 +1,69 @@ +{ + "type": "dict", + "key": "maya", + "label": "Autodesk Maya", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "raw-json", + "key": "environment", + "label": "Environment" + }, + { + "type": "dict", + "key": "maya_2020", + "label": "2020", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "schema", + "name": "system_host_exe_schema" + } + ] + }, + { + "type": "dict", + "key": "maya_2019", + "label": "2019", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "schema", + "name": "system_host_exe_schema" + } + ] + }, + { + "type": "dict", + "key": "maya_2018", + "label": "2018", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "schema", + "name": "system_host_exe_schema" + } + ] + } + ] +} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/system_nuke_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/system_nuke_schema.json new file mode 100644 index 0000000000..205a4bb11a --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/system_nuke_schema.json @@ -0,0 +1,128 @@ +{ + "type": "dict", + "key": "nuke", + "label": "Foundry Nuke", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "raw-json", + "key": "environment", + "label": "Environment" + }, + { + "type": "dict", + "key": "nuke_12.1", + "label": "12.1", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "nukeX", + "label": "Nuke X" + }, + { + "type": "schema", + "name": "system_host_exe_schema" + } + ] + }, + { + "type": "dict", + "key": "nuke_11.3", + "label": "11.3", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "nukeX", + "label": "Nuke X" + }, + { + "type": "schema", + "name": "system_host_exe_schema" + } + ] + }, + { + "type": "dict", + "key": "nuke_11.2", + "label": "11.2", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "nukeX", + "label": "Nuke X" + }, + { + "type": "schema", + "name": "system_host_exe_schema" + } + ] + }, + { + "type": "dict", + "key": "nuke_11.1", + "label": "11.1", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "nukeX", + "label": "Nuke X" + }, + { + "type": "schema", + "name": "system_host_exe_schema" + } + ] + }, + { + "type": "dict", + "key": "nuke_10", + "label": "10", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "nukeX", + "label": "Nuke X" + }, + { + "type": "schema", + "name": "system_host_exe_schema" + } + ] + } + ] +} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/system_photoshop_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/system_photoshop_schema.json new file mode 100644 index 0000000000..d04bcbed09 --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/system_photoshop_schema.json @@ -0,0 +1,35 @@ +{ + "type": "dict", + "key": "photoshop", + "label": "Adobe Photoshop", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "raw-json", + "key": "environment", + "label": "Environment" + }, + { + "type": "dict", + "key": "photoshop_2020", + "label": "2020", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "schema", + "name": "system_host_exe_schema" + } + ] + } + ] +} From 3f088b8bebb34a85cf044a06ca883a175a7221cd Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Fri, 2 Oct 2020 17:03:38 +0200 Subject: [PATCH 2/5] add hosts schemas to settings --- .../system_settings/global/applications.json | 703 ++++++++++++++---- .../system_schema/0_system_gui_schema.json | 3 - .../1_applications_gui_schema.json | 54 +- .../system_schema/1_hosts_gui_schema.json | 139 ---- .../host_settings/system_blender_schema.json | 35 + .../system_celaction_schema.json | 39 + .../host_settings/system_fusion_schema.json | 35 + .../host_settings/system_harmony_schema.json | 51 ++ .../host_settings/system_host_template.json | 33 + .../host_settings/system_houdini_schema.json | 35 + .../host_settings/system_maya_schema.json | 43 ++ .../host_settings/system_nuke_template.json | 65 ++ .../system_photoshop_schema.json | 27 + .../host_settings/system_resolve_schema.json | 27 + .../host_settings/system_shell_schema.json | 43 ++ .../host_settings/system_unreal_schema.json | 27 + .../system_schema/system_harmony_schema.json | 86 --- .../system_schema/system_hiero_schema.json | 128 ---- .../system_schema/system_host_exe_schema.json | 39 - .../system_schema/system_houdini_schema.json | 52 -- .../system_schema/system_maya_schema.json | 69 -- .../system_schema/system_nuke_schema.json | 128 ---- .../system_photoshop_schema.json | 35 - 23 files changed, 1054 insertions(+), 842 deletions(-) delete mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/1_hosts_gui_schema.json create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_blender_schema.json create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_celaction_schema.json create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_fusion_schema.json create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_harmony_schema.json create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_host_template.json create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_houdini_schema.json create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_maya_schema.json create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_nuke_template.json create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_photoshop_schema.json create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_resolve_schema.json create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_shell_schema.json create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_unreal_schema.json delete mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/system_harmony_schema.json delete mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/system_hiero_schema.json delete mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/system_host_exe_schema.json delete mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/system_houdini_schema.json delete mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/system_maya_schema.json delete mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/system_nuke_schema.json delete mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/system_photoshop_schema.json diff --git a/pype/settings/defaults/system_settings/global/applications.json b/pype/settings/defaults/system_settings/global/applications.json index 2cf64e396b..222d9e1173 100644 --- a/pype/settings/defaults/system_settings/global/applications.json +++ b/pype/settings/defaults/system_settings/global/applications.json @@ -1,255 +1,638 @@ { "maya": { "enabled": true, - "environment": {}, + "environment": { + "__environment_keys__": { + "maya": [] + } + }, "maya_2020": { "enabled": true, - "common": { - "executable": { - "windows": [], - "linux": [], - "mac": [] - }, - "environment": {} + "maya_executables": { + "windows": "", + "darwin": "", + "linux": "" + }, + "environment": { + "__environment_keys__": { + "maya_2020": [] + } } }, "maya_2019": { "enabled": true, - "common": { - "executable": { - "windows": [], - "linux": [], - "mac": [] - }, - "environment": {} + "maya_executables": { + "windows": "", + "darwin": "", + "linux": "" + }, + "environment": { + "__environment_keys__": { + "maya_2019": [] + } } }, "maya_2018": { "enabled": true, - "common": { - "executable": { - "windows": [], - "linux": [], - "mac": [] - }, - "environment": {} + "maya_executables": { + "windows": "", + "darwin": "", + "linux": "" + }, + "environment": { + "__environment_keys__": { + "maya_2018": [] + } } } }, "nuke": { "enabled": true, - "environment": {}, - "nuke_12.1": { + "environment": { + "__environment_keys__": { + "nuke": [] + } + }, + "nuke_12.0": { "enabled": true, - "nukeX": true, - "common": { - "executable": { - "windows": [], - "linux": [], - "mac": [] - }, - "environment": {} + "nuke_executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "__environment_keys__": { + "nuke_12.0": [] + } } }, "nuke_11.3": { "enabled": true, - "nukeX": true, - "common": { - "executable": { - "windows": [], - "linux": [], - "mac": [] - }, - "environment": {} + "nuke_executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "__environment_keys__": { + "nuke_11.3": [] + } } }, "nuke_11.2": { "enabled": true, - "nukeX": true, - "common": { - "executable": { - "windows": [], - "linux": [], - "mac": [] - }, - "environment": {} + "nuke_executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "__environment_keys__": { + "nuke_11.2": [] + } } }, "nuke_11.1": { "enabled": true, - "nukeX": true, - "common": { - "executable": { - "windows": [], - "linux": [], - "mac": [] - }, - "environment": {} + "nuke_executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "__environment_keys__": { + "nuke_11.1": [] + } } }, - "nuke_10": { + "nuke_10.0": { "enabled": true, - "nukeX": true, - "common": { - "executable": { - "windows": [], - "linux": [], - "mac": [] - }, - "environment": {} + "nuke_executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "__environment_keys__": { + "nuke_10.0": [] + } + } + } + }, + "nukex": { + "enabled": true, + "environment": { + "__environment_keys__": { + "nukex": [] + } + }, + "nukex_12.0": { + "enabled": true, + "nukex_executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "__environment_keys__": { + "nukex_12.0": [] + } + } + }, + "nukex_11.3": { + "enabled": true, + "nukex_executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "__environment_keys__": { + "nukex_11.3": [] + } + } + }, + "nukex_11.2": { + "enabled": true, + "nukex_executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "__environment_keys__": { + "nukex_11.2": [] + } + } + }, + "nukex_11.1": { + "enabled": true, + "nukex_executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "__environment_keys__": { + "nukex_11.1": [] + } + } + }, + "nukex_10.0": { + "enabled": true, + "nukex_executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "__environment_keys__": { + "nukex_10.0": [] + } + } + } + }, + "nukestudio": { + "enabled": true, + "environment": { + "__environment_keys__": { + "nukestudio": [] + } + }, + "nukestudio_12.0": { + "enabled": true, + "nukestudio_executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "__environment_keys__": { + "nukestudio_12.0": [] + } + } + }, + "nukestudio_11.3": { + "enabled": true, + "nukestudio_executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "__environment_keys__": { + "nukestudio_11.3": [] + } + } + }, + "nukestudio_11.2": { + "enabled": true, + "nukestudio_executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "__environment_keys__": { + "nukestudio_11.2": [] + } + } + }, + "nukestudio_11.1": { + "enabled": true, + "nukestudio_executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "__environment_keys__": { + "nukestudio_11.1": [] + } + } + }, + "nukestudio_10.0": { + "enabled": true, + "nukestudio_executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "__environment_keys__": { + "nukestudio_10.0": [] + } } } }, "hiero": { "enabled": true, - "environment": {}, - "hiero_12.1": { + "environment": { + "__environment_keys__": { + "hiero": [] + } + }, + "hiero_12.0": { "enabled": true, - "nukestudio": true, - "common": { - "executable": { - "windows": [], - "linux": [], - "mac": [] - }, - "environment": {} + "hiero_executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "__environment_keys__": { + "hiero_12.0": [] + } } }, "hiero_11.3": { "enabled": true, - "nukestudio": true, - "common": { - "executable": { - "windows": [], - "linux": [], - "mac": [] - }, - "environment": {} + "hiero_executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "__environment_keys__": { + "hiero_11.3": [] + } } }, "hiero_11.2": { "enabled": true, - "nukestudio": true, - "common": { - "executable": { - "windows": [], - "linux": [], - "mac": [] - }, - "environment": {} + "hiero_executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "__environment_keys__": { + "hiero_11.2": [] + } } }, "hiero_11.1": { "enabled": true, - "nukestudio": true, - "common": { - "executable": { - "windows": [], - "linux": [], - "mac": [] - }, - "environment": {} + "hiero_executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "__environment_keys__": { + "hiero_11.1": [] + } } }, - "hiero_10": { + "hiero_10.0": { "enabled": true, - "nukestudio": true, - "common": { - "executable": { - "windows": [], - "linux": [], - "mac": [] - }, - "environment": {} + "hiero_executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "__environment_keys__": { + "hiero_10.0": [] + } + } + } + }, + "fusion": { + "enabled": true, + "environment": { + "__environment_keys__": { + "fusion": [] + } + }, + "fusion_16": { + "enabled": true, + "fusion_executables": { + "windows": "", + "darwin": "", + "linux": "" + }, + "environment": { + "__environment_keys__": { + "fusion_16": [] + } + } + }, + "fusion_9": { + "enabled": true, + "fusion_executables": { + "windows": "", + "darwin": "", + "linux": "" + }, + "environment": { + "__environment_keys__": { + "fusion_9": [] + } + } + } + }, + "resolve": { + "enabled": true, + "environment": { + "__environment_keys__": { + "resolve": [] + } + }, + "resolve_16": { + "enabled": true, + "resolve_executables": { + "windows": "", + "darwin": "", + "linux": "" + }, + "environment": { + "__environment_keys__": { + "resolve_16": [] + } } } }, "houdini": { "enabled": true, - "environment": {}, + "environment": { + "__environment_keys__": { + "houdini": [] + } + }, "houdini_18": { "enabled": true, - "common": { - "executable": { - "windows": [], - "linux": [], - "mac": [] - }, - "environment": {} + "houdini_executables": { + "windows": "", + "darwin": "", + "linux": "" + }, + "environment": { + "__environment_keys__": { + "houdini_18": [] + } } }, "houdini_17": { "enabled": true, - "common": { - "executable": { - "windows": [], - "linux": [], - "mac": [] - }, - "environment": {} + "houdini_executables": { + "windows": "", + "darwin": "", + "linux": "" + }, + "environment": { + "__environment_keys__": { + "houdini_17": [] + } + } + } + }, + "blender": { + "enabled": true, + "environment": { + "__environment_keys__": { + "blender": [] + } + }, + "blender_2.90": { + "enabled": true, + "blender_executables": { + "windows": "", + "darwin": "", + "linux": "" + }, + "environment": { + "__environment_keys__": { + "blender_2.90": [] + } + } + }, + "blender_2.83": { + "enabled": true, + "blender_executables": { + "windows": "", + "darwin": "", + "linux": "" + }, + "environment": { + "__environment_keys__": { + "blender_2.83": [] + } } } }, "harmony": { "enabled": true, - "environment_maya": {}, + "environment": { + "__environment_keys__": { + "harmony": [] + } + }, "harmony_20": { "enabled": true, - "common": { - "executable": { - "windows": [], - "linux": [], - "mac": [] - }, - "environment": {} + "harmony_executables": { + "windows": "", + "darwin": "", + "linux": "" + }, + "environment": { + "__environment_keys__": { + "harmony_20": [] + } } }, "harmony_19": { "enabled": true, - "common": { - "executable": { - "windows": [], - "linux": [], - "mac": [] - }, - "environment": {} + "harmony_executables": { + "windows": "", + "darwin": "", + "linux": "" + }, + "environment": { + "__environment_keys__": { + "harmony_19": [] + } } }, "harmony_18": { "enabled": true, - "common": { - "executable": { - "windows": [], - "linux": [], - "mac": [] - }, - "environment": {} + "harmony_executables": { + "windows": "", + "darwin": "", + "linux": "" + }, + "environment": { + "__environment_keys__": { + "harmony_18": [] + } } }, "harmony_17": { "enabled": true, - "common": { - "executable": { - "windows": [], - "linux": [], - "mac": [] - }, - "environment": {} + "harmony_executables": { + "windows": "", + "darwin": "", + "linux": "" + }, + "environment": { + "__environment_keys__": { + "harmony_17": [] + } } } }, "photoshop": { "enabled": true, - "environment": {}, + "environment": { + "__environment_keys__": { + "photoshop": [] + } + }, "photoshop_2020": { "enabled": true, - "common": { - "executable": { - "windows": [], - "linux": [], - "mac": [] - }, - "environment": {} + "photoshop_executables": { + "windows": "", + "darwin": "", + "linux": "" + }, + "environment": { + "__environment_keys__": { + "photoshop_2020": [] + } + } + } + }, + "celaction": { + "enabled": true, + "environment": { + "__environment_keys__": { + "celaction": [] + } + }, + "celation_Local": { + "enabled": true, + "celation_executables": "", + "environment": { + "__environment_keys__": { + "celation_Local": [] + } + } + }, + "celation_Publish": { + "enabled": true, + "celation_executables": "", + "environment": { + "__environment_keys__": { + "celation_Publish": [] + } + } + } + }, + "unreal": { + "enabled": true, + "environment": { + "__environment_keys__": { + "unreal": [] + } + }, + "unreal_4.24": { + "enabled": true, + "unreal_executables": { + "windows": "", + "darwin": "", + "linux": "" + }, + "environment": { + "__environment_keys__": { + "unreal_4.24": [] + } + } + } + }, + "shell": { + "enabled": true, + "environment": { + "__environment_keys__": { + "shell": [] + } + }, + "python_Python 3.7": { + "enabled": true, + "python_executables": { + "windows": "", + "darwin": "", + "linux": "" + }, + "environment": { + "__environment_keys__": { + "python_Python 3.7": [] + } + } + }, + "python_Python 2.7": { + "enabled": true, + "python_executables": { + "windows": "", + "darwin": "", + "linux": "" + }, + "environment": { + "__environment_keys__": { + "python_Python 2.7": [] + } + } + }, + "terminal_Terminal": { + "enabled": true, + "terminal_executables": { + "windows": "", + "darwin": "", + "linux": "" + }, + "environment": { + "__environment_keys__": { + "terminal_Terminal": [] + } } } } diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/0_system_gui_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/0_system_gui_schema.json index dbae81501e..c5f229fc2f 100644 --- a/pype/tools/settings/settings/gui_schemas/system_schema/0_system_gui_schema.json +++ b/pype/tools/settings/settings/gui_schemas/system_schema/0_system_gui_schema.json @@ -14,9 +14,6 @@ }, { "type": "schema", "name": "1_applications_gui_schema" - }, { - "type": "schema", - "name": "1_hosts_gui_schema" }, { "type": "schema", "name": "1_tools_gui_schema" diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/1_applications_gui_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/1_applications_gui_schema.json index 95e2763f35..d1fa4e79f5 100644 --- a/pype/tools/settings/settings/gui_schemas/system_schema/1_applications_gui_schema.json +++ b/pype/tools/settings/settings/gui_schemas/system_schema/1_applications_gui_schema.json @@ -9,17 +9,53 @@ "name": "system_maya_schema" }, { - "type": "schema", - "name": "system_nuke_schema" + "type": "schema_template", + "name": "system_nuke_template", + "template_data": { + "nuke_type": "nuke", + "nuke_label": "Nuke" + } + }, + { + "type": "schema_template", + "name": "system_nuke_template", + "template_data": { + "nuke_type": "nukex", + "nuke_label": "Nuke X" + } + }, + { + "type": "schema_template", + "name": "system_nuke_template", + "template_data": { + "nuke_type": "nukestudio", + "nuke_label": "Nuke Studio" + } + }, + { + "type": "schema_template", + "name": "system_nuke_template", + "template_data": { + "nuke_type": "hiero", + "nuke_label": "Hiero" + } }, { "type": "schema", - "name": "system_hiero_schema" + "name": "system_fusion_schema" + }, + { + "type": "schema", + "name": "system_resolve_schema" }, { "type": "schema", "name": "system_houdini_schema" }, + { + "type": "schema", + "name": "system_blender_schema" + }, { "type": "schema", "name": "system_harmony_schema" @@ -27,6 +63,18 @@ { "type": "schema", "name": "system_photoshop_schema" + }, + { + "type": "schema", + "name": "system_celaction_schema" + }, + { + "type": "schema", + "name": "system_unreal_schema" + }, + { + "type": "schema", + "name": "system_shell_schema" } ] } diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/1_hosts_gui_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/1_hosts_gui_schema.json deleted file mode 100644 index 277b9d1d8e..0000000000 --- a/pype/tools/settings/settings/gui_schemas/system_schema/1_hosts_gui_schema.json +++ /dev/null @@ -1,139 +0,0 @@ -{ - "key": "hosts", - "type": "dict", - "label": "Hosts", - "collapsable": true, - "is_group": true, - "is_file": true, - "children": [ - { - "type": "boolean", - "key": "blender_2.80", - "label": "Blender 2.80" - }, { - "type": "boolean", - "key": "blender_2.81", - "label": "Blender 2.81" - }, { - "type": "boolean", - "key": "blender_2.82", - "label": "Blender 2.82" - }, { - "type": "boolean", - "key": "blender_2.83", - "label": "Blender 2.83" - }, { - "type": "boolean", - "key": "celaction_local", - "label": "Celaction Local" - }, { - "type": "boolean", - "key": "celaction_remote", - "label": "Celaction Remote" - }, { - "type": "boolean", - "key": "harmony_17", - "label": "Harmony 17" - }, { - "type": "boolean", - "key": "maya_2017", - "label": "Autodest Maya 2017" - }, { - "type": "boolean", - "key": "maya_2018", - "label": "Autodest Maya 2018" - }, { - "type": "boolean", - "key": "maya_2019", - "label": "Autodest Maya 2019" - }, { - "type": "boolean", - "key": "maya_2020", - "label": "Autodest Maya 2020" - }, { - "key": "nuke_10.0", - "type": "boolean", - "label": "Nuke 10.0" - }, { - "type": "boolean", - "key": "nuke_11.2", - "label": "Nuke 11.2" - }, { - "type": "boolean", - "key": "nuke_11.3", - "label": "Nuke 11.3" - }, { - "type": "boolean", - "key": "nuke_12.0", - "label": "Nuke 12.0" - }, { - "type": "boolean", - "key": "nukex_10.0", - "label": "NukeX 10.0" - }, { - "type": "boolean", - "key": "nukex_11.2", - "label": "NukeX 11.2" - }, { - "type": "boolean", - "key": "nukex_11.3", - "label": "NukeX 11.3" - }, { - "type": "boolean", - "key": "nukex_12.0", - "label": "NukeX 12.0" - }, { - "type": "boolean", - "key": "nukestudio_10.0", - "label": "NukeStudio 10.0" - }, { - "type": "boolean", - "key": "nukestudio_11.2", - "label": "NukeStudio 11.2" - }, { - "type": "boolean", - "key": "nukestudio_11.3", - "label": "NukeStudio 11.3" - }, { - "type": "boolean", - "key": "nukestudio_12.0", - "label": "NukeStudio 12.0" - }, { - "type": "boolean", - "key": "houdini_16", - "label": "Houdini 16" - }, { - "type": "boolean", - "key": "houdini_16.5", - "label": "Houdini 16.5" - }, { - "type": "boolean", - "key": "houdini_17", - "label": "Houdini 17" - }, { - "type": "boolean", - "key": "houdini_18", - "label": "Houdini 18" - }, { - "type": "boolean", - "key": "premiere_2019", - "label": "Premiere 2019" - }, { - "type": "boolean", - "key": "premiere_2020", - "label": "Premiere 2020" - }, { - "type": "boolean", - "key": "resolve_16", - "label": "BM DaVinci Resolve 16" - }, { - "type": "boolean", - "key": "storyboardpro_7", - "label": "Storyboard Pro 7" - }, { - "type": "boolean", - "key": "unreal_4.24", - "label": "Unreal Editor 4.24" - } - ] -} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_blender_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_blender_schema.json new file mode 100644 index 0000000000..8600d8de8a --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_blender_schema.json @@ -0,0 +1,35 @@ +{ + "type": "dict", + "key": "blender", + "label": "Blender", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "key": "environment", + "label": "Environment", + "type": "raw-json", + "env_group_key": "blender" + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "2.90", + "host_name": "blender" + } + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "2.83", + "host_name": "blender" + } + } + ] +} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_celaction_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_celaction_schema.json new file mode 100644 index 0000000000..36addab00d --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_celaction_schema.json @@ -0,0 +1,39 @@ +{ + "type": "dict", + "key": "celaction", + "label": "CelAction2D", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "key": "environment", + "label": "Environment", + "type": "raw-json", + "env_group_key": "celaction" + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "Local", + "host_name": "celation", + "multiplatform": false, + "multipath_executables": false + } + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "Publish", + "host_name": "celation", + "multiplatform": false, + "multipath_executables": false + } + } + ] +} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_fusion_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_fusion_schema.json new file mode 100644 index 0000000000..b3dc79ef97 --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_fusion_schema.json @@ -0,0 +1,35 @@ +{ + "type": "dict", + "key": "fusion", + "label": "Blackmagic Fusion", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "key": "environment", + "label": "Environment", + "type": "raw-json", + "env_group_key": "fusion" + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "16", + "host_name": "fusion" + } + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "9", + "host_name": "fusion" + } + } + ] +} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_harmony_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_harmony_schema.json new file mode 100644 index 0000000000..10cb929fc4 --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_harmony_schema.json @@ -0,0 +1,51 @@ +{ + "type": "dict", + "key": "harmony", + "label": "Toon Boom Harmony", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "key": "environment", + "label": "Environment", + "type": "raw-json", + "env_group_key": "harmony" + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "20", + "host_name": "harmony" + } + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "19", + "host_name": "harmony" + } + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "18", + "host_name": "harmony" + } + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "17", + "host_name": "harmony" + } + } + ] +} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_host_template.json b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_host_template.json new file mode 100644 index 0000000000..dd4d3c8b4b --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_host_template.json @@ -0,0 +1,33 @@ +[{ + "__default_values__": { + "multipath_executables": false, + "multiplatform": true + } + }, + { + "type": "dict", + "key": "{host_name}_{host_version}", + "label": "{host_version}", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "path-widget", + "key": "{host_name}_executables", + "label": "Executables", + "multiplatform": "{multiplatform}", + "multipath": "{multipath_executables}" + }, + { + "key": "environment", + "label": "Environment", + "type": "raw-json", + "env_group_key": "{host_name}_{host_version}" + } + ] + } +] diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_houdini_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_houdini_schema.json new file mode 100644 index 0000000000..36c6d9fcb2 --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_houdini_schema.json @@ -0,0 +1,35 @@ +{ + "type": "dict", + "key": "houdini", + "label": "SideFX Houdini", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "key": "environment", + "label": "Environment", + "type": "raw-json", + "env_group_key": "houdini" + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "18", + "host_name": "houdini" + } + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "17", + "host_name": "houdini" + } + } + ] +} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_maya_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_maya_schema.json new file mode 100644 index 0000000000..710b62a9cc --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_maya_schema.json @@ -0,0 +1,43 @@ +{ + "type": "dict", + "key": "maya", + "label": "Autodesk Maya", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "key": "environment", + "label": "Environment", + "type": "raw-json", + "env_group_key": "maya" + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "2020", + "host_name": "maya" + } + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "2019", + "host_name": "maya" + } + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "2018", + "host_name": "maya" + } + } + ] +} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_nuke_template.json b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_nuke_template.json new file mode 100644 index 0000000000..36d68dba95 --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_nuke_template.json @@ -0,0 +1,65 @@ +[{ + "type": "dict", + "key": "{nuke_type}", + "label": "Foundry {nuke_label}", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "key": "environment", + "label": "Environment", + "type": "raw-json", + "env_group_key": "{nuke_type}" + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "12.0", + "host_name": "{nuke_type}", + "multipath_executables": true + } + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "11.3", + "host_name": "{nuke_type}", + "multipath_executables": true + } + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "11.2", + "host_name": "{nuke_type}", + "multipath_executables": true + } + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "11.1", + "host_name": "{nuke_type}", + "multipath_executables": true + } + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "10.0", + "host_name": "{nuke_type}", + "multipath_executables": true + } + } + ] +} +] diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_photoshop_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_photoshop_schema.json new file mode 100644 index 0000000000..c1062045e7 --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_photoshop_schema.json @@ -0,0 +1,27 @@ +{ + "type": "dict", + "key": "photoshop", + "label": "Adobe Photoshop", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "key": "environment", + "label": "Environment", + "type": "raw-json", + "env_group_key": "photoshop" + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "2020", + "host_name": "photoshop" + } + } + ] +} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_resolve_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_resolve_schema.json new file mode 100644 index 0000000000..364be8208d --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_resolve_schema.json @@ -0,0 +1,27 @@ +{ + "type": "dict", + "key": "resolve", + "label": "Blackmagic DaVinci Resolve", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "key": "environment", + "label": "Environment", + "type": "raw-json", + "env_group_key": "resolve" + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "16", + "host_name": "resolve" + } + } + ] +} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_shell_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_shell_schema.json new file mode 100644 index 0000000000..22955abc46 --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_shell_schema.json @@ -0,0 +1,43 @@ +{ + "type": "dict", + "key": "shell", + "label": "Shell", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "key": "environment", + "label": "Environment", + "type": "raw-json", + "env_group_key": "shell" + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "Python 3.7", + "host_name": "python" + } + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "Python 2.7", + "host_name": "python" + } + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "Terminal", + "host_name": "terminal" + } + } + ] +} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_unreal_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_unreal_schema.json new file mode 100644 index 0000000000..e0408f9a36 --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_unreal_schema.json @@ -0,0 +1,27 @@ +{ + "type": "dict", + "key": "unreal", + "label": "Unreal Editor", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "key": "environment", + "label": "Environment", + "type": "raw-json", + "env_group_key": "unreal" + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "4.24", + "host_name": "unreal" + } + } + ] +} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/system_harmony_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/system_harmony_schema.json deleted file mode 100644 index 4ef97bc8a2..0000000000 --- a/pype/tools/settings/settings/gui_schemas/system_schema/system_harmony_schema.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "type": "dict", - "key": "harmony", - "label": "Toon Boom Harmony", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "raw-json", - "key": "environment_maya", - "label": "Environment" - }, - { - "type": "dict", - "key": "harmony_20", - "label": "20", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "schema", - "name": "system_host_exe_schema" - } - ] - }, - { - "type": "dict", - "key": "harmony_19", - "label": "19", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "schema", - "name": "system_host_exe_schema" - } - ] - }, - { - "type": "dict", - "key": "harmony_18", - "label": "18", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "schema", - "name": "system_host_exe_schema" - } - ] - }, - { - "type": "dict", - "key": "harmony_17", - "label": "17", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "schema", - "name": "system_host_exe_schema" - } - ] - } - ] -} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/system_hiero_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/system_hiero_schema.json deleted file mode 100644 index ecbb98b281..0000000000 --- a/pype/tools/settings/settings/gui_schemas/system_schema/system_hiero_schema.json +++ /dev/null @@ -1,128 +0,0 @@ -{ - "type": "dict", - "key": "hiero", - "label": "Foundry Hiero / Nuke Studio", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "raw-json", - "key": "environment", - "label": "Environment" - }, - { - "type": "dict", - "key": "hiero_12.1", - "label": "12.1", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "boolean", - "key": "nukestudio", - "label": "Nuke Studio" - }, - { - "type": "schema", - "name": "system_host_exe_schema" - } - ] - }, - { - "type": "dict", - "key": "hiero_11.3", - "label": "11.3", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "boolean", - "key": "nukestudio", - "label": "Nuke Studio" - }, - { - "type": "schema", - "name": "system_host_exe_schema" - } - ] - }, - { - "type": "dict", - "key": "hiero_11.2", - "label": "11.2", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "boolean", - "key": "nukestudio", - "label": "Nuke Studio" - }, - { - "type": "schema", - "name": "system_host_exe_schema" - } - ] - }, - { - "type": "dict", - "key": "hiero_11.1", - "label": "11.1", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "boolean", - "key": "nukestudio", - "label": "Nuke Studio" - }, - { - "type": "schema", - "name": "system_host_exe_schema" - } - ] - }, - { - "type": "dict", - "key": "hiero_10", - "label": "10", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "boolean", - "key": "nukestudio", - "label": "Nuke Studio" - }, - { - "type": "schema", - "name": "system_host_exe_schema" - } - ] - } - ] -} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/system_host_exe_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/system_host_exe_schema.json deleted file mode 100644 index 7bf40ba69e..0000000000 --- a/pype/tools/settings/settings/gui_schemas/system_schema/system_host_exe_schema.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "dict-invisible", - "key": "common", - "children": [{ - "type": "dict-invisible", - "key": "executable", - "children": [{ - "type": "list", - "key": "windows", - "label": "Windows Executable", - "object_type": { - "type": "text", - "multiline": false - } - }, { - "type": "list", - "key": "linux", - "label": "Linux Executable", - "object_type": { - "type": "text", - "multiline": false - } - }, { - "type": "list", - "key": "mac", - "label": "Mac Executable", - "object_type": { - "type": "text", - "multiline": false - } - }] - }, - { - "type": "raw-json", - "key": "environment", - "label": "Environment" - } - ] -} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/system_houdini_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/system_houdini_schema.json deleted file mode 100644 index a6f58da172..0000000000 --- a/pype/tools/settings/settings/gui_schemas/system_schema/system_houdini_schema.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "type": "dict", - "key": "houdini", - "label": "SideFX Houdini", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "raw-json", - "key": "environment", - "label": "Environment" - }, - { - "type": "dict", - "key": "houdini_18", - "label": "18", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "schema", - "name": "system_host_exe_schema" - } - ] - }, - { - "type": "dict", - "key": "houdini_17", - "label": "17", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "schema", - "name": "system_host_exe_schema" - } - ] - } - ] -} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/system_maya_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/system_maya_schema.json deleted file mode 100644 index 5c76f65792..0000000000 --- a/pype/tools/settings/settings/gui_schemas/system_schema/system_maya_schema.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "type": "dict", - "key": "maya", - "label": "Autodesk Maya", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "raw-json", - "key": "environment", - "label": "Environment" - }, - { - "type": "dict", - "key": "maya_2020", - "label": "2020", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "schema", - "name": "system_host_exe_schema" - } - ] - }, - { - "type": "dict", - "key": "maya_2019", - "label": "2019", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "schema", - "name": "system_host_exe_schema" - } - ] - }, - { - "type": "dict", - "key": "maya_2018", - "label": "2018", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "schema", - "name": "system_host_exe_schema" - } - ] - } - ] -} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/system_nuke_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/system_nuke_schema.json deleted file mode 100644 index 205a4bb11a..0000000000 --- a/pype/tools/settings/settings/gui_schemas/system_schema/system_nuke_schema.json +++ /dev/null @@ -1,128 +0,0 @@ -{ - "type": "dict", - "key": "nuke", - "label": "Foundry Nuke", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "raw-json", - "key": "environment", - "label": "Environment" - }, - { - "type": "dict", - "key": "nuke_12.1", - "label": "12.1", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "boolean", - "key": "nukeX", - "label": "Nuke X" - }, - { - "type": "schema", - "name": "system_host_exe_schema" - } - ] - }, - { - "type": "dict", - "key": "nuke_11.3", - "label": "11.3", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "boolean", - "key": "nukeX", - "label": "Nuke X" - }, - { - "type": "schema", - "name": "system_host_exe_schema" - } - ] - }, - { - "type": "dict", - "key": "nuke_11.2", - "label": "11.2", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "boolean", - "key": "nukeX", - "label": "Nuke X" - }, - { - "type": "schema", - "name": "system_host_exe_schema" - } - ] - }, - { - "type": "dict", - "key": "nuke_11.1", - "label": "11.1", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "boolean", - "key": "nukeX", - "label": "Nuke X" - }, - { - "type": "schema", - "name": "system_host_exe_schema" - } - ] - }, - { - "type": "dict", - "key": "nuke_10", - "label": "10", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "boolean", - "key": "nukeX", - "label": "Nuke X" - }, - { - "type": "schema", - "name": "system_host_exe_schema" - } - ] - } - ] -} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/system_photoshop_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/system_photoshop_schema.json deleted file mode 100644 index d04bcbed09..0000000000 --- a/pype/tools/settings/settings/gui_schemas/system_schema/system_photoshop_schema.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "type": "dict", - "key": "photoshop", - "label": "Adobe Photoshop", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "raw-json", - "key": "environment", - "label": "Environment" - }, - { - "type": "dict", - "key": "photoshop_2020", - "label": "2020", - "collapsable": true, - "checkbox_key": "enabled", - "children": [{ - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "schema", - "name": "system_host_exe_schema" - } - ] - } - ] -} From e64f7ad7d6945ec6a5da7faf78e990bf5006ad63 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Fri, 2 Oct 2020 17:31:39 +0200 Subject: [PATCH 3/5] add default environments --- .../system_settings/global/applications.json | 282 ++++++++++++++++-- 1 file changed, 252 insertions(+), 30 deletions(-) diff --git a/pype/settings/defaults/system_settings/global/applications.json b/pype/settings/defaults/system_settings/global/applications.json index 222d9e1173..92d7ab0b2f 100644 --- a/pype/settings/defaults/system_settings/global/applications.json +++ b/pype/settings/defaults/system_settings/global/applications.json @@ -3,8 +3,28 @@ "enabled": true, "environment": { "__environment_keys__": { - "maya": [] - } + "maya": [ + "PYTHONPATH", + "MAYA_DISABLE_CLIC_IPM", + "MAYA_DISABLE_CIP", + "MAYA_DISABLE_CER", + "PYMEL_SKIP_MEL_INIT", + "LC_ALL", + "PYPE_LOG_NO_COLORS" + ] + }, + "PYTHONPATH": [ + "{PYPE_SETUP_PATH}/repos/avalon-core/setup/maya", + "{PYPE_SETUP_PATH}/repos/maya-look-assigner", + "{PYTHON_ENV}/python2/Lib/site-packages", + "{PYTHONPATH}" + ], + "MAYA_DISABLE_CLIC_IPM": "Yes", + "MAYA_DISABLE_CIP": "Yes", + "MAYA_DISABLE_CER": "Yes", + "PYMEL_SKIP_MEL_INIT": "Yes", + "LC_ALL": "C", + "PYPE_LOG_NO_COLORS": "Yes" }, "maya_2020": { "enabled": true, @@ -15,7 +35,20 @@ }, "environment": { "__environment_keys__": { - "maya_2020": [] + "maya_2020": [ + "MAYA_VERSION", + "MAYA_LOCATION", + "DYLD_LIBRARY_PATH" + ] + }, + "MAYA_VERSION": "2020", + "MAYA_LOCATION": { + "darwin": "/Applications/Autodesk/maya{MAYA_VERSION}/Maya.app/Contents", + "linux": "/usr/autodesk/maya{MAYA_VERSION}", + "windows": "C:/Program Files/Autodesk/Maya{MAYA_VERSION}" + }, + "DYLD_LIBRARY_PATH": { + "darwin": "{MAYA_LOCATION}/MacOS" } } }, @@ -28,7 +61,20 @@ }, "environment": { "__environment_keys__": { - "maya_2019": [] + "maya_2019": [ + "MAYA_VERSION", + "MAYA_LOCATION", + "DYLD_LIBRARY_PATH" + ] + }, + "MAYA_VERSION": "2019", + "MAYA_LOCATION": { + "darwin": "/Applications/Autodesk/maya{MAYA_VERSION}/Maya.app/Contents", + "linux": "/usr/autodesk/maya{MAYA_VERSION}", + "windows": "C:/Program Files/Autodesk/Maya{MAYA_VERSION}" + }, + "DYLD_LIBRARY_PATH": { + "darwin": "{MAYA_LOCATION}/MacOS" } } }, @@ -41,7 +87,20 @@ }, "environment": { "__environment_keys__": { - "maya_2018": [] + "maya_2018": [ + "MAYA_VERSION", + "MAYA_LOCATION", + "DYLD_LIBRARY_PATH" + ] + }, + "MAYA_VERSION": "2018", + "MAYA_LOCATION": { + "darwin": "/Applications/Autodesk/maya{MAYA_VERSION}/Maya.app/Contents", + "linux": "/usr/autodesk/maya{MAYA_VERSION}", + "windows": "C:/Program Files/Autodesk/Maya{MAYA_VERSION}" + }, + "DYLD_LIBRARY_PATH": { + "darwin": "{MAYA_LOCATION}/MacOS" } } } @@ -50,7 +109,18 @@ "enabled": true, "environment": { "__environment_keys__": { - "nuke": [] + "nuke": [ + "NUKE_PATH", + "PATH" + ] + }, + "NUKE_PATH": [ + "{PYPE_SETUP_PATH}/repos/avalon-core/setup/nuke/nuke_path", + "{PYPE_MODULE_ROOT}/setup/nuke/nuke_path", + "{PYPE_STUDIO_PLUGINS}/nuke" + ], + "PATH": { + "windows": "C:/Program Files (x86)/QuickTime/QTSystem/;{PATH}" } }, "nuke_12.0": { @@ -114,8 +184,13 @@ }, "environment": { "__environment_keys__": { - "nuke_10.0": [] - } + "nuke_10.0": [ + "PYPE_LOG_NO_COLORS", + "QT_PREFERRED_BINDING" + ] + }, + "PYPE_LOG_NO_COLORS": "Yes", + "QT_PREFERRED_BINDING": "PySide" } } }, @@ -123,7 +198,18 @@ "enabled": true, "environment": { "__environment_keys__": { - "nukex": [] + "nukex": [ + "NUKE_PATH", + "PATH" + ] + }, + "NUKE_PATH": [ + "{PYPE_SETUP_PATH}/repos/avalon-core/setup/nuke/nuke_path", + "{PYPE_MODULE_ROOT}/setup/nuke/nuke_path", + "{PYPE_STUDIO_PLUGINS}/nuke" + ], + "PATH": { + "windows": "C:/Program Files (x86)/QuickTime/QTSystem/;{PATH}" } }, "nukex_12.0": { @@ -187,8 +273,13 @@ }, "environment": { "__environment_keys__": { - "nukex_10.0": [] - } + "nukex_10.0": [ + "PYPE_LOG_NO_COLORS", + "QT_PREFERRED_BINDING" + ] + }, + "PYPE_LOG_NO_COLORS": "Yes", + "QT_PREFERRED_BINDING": "PySide" } } }, @@ -196,8 +287,23 @@ "enabled": true, "environment": { "__environment_keys__": { - "nukestudio": [] - } + "nukestudio": [ + "HIERO_PLUGIN_PATH", + "PATH", + "WORKFILES_STARTUP", + "TAG_ASSETBUILD_STARTUP", + "PYPE_LOG_NO_COLORS" + ] + }, + "HIERO_PLUGIN_PATH": [ + "{PYPE_MODULE_ROOT}/setup/nukestudio/hiero_plugin_path" + ], + "PATH": { + "windows": "C:/Program Files (x86)/QuickTime/QTSystem/;{PATH}" + }, + "WORKFILES_STARTUP": "0", + "TAG_ASSETBUILD_STARTUP": "0", + "PYPE_LOG_NO_COLORS": "True" }, "nukestudio_12.0": { "enabled": true, @@ -260,8 +366,13 @@ }, "environment": { "__environment_keys__": { - "nukestudio_10.0": [] - } + "nukestudio_10.0": [ + "PYPE_LOG_NO_COLORS", + "QT_PREFERRED_BINDING" + ] + }, + "PYPE_LOG_NO_COLORS": "Yes", + "QT_PREFERRED_BINDING": "PySide" } } }, @@ -269,8 +380,23 @@ "enabled": true, "environment": { "__environment_keys__": { - "hiero": [] - } + "hiero": [ + "HIERO_PLUGIN_PATH", + "PATH", + "WORKFILES_STARTUP", + "TAG_ASSETBUILD_STARTUP", + "PYPE_LOG_NO_COLORS" + ] + }, + "HIERO_PLUGIN_PATH": [ + "{PYPE_MODULE_ROOT}/setup/nukestudio/hiero_plugin_path" + ], + "PATH": { + "windows": "C:/Program Files (x86)/QuickTime/QTSystem/;{PATH}" + }, + "WORKFILES_STARTUP": "0", + "TAG_ASSETBUILD_STARTUP": "0", + "PYPE_LOG_NO_COLORS": "True" }, "hiero_12.0": { "enabled": true, @@ -333,8 +459,13 @@ }, "environment": { "__environment_keys__": { - "hiero_10.0": [] - } + "hiero_10.0": [ + "PYPE_LOG_NO_COLORS", + "QT_PREFERRED_BINDING" + ] + }, + "PYPE_LOG_NO_COLORS": "Yes", + "QT_PREFERRED_BINDING": "PySide" } } }, @@ -376,8 +507,57 @@ "enabled": true, "environment": { "__environment_keys__": { - "resolve": [] - } + "resolve": [ + "RESOLVE_UTILITY_SCRIPTS_SOURCE_DIR", + "RESOLVE_SCRIPT_API", + "RESOLVE_SCRIPT_LIB", + "RESOLVE_UTILITY_SCRIPTS_DIR", + "PYTHON36_RESOLVE", + "PYTHONPATH", + "PATH", + "PRE_PYTHON_SCRIPT", + "PYPE_LOG_NO_COLORS", + "RESOLVE_DEV" + ] + }, + "RESOLVE_UTILITY_SCRIPTS_SOURCE_DIR": [ + "{STUDIO_SOFT}/davinci_resolve/scripts/python" + ], + "RESOLVE_SCRIPT_API": { + "windows": "{PROGRAMDATA}/Blackmagic Design/DaVinci Resolve/Support/Developer/Scripting", + "darvin": "/Library/Application Support/Blackmagic Design/DaVinci Resolve/Developer/Scripting", + "linux": "/opt/resolve/Developer/Scripting" + }, + "RESOLVE_SCRIPT_LIB": { + "windows": "C:/Program Files/Blackmagic Design/DaVinci Resolve/fusionscript.dll", + "darvin": "/Applications/DaVinci Resolve/DaVinci Resolve.app/Contents/Libraries/Fusion/fusionscript.so", + "linux": "/opt/resolve/libs/Fusion/fusionscript.so" + }, + "RESOLVE_UTILITY_SCRIPTS_DIR": { + "windows": "{PROGRAMDATA}/Blackmagic Design/DaVinci Resolve/Fusion/Scripts/Comp", + "darvin": "/Library/Application Support/Blackmagic Design/DaVinci Resolve/Fusion/Scripts/Comp", + "linux": "/opt/resolve/Fusion/Scripts/Comp" + }, + "PYTHON36_RESOLVE": { + "windows": "{LOCALAPPDATA}/Programs/Python/Python36", + "darvin": "~/Library/Python/3.6/bin", + "linux": "/opt/Python/3.6/bin" + }, + "PYTHONPATH": [ + "{PYTHON36_RESOLVE}/Lib/site-packages", + "{VIRTUAL_ENV}/Lib/site-packages", + "{PYTHONPATH}", + "{RESOLVE_SCRIPT_API}/Modules", + "{PYTHONPATH}" + ], + "PATH": [ + "{PYTHON36_RESOLVE}", + "{PYTHON36_RESOLVE}/Scripts", + "{PATH}" + ], + "PRE_PYTHON_SCRIPT": "{PYPE_MODULE_ROOT}/pype/resolve/preload_console.py", + "PYPE_LOG_NO_COLORS": "True", + "RESOLVE_DEV": "True" }, "resolve_16": { "enabled": true, @@ -397,7 +577,20 @@ "enabled": true, "environment": { "__environment_keys__": { - "houdini": [] + "houdini": [ + "HOUDINI_PATH", + "HOUDINI_MENU_PATH" + ] + }, + "HOUDINI_PATH": { + "darwin": "{PYPE_MODULE_ROOT}/setup/houdini:&", + "linux": "{PYPE_MODULE_ROOT}/setup/houdini:&", + "windows": "{PYPE_MODULE_ROOT}/setup/houdini;&" + }, + "HOUDINI_MENU_PATH": { + "darwin": "{PYPE_MODULE_ROOT}/setup/houdini:&", + "linux": "{PYPE_MODULE_ROOT}/setup/houdini:&", + "windows": "{PYPE_MODULE_ROOT}/setup/houdini;&" } }, "houdini_18": { @@ -431,8 +624,18 @@ "enabled": true, "environment": { "__environment_keys__": { - "blender": [] - } + "blender": [ + "BLENDER_USER_SCRIPTS", + "PYTHONPATH", + "CREATE_NEW_CONSOLE" + ] + }, + "BLENDER_USER_SCRIPTS": "{PYPE_SETUP_PATH}/repos/avalon-core/setup/blender", + "PYTHONPATH": [ + "{PYPE_SETUP_PATH}/repos/avalon-core/setup/blender", + "{PYTHONPATH}" + ], + "CREATE_NEW_CONSOLE": "yes" }, "blender_2.90": { "enabled": true, @@ -465,8 +668,13 @@ "enabled": true, "environment": { "__environment_keys__": { - "harmony": [] - } + "harmony": [ + "AVALON_HARMONY_WORKFILES_ON_LAUNCH", + "PYBLISH_GUI_ALWAYS_EXEC" + ] + }, + "AVALON_HARMONY_WORKFILES_ON_LAUNCH": "1", + "PYBLISH_GUI_ALWAYS_EXEC": "1" }, "harmony_20": { "enabled": true, @@ -525,8 +733,19 @@ "enabled": true, "environment": { "__environment_keys__": { - "photoshop": [] - } + "photoshop": [ + "AVALON_PHOTOSHOP_WORKFILES_ON_LAUNCH", + "PYTHONPATH", + "PYPE_LOG_NO_COLORS", + "WEBSOCKET_URL", + "WORKFILES_SAVE_AS" + ] + }, + "AVALON_PHOTOSHOP_WORKFILES_ON_LAUNCH": "1", + "PYTHONPATH": "{PYTHONPATH}", + "PYPE_LOG_NO_COLORS": "Yes", + "WEBSOCKET_URL": "ws://localhost:8099/ws/", + "WORKFILES_SAVE_AS": "Yes" }, "photoshop_2020": { "enabled": true, @@ -546,8 +765,11 @@ "enabled": true, "environment": { "__environment_keys__": { - "celaction": [] - } + "celaction": [ + "CELACTION_TEMPLATE" + ] + }, + "CELACTION_TEMPLATE": "{PYPE_MODULE_ROOT}/pype/hosts/celaction/celaction_template_scene.scn" }, "celation_Local": { "enabled": true, From d7de4318550f454f29d54cb63a0e63ec410bb168 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Fri, 2 Oct 2020 17:58:56 +0200 Subject: [PATCH 4/5] add default paths --- .../system_settings/global/applications.json | 383 ++++++++---------- .../host_settings/system_host_template.json | 2 +- .../host_settings/system_nuke_template.json | 18 - 3 files changed, 179 insertions(+), 224 deletions(-) diff --git a/pype/settings/defaults/system_settings/global/applications.json b/pype/settings/defaults/system_settings/global/applications.json index 92d7ab0b2f..d0a452aaeb 100644 --- a/pype/settings/defaults/system_settings/global/applications.json +++ b/pype/settings/defaults/system_settings/global/applications.json @@ -29,9 +29,15 @@ "maya_2020": { "enabled": true, "maya_executables": { - "windows": "", - "darwin": "", - "linux": "" + "windows": [ + "C:\\Program Files\\Autodesk\\maya2020\\bin\\maya.exe" + ], + "darwin": [ + "" + ], + "linux": [ + "/usr/autodesk/maya2020/bin/maya" + ] }, "environment": { "__environment_keys__": { @@ -55,9 +61,15 @@ "maya_2019": { "enabled": true, "maya_executables": { - "windows": "", - "darwin": "", - "linux": "" + "windows": [ + "C:\\Program Files\\Autodesk\\maya2019\\bin\\maya.exe" + ], + "darwin": [ + "" + ], + "linux": [ + "/usr/autodesk/maya2019/bin/maya" + ] }, "environment": { "__environment_keys__": { @@ -81,9 +93,15 @@ "maya_2018": { "enabled": true, "maya_executables": { - "windows": "", - "darwin": "", - "linux": "" + "windows": [ + "C:\\Program Files\\Autodesk\\maya2018\\bin\\maya.exe" + ], + "darwin": [ + "" + ], + "linux": [ + "/usr/autodesk/maya2018/bin/maya" + ] }, "environment": { "__environment_keys__": { @@ -126,9 +144,13 @@ "nuke_12.0": { "enabled": true, "nuke_executables": { - "windows": [], + "windows": [ + "C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe" + ], "darwin": [], - "linux": [] + "linux": [ + "/usr/local/Nuke12.0v1/Nuke12.0" + ] }, "environment": { "__environment_keys__": { @@ -139,9 +161,15 @@ "nuke_11.3": { "enabled": true, "nuke_executables": { - "windows": [], + "windows": [ + "C:\\Program Files\\Nuke11.3v4\\Nuke11.3.exe", + "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe" + ], "darwin": [], - "linux": [] + "linux": [ + "/usr/local/Nuke11.3v4/Nuke11.3", + "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe" + ] }, "environment": { "__environment_keys__": { @@ -152,46 +180,23 @@ "nuke_11.2": { "enabled": true, "nuke_executables": { - "windows": [], + "windows": [ + "C:\\Program Files\\Nuke11.2v3\\Nuke11.2.exe", + "C:\\Program Files\\Nuke11.2v2\\Nuke11.2.exe", + "C:\\Program Files\\Nuke11.2v1\\Nuke11.2.exe" + ], "darwin": [], - "linux": [] + "linux": [ + "/usr/local/Nuke11.2v3/Nuke11.2", + "/usr/local/Nuke11.2v2/Nuke11.2", + "/usr/local/Nuke11.2v1/Nuke11.2" + ] }, "environment": { "__environment_keys__": { "nuke_11.2": [] } } - }, - "nuke_11.1": { - "enabled": true, - "nuke_executables": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": { - "__environment_keys__": { - "nuke_11.1": [] - } - } - }, - "nuke_10.0": { - "enabled": true, - "nuke_executables": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": { - "__environment_keys__": { - "nuke_10.0": [ - "PYPE_LOG_NO_COLORS", - "QT_PREFERRED_BINDING" - ] - }, - "PYPE_LOG_NO_COLORS": "Yes", - "QT_PREFERRED_BINDING": "PySide" - } } }, "nukex": { @@ -215,9 +220,13 @@ "nukex_12.0": { "enabled": true, "nukex_executables": { - "windows": [], + "windows": [ + "C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe -nukex" + ], "darwin": [], - "linux": [] + "linux": [ + "/usr/local/Nuke12.0v1/Nuke12.0 -nukex" + ] }, "environment": { "__environment_keys__": { @@ -228,9 +237,13 @@ "nukex_11.3": { "enabled": true, "nukex_executables": { - "windows": [], + "windows": [ + "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe -nukex" + ], "darwin": [], - "linux": [] + "linux": [ + "/usr/local/Nuke11.3v1/Nuke11.3 -nukex" + ] }, "environment": { "__environment_keys__": { @@ -241,46 +254,19 @@ "nukex_11.2": { "enabled": true, "nukex_executables": { - "windows": [], + "windows": [ + "C:\\Program Files\\Nuke11.2v3\\Nuke11.2.exe -nukex" + ], "darwin": [], - "linux": [] + "linux": [ + "/usr/local/Nuke11.2v3/Nuke11.2 -nukex" + ] }, "environment": { "__environment_keys__": { "nukex_11.2": [] } } - }, - "nukex_11.1": { - "enabled": true, - "nukex_executables": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": { - "__environment_keys__": { - "nukex_11.1": [] - } - } - }, - "nukex_10.0": { - "enabled": true, - "nukex_executables": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": { - "__environment_keys__": { - "nukex_10.0": [ - "PYPE_LOG_NO_COLORS", - "QT_PREFERRED_BINDING" - ] - }, - "PYPE_LOG_NO_COLORS": "Yes", - "QT_PREFERRED_BINDING": "PySide" - } } }, "nukestudio": { @@ -308,9 +294,13 @@ "nukestudio_12.0": { "enabled": true, "nukestudio_executables": { - "windows": [], + "windows": [ + "C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe -studio" + ], "darwin": [], - "linux": [] + "linux": [ + "/usr/local/Nuke12.0v1/Nuke12.0 -studio" + ] }, "environment": { "__environment_keys__": { @@ -321,9 +311,13 @@ "nukestudio_11.3": { "enabled": true, "nukestudio_executables": { - "windows": [], + "windows": [ + "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe -studio" + ], "darwin": [], - "linux": [] + "linux": [ + "/usr/local/Nuke11.3v1/Nuke11.3 -studio" + ] }, "environment": { "__environment_keys__": { @@ -334,46 +328,19 @@ "nukestudio_11.2": { "enabled": true, "nukestudio_executables": { - "windows": [], + "windows": [ + "C:\\Program Files\\Nuke11.2v3\\Nuke11.2.exe -studio" + ], "darwin": [], - "linux": [] + "linux": [ + "/usr/local/Nuke11.2v3/Nuke11.2 -studio" + ] }, "environment": { "__environment_keys__": { "nukestudio_11.2": [] } } - }, - "nukestudio_11.1": { - "enabled": true, - "nukestudio_executables": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": { - "__environment_keys__": { - "nukestudio_11.1": [] - } - } - }, - "nukestudio_10.0": { - "enabled": true, - "nukestudio_executables": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": { - "__environment_keys__": { - "nukestudio_10.0": [ - "PYPE_LOG_NO_COLORS", - "QT_PREFERRED_BINDING" - ] - }, - "PYPE_LOG_NO_COLORS": "Yes", - "QT_PREFERRED_BINDING": "PySide" - } } }, "hiero": { @@ -401,9 +368,13 @@ "hiero_12.0": { "enabled": true, "hiero_executables": { - "windows": [], + "windows": [ + "C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe -hiero" + ], "darwin": [], - "linux": [] + "linux": [ + "/usr/local/Nuke12.0v1/Nuke12.0 -hiero" + ] }, "environment": { "__environment_keys__": { @@ -414,9 +385,13 @@ "hiero_11.3": { "enabled": true, "hiero_executables": { - "windows": [], + "windows": [ + "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe -hiero" + ], "darwin": [], - "linux": [] + "linux": [ + "/usr/local/Nuke11.3v1/Nuke11.3 -hiero" + ] }, "environment": { "__environment_keys__": { @@ -436,37 +411,6 @@ "hiero_11.2": [] } } - }, - "hiero_11.1": { - "enabled": true, - "hiero_executables": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": { - "__environment_keys__": { - "hiero_11.1": [] - } - } - }, - "hiero_10.0": { - "enabled": true, - "hiero_executables": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": { - "__environment_keys__": { - "hiero_10.0": [ - "PYPE_LOG_NO_COLORS", - "QT_PREFERRED_BINDING" - ] - }, - "PYPE_LOG_NO_COLORS": "Yes", - "QT_PREFERRED_BINDING": "PySide" - } } }, "fusion": { @@ -479,9 +423,9 @@ "fusion_16": { "enabled": true, "fusion_executables": { - "windows": "", - "darwin": "", - "linux": "" + "windows": [], + "darwin": [], + "linux": [] }, "environment": { "__environment_keys__": { @@ -492,9 +436,9 @@ "fusion_9": { "enabled": true, "fusion_executables": { - "windows": "", - "darwin": "", - "linux": "" + "windows": [], + "darwin": [], + "linux": [] }, "environment": { "__environment_keys__": { @@ -562,9 +506,11 @@ "resolve_16": { "enabled": true, "resolve_executables": { - "windows": "", - "darwin": "", - "linux": "" + "windows": [ + "C:/Program Files/Blackmagic Design/DaVinci Resolve/Resolve.exe" + ], + "darwin": [], + "linux": [] }, "environment": { "__environment_keys__": { @@ -596,9 +542,11 @@ "houdini_18": { "enabled": true, "houdini_executables": { - "windows": "", - "darwin": "", - "linux": "" + "windows": [ + "C:\\Program Files\\Side Effects Software\\Houdini 18.0.287\\bin\\houdini.exe" + ], + "darwin": [], + "linux": [] }, "environment": { "__environment_keys__": { @@ -609,9 +557,11 @@ "houdini_17": { "enabled": true, "houdini_executables": { - "windows": "", - "darwin": "", - "linux": "" + "windows": [ + "C:\\Program Files\\Side Effects Software\\Houdini 17.0.459\\bin\\houdini.exe" + ], + "darwin": [], + "linux": [] }, "environment": { "__environment_keys__": { @@ -640,9 +590,11 @@ "blender_2.90": { "enabled": true, "blender_executables": { - "windows": "", - "darwin": "", - "linux": "" + "windows": [ + "C:\\Program Files\\Blender Foundation\\Blender 2.90\\blender.exe" + ], + "darwin": [], + "linux": [] }, "environment": { "__environment_keys__": { @@ -653,9 +605,11 @@ "blender_2.83": { "enabled": true, "blender_executables": { - "windows": "", - "darwin": "", - "linux": "" + "windows": [ + "C:\\Program Files\\Blender Foundation\\Blender 2.83\\blender.exe" + ], + "darwin": [], + "linux": [] }, "environment": { "__environment_keys__": { @@ -679,9 +633,11 @@ "harmony_20": { "enabled": true, "harmony_executables": { - "windows": "", - "darwin": "", - "linux": "" + "windows": [ + "C:/Program Files (x86)/Toon Boom Animation/Toon Boom Harmony 20 Premium/win64/bin/HarmonyPremium.exe" + ], + "darwin": [], + "linux": [] }, "environment": { "__environment_keys__": { @@ -692,9 +648,11 @@ "harmony_19": { "enabled": true, "harmony_executables": { - "windows": "", - "darwin": "", - "linux": "" + "windows": [ + "C:/Program Files (x86)/Toon Boom Animation/Toon Boom Harmony 19 Premium/win64/bin/HarmonyPremium.exe" + ], + "darwin": [], + "linux": [] }, "environment": { "__environment_keys__": { @@ -705,9 +663,11 @@ "harmony_18": { "enabled": true, "harmony_executables": { - "windows": "", - "darwin": "", - "linux": "" + "windows": [ + "C:/Program Files (x86)/Toon Boom Animation/Toon Boom Harmony 17 Premium/win64/bin/HarmonyPremium.exe" + ], + "darwin": [], + "linux": [] }, "environment": { "__environment_keys__": { @@ -718,9 +678,11 @@ "harmony_17": { "enabled": true, "harmony_executables": { - "windows": "", - "darwin": "", - "linux": "" + "windows": [ + "C:/Program Files (x86)/Toon Boom Animation/Toon Boom Harmony 17 Premium/win64/bin/HarmonyPremium.exe" + ], + "darwin": [], + "linux": [] }, "environment": { "__environment_keys__": { @@ -750,9 +712,11 @@ "photoshop_2020": { "enabled": true, "photoshop_executables": { - "windows": "", - "darwin": "", - "linux": "" + "windows": [ + "C:\\Program Files\\Adobe\\Adobe Photoshop 2020\\Photoshop.exe" + ], + "darwin": [], + "linux": [] }, "environment": { "__environment_keys__": { @@ -773,7 +737,7 @@ }, "celation_Local": { "enabled": true, - "celation_executables": "", + "celation_executables": "C:\\Program Files (x86)\\CelAction\\CelAction2D.exe", "environment": { "__environment_keys__": { "celation_Local": [] @@ -782,7 +746,7 @@ }, "celation_Publish": { "enabled": true, - "celation_executables": "", + "celation_executables": "%PYPE_PYTHON_EXE% \"%PYPE_MODULE_ROOT%\\pype\\hosts\\celaction\\cli.py\" %*", "environment": { "__environment_keys__": { "celation_Publish": [] @@ -800,9 +764,11 @@ "unreal_4.24": { "enabled": true, "unreal_executables": { - "windows": "", - "darwin": "", - "linux": "" + "windows": [ + "%AVALON_CURRENT_UNREAL_ENGINE%\\Engine\\Binaries\\Win64\\UE4Editor.exe" + ], + "darwin": [], + "linux": [] }, "environment": { "__environment_keys__": { @@ -821,9 +787,12 @@ "python_Python 3.7": { "enabled": true, "python_executables": { - "windows": "", - "darwin": "", - "linux": "" + "windows": [ + "C:\\Python37\\python.exe", + "C:\\Python36\\python.exe" + ], + "darwin": [], + "linux": [] }, "environment": { "__environment_keys__": { @@ -834,9 +803,11 @@ "python_Python 2.7": { "enabled": true, "python_executables": { - "windows": "", - "darwin": "", - "linux": "" + "windows": [ + "C:\\Python27\\python.exe" + ], + "darwin": [], + "linux": [] }, "environment": { "__environment_keys__": { @@ -847,9 +818,11 @@ "terminal_Terminal": { "enabled": true, "terminal_executables": { - "windows": "", - "darwin": "", - "linux": "" + "windows": [ + "start cmd" + ], + "darwin": [], + "linux": [] }, "environment": { "__environment_keys__": { diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_host_template.json b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_host_template.json index dd4d3c8b4b..b39d6ac79d 100644 --- a/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_host_template.json +++ b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_host_template.json @@ -1,6 +1,6 @@ [{ "__default_values__": { - "multipath_executables": false, + "multipath_executables": true, "multiplatform": true } }, diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_nuke_template.json b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_nuke_template.json index 36d68dba95..22b2e0c4df 100644 --- a/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_nuke_template.json +++ b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_nuke_template.json @@ -41,24 +41,6 @@ "host_name": "{nuke_type}", "multipath_executables": true } - }, - { - "type": "schema_template", - "name": "system_host_template", - "template_data": { - "host_version": "11.1", - "host_name": "{nuke_type}", - "multipath_executables": true - } - }, - { - "type": "schema_template", - "name": "system_host_template", - "template_data": { - "host_version": "10.0", - "host_name": "{nuke_type}", - "multipath_executables": true - } } ] } From 39891d3644e3f3a9989d998a4e6d8553fffe8a0d Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Fri, 2 Oct 2020 18:36:19 +0200 Subject: [PATCH 5/5] add DJV to applications --- .../defaults/environments/global.json | 12 -------- .../system_settings/global/applications.json | 28 +++++++++++++++++++ .../1_applications_gui_schema.json | 4 +++ .../host_settings/system_djv_schema.json | 27 ++++++++++++++++++ 4 files changed, 59 insertions(+), 12 deletions(-) create mode 100644 pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_djv_schema.json diff --git a/pype/settings/defaults/environments/global.json b/pype/settings/defaults/environments/global.json index ba467d2f5d..717e337db8 100644 --- a/pype/settings/defaults/environments/global.json +++ b/pype/settings/defaults/environments/global.json @@ -10,18 +10,6 @@ "darwin": "{VIRTUAL_ENV}/localized/ffmpeg_exec/darwin/bin:{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/darwin/bin", "linux": "{VIRTUAL_ENV}/localized/ffmpeg_exec/linux:{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/linux" }, - "DJV_PATH": { - "windows": [ - "C:/Program Files/djv-1.1.0-Windows-64/bin/djv_view.exe", - "C:/Program Files/DJV/bin/djv_view.exe", - "{STUDIO_SOFT}/djv/windows/bin/djv_view.exe" - ], - "linux": [ - "usr/local/djv/djv_view", - "{STUDIO_SOFT}/djv/linux/bin/djv_view" - ], - "darwin": "Application/DJV.app/Contents/MacOS/DJV" - }, "PATH": [ "{PYPE_CONFIG}/launchers", "{PYPE_APP_ROOT}", diff --git a/pype/settings/defaults/system_settings/global/applications.json b/pype/settings/defaults/system_settings/global/applications.json index d0a452aaeb..b85ec5369c 100644 --- a/pype/settings/defaults/system_settings/global/applications.json +++ b/pype/settings/defaults/system_settings/global/applications.json @@ -830,5 +830,33 @@ } } } + }, + "djvview": { + "enabled": true, + "environment": { + "__environment_keys__": { + "djvview": [] + } + }, + "djvview_1.1": { + "enabled": true, + "djvview_executables": { + "windows": [ + "C:/Program Files/djv-1.1.0-Windows-64/bin/djv_view.exe", + "C:/Program Files/DJV/bin/djv_view.exe" + ], + "darwin": [ + "Application/DJV.app/Contents/MacOS/DJV" + ], + "linux": [ + "usr/local/djv/djv_view" + ] + }, + "environment": { + "__environment_keys__": { + "djvview_1.1": [] + } + } + } } } \ No newline at end of file diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/1_applications_gui_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/1_applications_gui_schema.json index d1fa4e79f5..6b73fc3f8c 100644 --- a/pype/tools/settings/settings/gui_schemas/system_schema/1_applications_gui_schema.json +++ b/pype/tools/settings/settings/gui_schemas/system_schema/1_applications_gui_schema.json @@ -75,6 +75,10 @@ { "type": "schema", "name": "system_shell_schema" + }, + { + "type": "schema", + "name": "system_djv_schema" } ] } diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_djv_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_djv_schema.json new file mode 100644 index 0000000000..704b13443d --- /dev/null +++ b/pype/tools/settings/settings/gui_schemas/system_schema/host_settings/system_djv_schema.json @@ -0,0 +1,27 @@ +{ + "type": "dict", + "key": "djvview", + "label": "DJV View", + "collapsable": true, + "checkbox_key": "enabled", + "children": [{ + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "key": "environment", + "label": "Environment", + "type": "raw-json", + "env_group_key": "djvview" + }, + { + "type": "schema_template", + "name": "system_host_template", + "template_data": { + "host_version": "1.1", + "host_name": "djvview" + } + } + ] +}