diff --git a/pype/settings/defaults/system_settings/global/general.json b/pype/settings/defaults/system_settings/global/general.json index c138f74667..2941ed7332 100644 --- a/pype/settings/defaults/system_settings/global/general.json +++ b/pype/settings/defaults/system_settings/global/general.json @@ -1,13 +1,21 @@ { - "studio_name": "Studio", - "studio_code": "stu", + "studio_name": "convert from \"PYPE_STUDIO_NAME\"", + "studio_code": "convert from \"PYPE_STUDIO_CODE\"", + "project_plugins": { + "windows": "convert from \"PYPE_PROJECT_PLUGINS\"", + "darwin": "", + "linux": "" + }, + "studio_soft": { + "windows": "convert from \"STUDIO_SOFT\"", + "darwin": "", + "linux": "" + }, "environment": { "__environment_keys__": { "global": [ "PYPE_APP_ROOT", "PYPE_MODULE_ROOT", - "PYPE_PROJECT_PLUGINS", - "STUDIO_SOFT", "FFMPEG_PATH", "DJV_PATH", "PATH", @@ -20,8 +28,6 @@ }, "PYPE_APP_ROOT": "{PYPE_SETUP_PATH}/pypeapp", "PYPE_MODULE_ROOT": "{PYPE_SETUP_PATH}/repos/pype", - "PYPE_PROJECT_PLUGINS": "", - "STUDIO_SOFT": "{PYP_SETUP_ROOT}/soft", "FFMPEG_PATH": { "windows": "{VIRTUAL_ENV}/localized/ffmpeg_exec/windows/bin;{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/windows/bin", "darwin": "{VIRTUAL_ENV}/localized/ffmpeg_exec/darwin/bin:{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/darwin/bin", diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/1_general_gui_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/1_general_gui_schema.json index b83c336237..15252ab39d 100644 --- a/pype/tools/settings/settings/gui_schemas/system_schema/1_general_gui_schema.json +++ b/pype/tools/settings/settings/gui_schemas/system_schema/1_general_gui_schema.json @@ -1,22 +1,39 @@ { - "key": "general", - "type": "dict", - "label": "General", - "collapsable": true, - "is_file": true, - "children": [{ - "key": "studio_name", - "type": "text", - "label": "Studio Name" - },{ - "key": "studio_code", - "type": "text", - "label": "Studio Short Code" - }, - { - "key": "environment", - "label": "Environment", - "type": "raw-json", - "env_group_key": "global" - } -]} + "key": "general", + "type": "dict", + "label": "General", + "collapsable": true, + "is_file": true, + "children": [{ + "key": "studio_name", + "type": "text", + "label": "Studio Name" + }, { + "key": "studio_code", + "type": "text", + "label": "Studio Short Code" + }, { + "type": "splitter" + }, { + "key": "project_plugins", + "type": "path-widget", + "label": "Additional Project Plugins Path", + "multiplatform": true, + "multipath": false + }, { + "key": "studio_soft", + "type": "path-widget", + "label": "Studio Software Location", + "multiplatform": true, + "multipath": false + }, { + "type": "splitter" + }, + { + "key": "environment", + "label": "Environment", + "type": "raw-json", + "env_group_key": "global" + } + ] +} diff --git a/pype/tools/settings/settings/gui_schemas/system_schema/1_modules_gui_schema.json b/pype/tools/settings/settings/gui_schemas/system_schema/1_modules_gui_schema.json index 521442cc09..937eea4097 100644 --- a/pype/tools/settings/settings/gui_schemas/system_schema/1_modules_gui_schema.json +++ b/pype/tools/settings/settings/gui_schemas/system_schema/1_modules_gui_schema.json @@ -47,6 +47,9 @@ "key": "ftrack_server", "label": "Server" }, + { + "type": "splitter" + }, { "type": "label", "label": "Additional Ftrack paths" @@ -63,6 +66,9 @@ "label": "Event paths", "object_type": "text" }, + { + "type": "splitter" + }, { "type": "label", "label": "Ftrack event server advanced settings" @@ -118,10 +124,13 @@ { "key": "default", "type": "text", - "label": "Defautl Intent" + "label": "Default Intent" } ] }, + { + "type": "splitter" + }, { "key": "environment", "label": "Environment",