From 8dd1843be107919f01e9fdbd5baf1df297191854 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 21 Aug 2024 10:52:40 +0200
Subject: [PATCH 1/9] implemented helper line edit with options

---
 client/ayon_core/style/style.css        |  25 ++++++
 client/ayon_core/tools/utils/widgets.py | 115 ++++++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/client/ayon_core/style/style.css b/client/ayon_core/style/style.css
index 607fd1fa31..2c826f16a4 100644
--- a/client/ayon_core/style/style.css
+++ b/client/ayon_core/style/style.css
@@ -739,6 +739,31 @@ OverlayMessageWidget QWidget {
     background: transparent;
 }
 
+/* Hinted Line Edit */
+#HintedLineEditInput {
+    border-radius: 0.2em;
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+    border: 1px solid {color:border};
+}
+#HintedLineEditInput:hover {
+    border-color: {color:border-hover};
+}
+#HintedLineEditInput:focus{
+    border-color: {color:border-focus};
+}
+#HintedLineEditInput:disabled {
+    background: {color:bg-inputs-disabled};
+}
+#HintedLineEditButton {
+    border: none;
+    border-radius: 0.2em;
+    border-bottom-left-radius: 0px;
+    border-top-left-radius: 0px;
+    padding: 0px;
+    qproperty-iconSize: 11px 11px;
+}
+
 /* Password dialog*/
 #PasswordBtn {
     border: none;
diff --git a/client/ayon_core/tools/utils/widgets.py b/client/ayon_core/tools/utils/widgets.py
index 28331fbc35..2065246190 100644
--- a/client/ayon_core/tools/utils/widgets.py
+++ b/client/ayon_core/tools/utils/widgets.py
@@ -1,4 +1,5 @@
 import logging
+from typing import Optional, List
 
 from qtpy import QtWidgets, QtCore, QtGui
 import qargparse
@@ -104,6 +105,120 @@ def __init__(self, *args, **kwargs):
             self.setPalette(filter_palette)
 
 
+def get_down_arrow_icon() -> QtGui.QIcon:
+    normal_pixmap = QtGui.QPixmap(
+        get_style_image_path("down_arrow")
+    )
+    on_pixmap = QtGui.QPixmap(
+        get_style_image_path("down_arrow_on")
+    )
+    disabled_pixmap = QtGui.QPixmap(
+        get_style_image_path("down_arrow_disabled")
+    )
+    icon = QtGui.QIcon(normal_pixmap)
+    icon.addPixmap(on_pixmap, QtGui.QIcon.Active)
+    icon.addPixmap(disabled_pixmap, QtGui.QIcon.Disabled)
+    return icon
+
+
+class HintedLineEdit(QtWidgets.QWidget):
+    returnPressed = QtCore.Signal()
+    textChanged = QtCore.Signal(str)
+    textEdited = QtCore.Signal(str)
+
+    def __init__(
+        self,
+        options: Optional[List[str]] = None,
+        parent: Optional[QtWidgets.QWidget] = None
+    ):
+        super().__init__(parent)
+
+        text_input = PlaceholderLineEdit(self)
+        options_button = QtWidgets.QPushButton(self)
+
+        text_input.setObjectName("HintedLineEditInput")
+        options_button.setObjectName("HintedLineEditButton")
+        options_button.setIcon(get_down_arrow_icon())
+
+        main_layout = QtWidgets.QHBoxLayout(self)
+        main_layout.setContentsMargins(0, 0, 0, 0)
+        main_layout.setSpacing(0)
+        main_layout.addWidget(text_input, 1)
+        main_layout.addWidget(options_button, 0)
+
+        # Expand line edit and button vertically so they have same height
+        for widget in (text_input, options_button):
+            w_size_policy = widget.sizePolicy()
+            w_size_policy.setVerticalPolicy(
+                QtWidgets.QSizePolicy.MinimumExpanding)
+            widget.setSizePolicy(w_size_policy)
+
+        # Set size hint of this frame to fixed so size hint height is
+        #   used as fixed height
+        size_policy = self.sizePolicy()
+        size_policy.setVerticalPolicy(QtWidgets.QSizePolicy.Fixed)
+        self.setSizePolicy(size_policy)
+
+        text_input.returnPressed.connect(self.returnPressed)
+        text_input.textChanged.connect(self.textChanged)
+        text_input.textEdited.connect(self.textEdited)
+        options_button.clicked.connect(self._on_options_button_clicked)
+
+        self._text_input = text_input
+        self._options_button = options_button
+        self._options = None
+
+        # Set default state
+        self.set_options(options)
+
+    def text(self) -> str:
+        return self._text_input.text()
+
+    def setText(self, text: str):
+        self._text_input.setText(text)
+
+    def setPlaceholderText(self, text: str):
+        self._text_input.setPlaceholderText(text)
+
+    def placeholderText(self) -> str:
+        return self._text_input.placeholderText()
+
+    def setReadOnly(self, state: bool):
+        self._text_input.setReadOnly(state)
+
+    def setIcon(self, icon: QtGui.QIcon):
+        self._options_button.setIcon(icon)
+
+    def set_options(self, options: Optional[List[str]] = None):
+        self._options = options
+        self._options_button.setEnabled(bool(options))
+
+    def sizeHint(self) -> QtCore.QSize:
+        hint = super().sizeHint()
+        tsz = self._text_input.sizeHint()
+        bsz = self._options_button.sizeHint()
+        hint.setHeight(max(tsz.height(), bsz.height()))
+        return hint
+
+    def _on_options_button_clicked(self):
+        if not self._options:
+            return
+
+        menu = QtWidgets.QMenu(self)
+        for option in self._options:
+            action = menu.addAction(option)
+            action.triggered.connect(self._on_option_action)
+
+        rect = self._options_button.rect()
+        pos = self._options_button.mapToGlobal(rect.bottomLeft())
+        menu.exec_(pos)
+
+    def _on_option_action(self):
+        action = self.sender()
+        if action:
+            self.setText(action.text())
+
+
 class ExpandingTextEdit(QtWidgets.QTextEdit):
     """QTextEdit which does not have sroll area but expands height."""
 

