From dd070c6fcc0ded177fefebcf64f5272bb4d007d3 Mon Sep 17 00:00:00 2001
From: MustafaJafar <mustafataherzaky@outlook.com>
Date: Tue, 31 Oct 2023 18:06:06 +0200
Subject: [PATCH] Enhance shelves settings visual appeal

---
 .../schemas/schema_houdini_scriptshelf.json   | 24 ++++++++++++-------
 .../houdini/server/settings/shelves.py        | 14 +++++++----
 server_addon/houdini/server/version.py        |  2 +-
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_scriptshelf.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_scriptshelf.json
index 35d768843d..f45377c8b4 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_scriptshelf.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_scriptshelf.json
@@ -7,22 +7,30 @@
     "object_type": {
         "type": "dict",
         "children": [
+            {
+                "type": "label",
+                "label": "Option 1: Add a .shelf file"
+            },
+            {
+                "type": "path",
+                "key": "shelf_set_source_path",
+                "label": "Shelf Set Path",
+                "multipath": false,
+                "multiplatform": true
+            },
+            {
+                "type": "label",
+                "label": "<strong>OR</strong> Option 2: Add Shelf Set Name and Shelves Definitions"
+            },
             {
                 "type": "text",
                 "key": "shelf_set_name",
                 "label": "Shelf Set Name"
             },
-            {
-                "type": "path",
-                "key": "shelf_set_source_path",
-                "label": "Shelf Set Path (optional)",
-                "multipath": false,
-                "multiplatform": true
-            },
             {
                 "type": "list",
                 "key": "shelf_definition",
-                "label": "Shelves",
+                "label": "Shelves Definitions",
                 "use_label_wrap": true,
                 "object_type": {
                     "type": "dict",
diff --git a/server_addon/houdini/server/settings/shelves.py b/server_addon/houdini/server/settings/shelves.py
index 8d0512bdeb..e02ddf1c34 100644
--- a/server_addon/houdini/server/settings/shelves.py
+++ b/server_addon/houdini/server/settings/shelves.py
@@ -24,14 +24,18 @@ class ShelfDefinitionModel(BaseSettingsModel):
 
 class ShelvesModel(BaseSettingsModel):
     _layout = "expanded"
-    shelf_set_name: str = Field("", title="Shelfs set name")
-
     shelf_set_source_path: MultiplatformPathModel = Field(
         default_factory=MultiplatformPathModel,
-        title="Shelf Set Path (optional)"
+        title="Shelf Set Path",
+        section="Option 1: Add a .shelf file."
+    )
+    shelf_set_name: str = Field(
+        "",
+        title="Shelf Set Name",
+        section=("OR Option 2: Add Shelf Set Name "
+                 "and Shelves Definitions.")
     )
-
     shelf_definition: list[ShelfDefinitionModel] = Field(
         default_factory=list,
-        title="Shelf Definitions"
+        title="Shelves Definitions"
     )
diff --git a/server_addon/houdini/server/version.py b/server_addon/houdini/server/version.py
index 01ef12070d..6cd38b7465 100644
--- a/server_addon/houdini/server/version.py
+++ b/server_addon/houdini/server/version.py
@@ -1 +1 @@
-__version__ = "0.2.6"
+__version__ = "0.2.7"