From 71181342c72a598fd1cb368e4f93211d706232f6 Mon Sep 17 00:00:00 2001
From: "clement.hector" <clement.hector@gmail.com>
Date: Fri, 29 Oct 2021 14:08:20 +0200
Subject: [PATCH 1/2] add photoshop2022

---
 .../system_settings/applications.json         | 19 ++++++++---
 .../host_settings/schema_photoshop.json       | 32 ++++++++-----------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json
index cfdeca4b87..17e2d4c551 100644
--- a/openpype/settings/defaults/system_settings/applications.json
+++ b/openpype/settings/defaults/system_settings/applications.json
@@ -973,8 +973,6 @@
         },
         "variants": {
             "2020": {
-                "enabled": true,
-                "variant_label": "2020",
                 "executables": {
                     "windows": [
                         "C:\\Program Files\\Adobe\\Adobe Photoshop 2020\\Photoshop.exe"
@@ -990,8 +988,6 @@
                 "environment": {}
             },
             "2021": {
-                "enabled": true,
-                "variant_label": "2021",
                 "executables": {
                     "windows": [
                         "C:\\Program Files\\Adobe\\Adobe Photoshop 2021\\Photoshop.exe"
@@ -1005,6 +1001,21 @@
                     "linux": []
                 },
                 "environment": {}
+            },
+            "2022": {
+                "executables": {
+                    "windows": [
+                        "C:\\Program Files\\Adobe\\Adobe Photoshop 2022\\Photoshop.exe"
+                    ],
+                    "darwin": [],
+                    "linux": []
+                },
+                "arguments": {
+                    "windows": [],
+                    "darwin": [],
+                    "linux": []
+                },
+                "environment": {}
             }
         }
     },
diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_photoshop.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_photoshop.json
index 7bcd89c650..7055232ae7 100644
--- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_photoshop.json
+++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_photoshop.json
@@ -20,26 +20,20 @@
             "type": "raw-json"
         },
         {
-            "type": "dict",
+            "type": "dict-modifiable",
             "key": "variants",
-            "children": [
-                {
-                    "type": "schema_template",
-                    "name": "template_host_variant",
-                    "template_data": [
-                        {
-                            "app_variant_label": "2020",
-                            "app_variant": "2020",
-                            "variant_skip_paths": ["use_python_2"]
-                        },
-                        {
-                            "app_variant_label": "2021",
-                            "app_variant": "2021",
-                            "variant_skip_paths": ["use_python_2"]
-                        }
-                    ]
-                }
-            ]
+            "collapsible_key": true,
+            "use_label_wrap": false,
+            "object_type": {
+                "type": "dict",
+                "collapsible": true,
+                "children": [
+                    {
+                        "type": "schema_template",
+                        "name": "template_host_variant_items"
+                    }
+                ]
+            }
         }
     ]
 }

From 9e08d20e25627e7acaaa870a1abb4bcce9957aa4 Mon Sep 17 00:00:00 2001
From: clement <clement.hector@gmail.com>
Date: Fri, 29 Oct 2021 15:40:35 +0200
Subject: [PATCH 2/2] Remove use_python_2

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
---
 .../schemas/system_schema/host_settings/schema_photoshop.json  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_photoshop.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_photoshop.json
index 7055232ae7..0687b9699b 100644
--- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_photoshop.json
+++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_photoshop.json
@@ -30,7 +30,8 @@
                 "children": [
                     {
                         "type": "schema_template",
-                        "name": "template_host_variant_items"
+                        "name": "template_host_variant_items",
+                        "skip_paths": ["use_python_2"]
                     }
                 ]
             }