From 7e12163c7a78dfd0dd7157d1760232ab0808a7c2 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 21 Aug 2024 11:25:54 +0200
Subject: [PATCH 2/9] added options to pass separator

---
 client/ayon_core/tools/utils/widgets.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/tools/utils/widgets.py b/client/ayon_core/tools/utils/widgets.py
index 2065246190..e3ff42a102 100644
--- a/client/ayon_core/tools/utils/widgets.py
+++ b/client/ayon_core/tools/utils/widgets.py
@@ -1,5 +1,5 @@
 import logging
-from typing import Optional, List
+from typing import Optional, List, Set
 
 from qtpy import QtWidgets, QtCore, QtGui
 import qargparse
@@ -122,6 +122,7 @@ def get_down_arrow_icon() -> QtGui.QIcon:
 
 
 class HintedLineEdit(QtWidgets.QWidget):
+    SEPARATORS: Set[str] = {"---", "---separator---"}
     returnPressed = QtCore.Signal()
     textChanged = QtCore.Signal(str)
     textEdited = QtCore.Signal(str)
@@ -206,6 +207,9 @@ def _on_options_button_clicked(self):
 
         menu = QtWidgets.QMenu(self)
         for option in self._options:
+            if option in self.SEPARATORS:
+                menu.addSeparator()
+                continue
             action = menu.addAction(option)
             action.triggered.connect(self._on_option_action)
 

From 54665ba72b5732da893712586359f95ee3298ac1 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 21 Aug 2024 11:26:01 +0200
Subject: [PATCH 3/9] handle tooltips

---
 client/ayon_core/tools/utils/widgets.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/ayon_core/tools/utils/widgets.py b/client/ayon_core/tools/utils/widgets.py
index e3ff42a102..8109130c27 100644
--- a/client/ayon_core/tools/utils/widgets.py
+++ b/client/ayon_core/tools/utils/widgets.py
@@ -190,6 +190,12 @@ def setReadOnly(self, state: bool):
     def setIcon(self, icon: QtGui.QIcon):
         self._options_button.setIcon(icon)
 
