From 42fd33ef819981d831bda430ae1175539341593e Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Thu, 8 Apr 2021 09:53:16 +0200
Subject: [PATCH] add unreal and terminal to modifiable applications

---
 .../system_settings/applications.json         | 86 +------------------
 .../host_settings/schema_shell.json           | 36 ++++----
 .../host_settings/schema_unreal.json          | 28 +++---
 3 files changed, 34 insertions(+), 116 deletions(-)

diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json
index 38320b8981..8034bc6368 100644
--- a/openpype/settings/defaults/system_settings/applications.json
+++ b/openpype/settings/defaults/system_settings/applications.json
@@ -78,80 +78,6 @@
             }
         }
     },
-    "mayabatch": {
-        "enabled": true,
-        "label": "MayaBatch",
-        "icon": "{}/app_icons/maya.png",
-        "host_name": "maya",
-        "environment": {
-            "PYTHONPATH": [
-                "{OPENPYPE_ROOT}/avalon-core/setup/maya",
-                "{OPENPYPE_ROOT}/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",
-            "OPENPYPE_LOG_NO_COLORS": "Yes",
-            "MAYA_TEST": "{MAYA_VERSION}"
-        },
-        "variants": {
-            "2020": {
-                "executables": {
-                    "windows": [
-                        "C:\\Program Files\\Autodesk\\Maya2020\\bin\\mayabatch.exe"
-                    ],
-                    "darwin": [],
-                    "linux": []
-                },
-                "arguments": {
-                    "windows": [],
-                    "darwin": [],
-                    "linux": []
-                },
-                "environment": {
-                    "MAYA_VERSION": "2020"
-                }
-            },
-            "2019": {
-                "executables": {
-                    "windows": [
-                        "C:\\Program Files\\Autodesk\\Maya2019\\bin\\mayabatch.exe"
-                    ],
-                    "darwin": [],
-                    "linux": []
-                },
-                "arguments": {
-                    "windows": [],
-                    "darwin": [],
-                    "linux": []
-                },
-                "environment": {
-                    "MAYA_VERSION": "2019"
-                }
-            },
-            "2018": {
-                "executables": {
-                    "windows": [
-                        "C:\\Program Files\\Autodesk\\Maya2018\\bin\\mayabatch.exe"
-                    ],
-                    "darwin": [],
-                    "linux": []
-                },
-                "arguments": {
-                    "windows": [],
-                    "darwin": [],
-                    "linux": []
-                },
-                "environment": {
-                    "MAYA_VERSION": "2018"
-                }
-            }
-        }
-    },
     "nuke": {
         "enabled": true,
         "label": "Nuke",
@@ -1063,8 +989,6 @@
         },
         "variants": {
             "4-24": {
-                "enabled": true,
-                "variant_label": "4.24",
                 "executables": {
                     "windows": [],
                     "darwin": [],
@@ -1084,8 +1008,6 @@
         "environment": {},
         "variants": {
             "python_3-7": {
-                "enabled": true,
-                "variant_label": "3.7",
                 "executables": {
                     "windows": [],
                     "darwin": [],
@@ -1099,8 +1021,6 @@
                 "environment": {}
             },
             "python_2-7": {
-                "enabled": true,
-                "variant_label": "2.7",
                 "executables": {
                     "windows": [],
                     "darwin": [],
@@ -1114,8 +1034,6 @@
                 "environment": {}
             },
             "terminal": {
-                "enabled": true,
-                "variant_label": "",
                 "executables": {
                     "windows": [],
                     "darwin": [],
@@ -1127,6 +1045,10 @@
                     "linux": []
                 },
                 "environment": {}
+            },
+            "__dynamic_keys_labels__": {
+                "python_3-7": "Python 3.7",
+                "python_2-7": "Python 2.7"
             }
         }
     },
diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_shell.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_shell.json
index 1e356154fd..e344f98594 100644
--- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_shell.json
+++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_shell.json
@@ -16,28 +16,22 @@
             "type": "raw-json"
         },
         {
-            "type": "dict",
+            "type": "dict-modifiable",
             "key": "variants",
-            "children": [
-                {
-                    "type": "schema_template",
-                    "name": "template_host_variant",
-                    "template_data": [
-                        {
-                            "app_variant": "python_3-7",
-                            "app_variant_label": "Python 3.7"
-                        },
-                        {
-                            "app_variant": "python_2-7",
-                            "app_variant_label": "Python 2.7"
-                        },
-                        {
-                            "app_variant": "terminal",
-                            "app_variant_label": "Terminal"
-                        }
-                    ]
-                }
-            ]
+            "collapsible_key": true,
+            "dynamic_label": false,
+            "use_label_wrap": false,
+            "object_type": {
+                "type": "dict",
+                "collapsible": true,
+                "checkbox_key": "enabled",
+                "children": [
+                    {
+                        "type": "schema_template",
+                        "name": "template_host_variant_items"
+                    }
+                ]
+            }
         }
     ]
 }
diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_unreal.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_unreal.json
index 3cf3005e70..c5096197d6 100644
--- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_unreal.json
+++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_unreal.json
@@ -20,20 +20,22 @@
             "type": "raw-json"
         },
         {
-            "type": "dict",
+            "type": "dict-modifiable",
             "key": "variants",
-            "children": [
-                {
-                    "type": "schema_template",
-                    "name": "template_host_variant",
-                    "template_data": [
-                        {
-                            "app_variant": "4-24",
-                            "app_variant_label": "4.24"
-                        }
-                    ]
-                }
-            ]
+            "collapsible_key": true,
+            "dynamic_label": false,
+            "use_label_wrap": false,
+            "object_type": {
+                "type": "dict",
+                "collapsible": true,
+                "checkbox_key": "enabled",
+                "children": [
+                    {
+                        "type": "schema_template",
+                        "name": "template_host_variant_items"
+                    }
+                ]
+            }
         }
     ]
 }