+    def setToolTip(self, text: str):
+        self._text_input.setToolTip(text)
+
+    def set_button_tool_tip(self, text: str):
+        self._options_button.setToolTip(text)
+
     def set_options(self, options: Optional[List[str]] = None):
         self._options = options
         self._options_button.setEnabled(bool(options))

From bf48d9e804f0b66b29ddaa417f28cf0bbb253c50 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 21 Aug 2024 11:26:16 +0200
Subject: [PATCH 4/9] added 'HintedLineEdit' to utils init file

---
 client/ayon_core/tools/utils/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/ayon_core/tools/utils/__init__.py b/client/ayon_core/tools/utils/__init__.py
index 4b5fbeaf67..059ac28b7b 100644
--- a/client/ayon_core/tools/utils/__init__.py
+++ b/client/ayon_core/tools/utils/__init__.py
@@ -5,6 +5,7 @@
     ComboBox,
     CustomTextComboBox,
     PlaceholderLineEdit,
+    HintedLineEdit,
     ExpandingTextEdit,
     BaseClickableFrame,
     ClickableFrame,
@@ -88,6 +89,7 @@
     "ComboBox",
     "CustomTextComboBox",
     "PlaceholderLineEdit",
+    "HintedLineEdit",
     "ExpandingTextEdit",
     "BaseClickableFrame",
     "ClickableFrame",

From 8a9d815278746f5b49cf09b4cb50e8b5647b4a7e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 21 Aug 2024 11:29:44 +0200
Subject: [PATCH 5/9] use class name over object name for formatting

---
 client/ayon_core/style/style.css        | 10 +++++-----
 client/ayon_core/tools/utils/widgets.py | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/client/ayon_core/style/style.css b/client/ayon_core/style/style.css
index 2c826f16a4..1af355ac7b 100644
--- a/client/ayon_core/style/style.css
+++ b/client/ayon_core/style/style.css
@@ -740,22 +740,22 @@ OverlayMessageWidget QWidget {
 }
 
 /* Hinted Line Edit */
-#HintedLineEditInput {
+HintedLineEditInput {
     border-radius: 0.2em;
     border-top-right-radius: 0px;
     border-bottom-right-radius: 0px;
     border: 1px solid {color:border};
 }
-#HintedLineEditInput:hover {
+HintedLineEditInput:hover {
     border-color: {color:border-hover};
 }
-#HintedLineEditInput:focus{
+HintedLineEditInput:focus{
     border-color: {color:border-focus};
 }
-#HintedLineEditInput:disabled {
+HintedLineEditInput:disabled {
     background: {color:bg-inputs-disabled};
 }
-#HintedLineEditButton {
+HintedLineEditButton {
     border: none;
     border-radius: 0.2em;
     border-bottom-left-radius: 0px;
diff --git a/client/ayon_core/tools/utils/widgets.py b/client/ayon_core/tools/utils/widgets.py
index 8109130c27..008f48c502 100644
--- a/client/ayon_core/tools/utils/widgets.py
+++ b/client/ayon_core/tools/utils/widgets.py
@@ -121,6 +121,14 @@ def get_down_arrow_icon() -> QtGui.QIcon:
     return icon
 
 
+class HintedLineEditInput(PlaceholderLineEdit):
+    pass
+
+
+class HintedLineEditButton(QtWidgets.QPushButton):
+    pass
+
+
 class HintedLineEdit(QtWidgets.QWidget):
     SEPARATORS: Set[str] = {"---", "---separator---"}
     returnPressed = QtCore.Signal()
@@ -134,11 +142,8 @@ def __init__(
     ):
         super().__init__(parent)
 
-        text_input = PlaceholderLineEdit(self)
-        options_button = QtWidgets.QPushButton(self)
-
-        text_input.setObjectName("HintedLineEditInput")
-        options_button.setObjectName("HintedLineEditButton")
+        text_input = HintedLineEditInput(self)
+        options_button = HintedLineEditButton(self)
         options_button.setIcon(get_down_arrow_icon())
 
         main_layout = QtWidgets.QHBoxLayout(self)

From c8880a87d63fcdd5af69ed1f95ba9910d2970527 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 21 Aug 2024 12:11:58 +0200
Subject: [PATCH 6/9] added option to change style of the widget

---
 client/ayon_core/tools/utils/widgets.py | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/client/ayon_core/tools/utils/widgets.py b/client/ayon_core/tools/utils/widgets.py
index 008f48c502..184465ee1b 100644
--- a/client/ayon_core/tools/utils/widgets.py
+++ b/client/ayon_core/tools/utils/widgets.py
@@ -1,5 +1,5 @@
 import logging
-from typing import Optional, List, Set
+from typing import Optional, List, Set, Any
 
 from qtpy import QtWidgets, QtCore, QtGui
 import qargparse
@@ -12,7 +12,7 @@
 )
 from ayon_core.lib.attribute_definitions import AbstractAttrDef
 
-from .lib import get_qta_icon_by_name_and_color
+from .lib import get_qta_icon_by_name_and_color, set_style_property
 
 log = logging.getLogger(__name__)
 
@@ -121,6 +121,7 @@ def get_down_arrow_icon() -> QtGui.QIcon:
     return icon
 
 
+# These are placeholders for adding style
 class HintedLineEditInput(PlaceholderLineEdit):
     pass
 
@@ -212,6 +213,21 @@ def sizeHint(self) -> QtCore.QSize:
         hint.setHeight(max(tsz.height(), bsz.height()))
         return hint
 
+    # Adds ability to change style of the widgets
+    # - because style change of the 'HintedLineEdit' may not propagate
+    #   correctly 'HintedLineEditInput' and 'HintedLineEditButton'
+    def set_text_widget_object_name(self, name: str):
+        self._text_input.setObjectName(name)
+
+    def set_text_widget_property(self, name: str, value: Any):
+        set_style_property(self._text_input, name, value)
+
+    def set_button_widget_object_name(self, name: str):
+        self._text_input.setObjectName(name)
+
+    def set_button_widget_property(self, name: str, value: Any):
+        set_style_property(self._options_button, name, value)
+
     def _on_options_button_clicked(self):
         if not self._options:
             return

From 9524aadeb2db0aa9c8cb37cea68f87521e2cb507 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 21 Aug 2024 12:13:49 +0200
Subject: [PATCH 7/9] use 'HintedLineEdit' in publisher

---
 client/ayon_core/style/style.css              | 11 ---
 .../tools/publisher/widgets/create_widget.py  | 98 +++++--------------
 2 files changed, 22 insertions(+), 87 deletions(-)

diff --git a/client/ayon_core/style/style.css b/client/ayon_core/style/style.css
index 1af355ac7b..0857bc80c6 100644
--- a/client/ayon_core/style/style.css
+++ b/client/ayon_core/style/style.css
@@ -994,17 +994,6 @@ PixmapButton:disabled {
 #PublishLogConsole {
     font-family: "Noto Sans Mono";
 }
-#VariantInputsWidget QLineEdit {
-    border-bottom-right-radius: 0px;
-    border-top-right-radius: 0px;
-}
-#VariantInputsWidget QToolButton {
-    border-bottom-left-radius: 0px;
-    border-top-left-radius: 0px;
-    padding-top: 0.5em;
-    padding-bottom: 0.5em;
-    width: 0.5em;
-}
 #VariantInput[state="new"], #VariantInput[state="new"]:focus, #VariantInput[state="new"]:hover {
     border-color: {color:publisher:success};
 }
diff --git a/client/ayon_core/tools/publisher/widgets/create_widget.py b/client/ayon_core/tools/publisher/widgets/create_widget.py
index 479a63ebc9..4c94c5c9b9 100644
--- a/client/ayon_core/tools/publisher/widgets/create_widget.py
+++ b/client/ayon_core/tools/publisher/widgets/create_widget.py
@@ -19,6 +19,7 @@
     INPUTS_LAYOUT_HSPACING,
     INPUTS_LAYOUT_VSPACING,
 )
+from ayon_core.tools.utils import HintedLineEdit
 
 from .thumbnail_widget import ThumbnailWidget
 from .widgets import (
@@ -28,8 +29,6 @@
 from .create_context_widgets import CreateContextWidget
 from .precreate_widget import PreCreateWidget
 
-SEPARATORS = ("---separator---", "---")
-
 
 class ResizeControlWidget(QtWidgets.QWidget):
     resized = QtCore.Signal()
@@ -168,25 +167,9 @@ def __init__(self, controller, parent=None):
 
         product_variant_widget = QtWidgets.QWidget(creator_basics_widget)
         # Variant and product input
-        variant_widget = ResizeControlWidget(product_variant_widget)
-        variant_widget.setObjectName("VariantInputsWidget")
-
-        variant_input = QtWidgets.QLineEdit(variant_widget)
-        variant_input.setObjectName("VariantInput")
-        variant_input.setToolTip(VARIANT_TOOLTIP)
-
-        variant_hints_btn = QtWidgets.QToolButton(variant_widget)
-        variant_hints_btn.setArrowType(QtCore.Qt.DownArrow)
-        variant_hints_btn.setIconSize(QtCore.QSize(12, 12))
-
-        variant_hints_menu = QtWidgets.QMenu(variant_widget)
-        variant_hints_group = QtWidgets.QActionGroup(variant_hints_menu)
-
-        variant_layout = QtWidgets.QHBoxLayout(variant_widget)
-        variant_layout.setContentsMargins(0, 0, 0, 0)
-        variant_layout.setSpacing(0)
-        variant_layout.addWidget(variant_input, 1)
-        variant_layout.addWidget(variant_hints_btn, 0, QtCore.Qt.AlignVCenter)
+        variant_widget = HintedLineEdit(parent=product_variant_widget)
+        variant_widget.set_text_widget_object_name("VariantInput")
+        variant_widget.setToolTip(VARIANT_TOOLTIP)
 
         product_name_input = QtWidgets.QLineEdit(product_variant_widget)
         product_name_input.setEnabled(False)
@@ -262,15 +245,12 @@ def __init__(self, controller, parent=None):
         prereq_timer.timeout.connect(self._invalidate_prereq)
 
         create_btn.clicked.connect(self._on_create)
-        variant_widget.resized.connect(self._on_variant_widget_resize)
         creator_basics_widget.resized.connect(self._on_creator_basics_resize)
-        variant_input.returnPressed.connect(self._on_create)
-        variant_input.textChanged.connect(self._on_variant_change)
+        variant_widget.returnPressed.connect(self._on_create)
+        variant_widget.textChanged.connect(self._on_variant_change)
         creators_view.selectionModel().currentChanged.connect(
             self._on_creator_item_change
         )
-        variant_hints_btn.clicked.connect(self._on_variant_btn_click)
-        variant_hints_menu.triggered.connect(self._on_variant_action)
         context_widget.folder_changed.connect(self._on_folder_change)
         context_widget.task_changed.connect(self._on_task_change)
         thumbnail_widget.thumbnail_created.connect(self._on_thumbnail_create)
@@ -291,10 +271,7 @@ def __init__(self, controller, parent=None):
 
         self.product_name_input = product_name_input
 
-        self.variant_input = variant_input
-        self.variant_hints_btn = variant_hints_btn
-        self.variant_hints_menu = variant_hints_menu
-        self.variant_hints_group = variant_hints_group
+        self._variant_widget = variant_widget
 
         self._creators_model = creators_model
         self._creators_sort_model = creators_sort_model
@@ -314,6 +291,7 @@ def __init__(self, controller, parent=None):
         self._last_current_context_folder_path = None
         self._last_current_context_task = None
         self._use_current_context = True
+        self._current_creator_variant_hints = []
 
     def get_current_folder_path(self):
         return self._controller.get_current_folder_path()
@@ -438,8 +416,7 @@ def _invalidate_prereq(self):
 
             self._create_btn.setEnabled(prereq_available)
 
-            self.variant_input.setEnabled(prereq_available)
-            self.variant_hints_btn.setEnabled(prereq_available)
+            self._variant_widget.setEnabled(prereq_available)
 
         tooltip = ""
         if creator_btn_tooltips:
@@ -611,35 +588,15 @@ def _set_creator(self, creator_item):
         if not default_variant:
             default_variant = default_variants[0]
 
-        for action in tuple(self.variant_hints_menu.actions()):
-            self.variant_hints_menu.removeAction(action)
-            action.deleteLater()
-
-        for variant in default_variants:
-            if variant in SEPARATORS:
-                self.variant_hints_menu.addSeparator()
-            elif variant:
-                self.variant_hints_menu.addAction(variant)
+        self._current_creator_variant_hints = list(default_variants)
+        self._variant_widget.set_options(default_variants)
 
         variant_text = default_variant or DEFAULT_VARIANT_VALUE
         # Make sure product name is updated to new plugin
-        if variant_text == self.variant_input.text():
+        if variant_text == self._variant_widget.text():
             self._on_variant_change()
         else:
-            self.variant_input.setText(variant_text)
-
-    def _on_variant_widget_resize(self):
-        self.variant_hints_btn.setFixedHeight(self.variant_input.height())
-
-    def _on_variant_btn_click(self):
-        pos = self.variant_hints_btn.rect().bottomLeft()
-        point = self.variant_hints_btn.mapToGlobal(pos)
-        self.variant_hints_menu.popup(point)
-
-    def _on_variant_action(self, action):
-        value = action.text()
-        if self.variant_input.text() != value:
-            self.variant_input.setText(value)
+            self._variant_widget.setText(variant_text)
 
     def _on_variant_change(self, variant_value=None):
         if not self._prereq_available:
@@ -652,7 +609,7 @@ def _on_variant_change(self, variant_value=None):
             return
 
         if variant_value is None:
-            variant_value = self.variant_input.text()
+            variant_value = self._variant_widget.text()
 
         if not self._compiled_name_pattern.match(variant_value):
             self._create_btn.setEnabled(False)
@@ -707,20 +664,12 @@ def _validate_product_name(self, product_name, variant_value):
                 if _result:
                     variant_hints |= set(_result.groups())
 
-        # Remove previous hints from menu
-        for action in tuple(self.variant_hints_group.actions()):
-            self.variant_hints_group.removeAction(action)
-            self.variant_hints_menu.removeAction(action)
-            action.deleteLater()
-
-        # Add separator if there are hints and menu already has actions
-        if variant_hints and self.variant_hints_menu.actions():
-            self.variant_hints_menu.addSeparator()
-
+        options = list(self._current_creator_variant_hints)
+        if options:
+            options.append("---")
+        options.extend(variant_hints)
         # Add hints to actions
-        for variant_hint in variant_hints:
-            action = self.variant_hints_menu.addAction(variant_hint)
-            self.variant_hints_group.addAction(action)
+        self._variant_widget.set_options(options)
 
         # Indicate product existence
         if not variant_value:
@@ -741,10 +690,7 @@ def _validate_product_name(self, product_name, variant_value):
             self._create_btn.setEnabled(variant_is_valid)
 
     def _set_variant_state_property(self, state):
-        current_value = self.variant_input.property("state")
-        if current_value != state:
-            self.variant_input.setProperty("state", state)
-            self.variant_input.style().polish(self.variant_input)
+        self._variant_widget.set_text_widget_property("state", state)
 
     def _on_first_show(self):
         width = self.width()
@@ -776,7 +722,7 @@ def _on_create(self):
         index = indexes[0]
         creator_identifier = index.data(CREATOR_IDENTIFIER_ROLE)
         product_type = index.data(PRODUCT_TYPE_ROLE)
-        variant = self.variant_input.text()
+        variant = self._variant_widget.text()
         # Care about product name only if context change is enabled
         product_name = None
         folder_path = None
@@ -810,7 +756,7 @@ def _on_create(self):
 
         if success:
             self._set_creator(self._selected_creator)
-            self.variant_input.setText(variant)
+            self._variant_widget.setText(variant)
             self._controller.emit_card_message("Creation finished...")
             self._last_thumbnail_path = None
             self._thumbnail_widget.set_current_thumbnails()

From d8ca5e797cdfaa658c8251e89efbc8270c0d8e98 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 21 Aug 2024 15:59:25 +0200
Subject: [PATCH 8/9] simplify menu handling

---
 client/ayon_core/tools/utils/widgets.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/client/ayon_core/tools/utils/widgets.py b/client/ayon_core/tools/utils/widgets.py
index 184465ee1b..982b2fd6a6 100644
--- a/client/ayon_core/tools/utils/widgets.py
+++ b/client/ayon_core/tools/utils/widgets.py
@@ -233,21 +233,19 @@ def _on_options_button_clicked(self):
             return
 
         menu = QtWidgets.QMenu(self)
+        menu.triggered.connect(self._on_option_action)
         for option in self._options:
             if option in self.SEPARATORS:
                 menu.addSeparator()
-                continue
-            action = menu.addAction(option)
-            action.triggered.connect(self._on_option_action)
+            else:
+                menu.addAction(option)
 
         rect = self._options_button.rect()
         pos = self._options_button.mapToGlobal(rect.bottomLeft())
         menu.exec_(pos)
 
-    def _on_option_action(self):
-        action = self.sender()
-        if action:
-            self.setText(action.text())
+    def _on_option_action(self, action):
+        self.setText(action.text())
 
 
 class ExpandingTextEdit(QtWidgets.QTextEdit):

From 767ce61208f549a9fb38d1acad9191f092638c52 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 21 Aug 2024 16:19:09 +0200
Subject: [PATCH 9/9] cache paths

---
 client/ayon_core/tools/utils/widgets.py | 29 +++++++++++++++----------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/client/ayon_core/tools/utils/widgets.py b/client/ayon_core/tools/utils/widgets.py
index 982b2fd6a6..5e4cd75cfe 100644
--- a/client/ayon_core/tools/utils/widgets.py
+++ b/client/ayon_core/tools/utils/widgets.py
@@ -105,7 +105,14 @@ def __init__(self, *args, **kwargs):
             self.setPalette(filter_palette)
 
 
+class _LocalCache:
+    down_arrow_icon = None
+
+
 def get_down_arrow_icon() -> QtGui.QIcon:
+    if _LocalCache.down_arrow_icon is not None:
+        return _LocalCache.down_arrow_icon
+
     normal_pixmap = QtGui.QPixmap(
         get_style_image_path("down_arrow")
     )
@@ -118,6 +125,7 @@ def get_down_arrow_icon() -> QtGui.QIcon:
     icon = QtGui.QIcon(normal_pixmap)
     icon.addPixmap(on_pixmap, QtGui.QIcon.Active)
     icon.addPixmap(disabled_pixmap, QtGui.QIcon.Disabled)
+    _LocalCache.down_arrow_icon = icon
     return icon
 
 
@@ -350,6 +358,8 @@ class ExpandBtnLabel(QtWidgets.QLabel):
     """Label showing expand icon meant for ExpandBtn."""
     state_changed = QtCore.Signal()
 
+    branch_closed_path = get_style_image_path("branch_closed")
+    branch_open_path = get_style_image_path("branch_open")
 
     def __init__(self, parent):
         super(ExpandBtnLabel, self).__init__(parent)
@@ -360,14 +370,10 @@ def __init__(self, parent):
         self._collapsed = True
 
     def _create_collapsed_pixmap(self):
-        return QtGui.QPixmap(
-            get_style_image_path("branch_closed")
-        )
+        return QtGui.QPixmap(self.branch_closed_path)
 
     def _create_expanded_pixmap(self):
-        return QtGui.QPixmap(
-            get_style_image_path("branch_open")
-        )
+        return QtGui.QPixmap(self.branch_open_path)
 
     @property
     def collapsed(self):
@@ -435,15 +441,14 @@ def set_collapsed(self, collapsed=None):
 
 
 class ClassicExpandBtnLabel(ExpandBtnLabel):
+    right_arrow_path = get_style_image_path("right_arrow")
+    down_arrow_path = get_style_image_path("down_arrow")
+
     def _create_collapsed_pixmap(self):
-        return QtGui.QPixmap(
-            get_style_image_path("right_arrow")
-        )
+        return QtGui.QPixmap(self.right_arrow_path)
 
     def _create_expanded_pixmap(self):
-        return QtGui.QPixmap(
-            get_style_image_path("down_arrow")
-        )
+        return QtGui.QPixmap(self.down_arrow_path)
 
 
 class ClassicExpandBtn(ExpandBtn):