import widgets from new locations

2025-12-24 12:54:40 +01:00 · 2024-03-18 17:59:41 +01:00 · 2024-03-18 17:59:41 +01:00 · 95a67b666f
commit 95a67b666f
parent fb3df8c806
19 changed files with 40 additions and 30 deletions
--- a/client/ayon_core/hosts/houdini/api/usd.py
+++ b/client/ayon_core/hosts/houdini/api/usd.py
@ -8,8 +8,11 @@ from qtpy import QtWidgets, QtCore, QtGui

 from ayon_core import style
 from ayon_core.pipeline import get_current_project_name
-from ayon_core.tools.utils import PlaceholderLineEdit, RefreshButton
-from ayon_core.tools.ayon_utils.widgets import SimpleFoldersWidget
+from ayon_core.tools.utils import (
+    PlaceholderLineEdit,
+    RefreshButton,
+    SimpleFoldersWidget,
+)

 from pxr import Sdf

--- a/client/ayon_core/tools/context_dialog/window.py
+++ b/client/ayon_core/tools/context_dialog/window.py
@ -10,15 +10,13 @@ from ayon_core.tools.ayon_utils.models import (
    ProjectsModel,
    HierarchyModel,
 )
-from ayon_core.tools.ayon_utils.widgets import (
+from ayon_core.tools.utils import (
    ProjectsCombobox,
    FoldersWidget,
    TasksWidget,
-)
-from ayon_core.tools.utils.lib import (
-    center_window,
    get_ayon_qt_app,
 )
+from ayon_core.tools.utils.lib import center_window


 class SelectionModel(object):
--- a/client/ayon_core/tools/launcher/ui/actions_widget.py
+++ b/client/ayon_core/tools/launcher/ui/actions_widget.py
@ -4,7 +4,7 @@ import collections
 from qtpy import QtWidgets, QtCore, QtGui

 from ayon_core.tools.flickcharm import FlickCharm
-from ayon_core.tools.ayon_utils.widgets import get_qt_icon
+from ayon_core.tools.utils import get_qt_icon

 from .resources import get_options_image_path

--- a/client/ayon_core/tools/launcher/ui/hierarchy_page.py
+++ b/client/ayon_core/tools/launcher/ui/hierarchy_page.py
@ -6,7 +6,7 @@ from ayon_core.tools.utils import (
    SquareButton,
    RefreshButton,
 )
-from ayon_core.tools.ayon_utils.widgets import (
+from ayon_core.tools.utils import (
    ProjectsCombobox,
    FoldersWidget,
    TasksWidget,
--- a/client/ayon_core/tools/launcher/ui/projects_widget.py
+++ b/client/ayon_core/tools/launcher/ui/projects_widget.py
@ -1,8 +1,9 @@
 from qtpy import QtWidgets, QtCore

 from ayon_core.tools.flickcharm import FlickCharm
-from ayon_core.tools.utils import PlaceholderLineEdit, RefreshButton
-from ayon_core.tools.ayon_utils.widgets import (
+from ayon_core.tools.utils import (
+    PlaceholderLineEdit,
+    RefreshButton,
    ProjectsQtModel,
    ProjectSortFilterProxy,
 )
--- a/client/ayon_core/tools/loader/ui/actions_utils.py
+++ b/client/ayon_core/tools/loader/ui/actions_utils.py
@ -10,7 +10,7 @@ from ayon_core.tools.utils.widgets import (
    OptionalAction,
    OptionDialog,
 )
-from ayon_core.tools.ayon_utils.widgets import get_qt_icon
+from ayon_core.tools.utils import get_qt_icon


 def show_actions_menu(action_items, global_point, one_item_selected, parent):
--- a/client/ayon_core/tools/loader/ui/folders_widget.py
+++ b/client/ayon_core/tools/loader/ui/folders_widget.py
@ -7,11 +7,11 @@ from ayon_core.tools.utils import (
 )
 from ayon_core.style import get_objected_colors

-from ayon_core.tools.ayon_utils.widgets import (
+from ayon_core.tools.utils import (
    FoldersQtModel,
    FOLDERS_MODEL_SENDER_NAME,
 )
-from ayon_core.tools.ayon_utils.widgets.folders_widget import FOLDER_ID_ROLE
+from ayon_core.tools.utils.folders_widget import FOLDER_ID_ROLE

 if qtpy.API == "pyside":
    from PySide.QtGui import QStyleOptionViewItemV4
--- a/client/ayon_core/tools/loader/ui/product_types_widget.py
+++ b/client/ayon_core/tools/loader/ui/product_types_widget.py
@ -1,6 +1,6 @@
 from qtpy import QtWidgets, QtGui, QtCore

-from ayon_core.tools.ayon_utils.widgets import get_qt_icon
+from ayon_core.tools.utils import get_qt_icon

 PRODUCT_TYPE_ROLE = QtCore.Qt.UserRole + 1

--- a/client/ayon_core/tools/loader/ui/products_model.py
+++ b/client/ayon_core/tools/loader/ui/products_model.py
@ -4,7 +4,7 @@ import qtawesome
 from qtpy import QtGui, QtCore

 from ayon_core.style import get_default_entity_icon_color
-from ayon_core.tools.ayon_utils.widgets import get_qt_icon
+from ayon_core.tools.utils import get_qt_icon

 PRODUCTS_MODEL_SENDER_NAME = "qt_products_model"

--- a/client/ayon_core/tools/loader/ui/repres_widget.py
+++ b/client/ayon_core/tools/loader/ui/repres_widget.py
@ -4,7 +4,7 @@ from qtpy import QtWidgets, QtGui, QtCore
 import qtawesome

 from ayon_core.style import get_default_entity_icon_color
-from ayon_core.tools.ayon_utils.widgets import get_qt_icon
+from ayon_core.tools.utils import get_qt_icon
 from ayon_core.tools.utils import DeselectableTreeView

 from .actions_utils import show_actions_menu
--- a/client/ayon_core/tools/loader/ui/window.py
+++ b/client/ayon_core/tools/loader/ui/window.py
@ -10,7 +10,7 @@ from ayon_core.tools.utils import (
    GoToCurrentButton,
 )
 from ayon_core.tools.utils.lib import center_window
-from ayon_core.tools.ayon_utils.widgets import ProjectsCombobox
+from ayon_core.tools.utils import ProjectsCombobox
 from ayon_core.tools.loader.control import LoaderController

 from .folders_widget import LoaderFoldersWidget
--- a/client/ayon_core/tools/publisher/widgets/create_context_widgets.py
+++ b/client/ayon_core/tools/publisher/widgets/create_context_widgets.py
@ -4,7 +4,7 @@ from ayon_core.lib.events import QueuedEventSystem
 from ayon_core.tools.utils import PlaceholderLineEdit, GoToCurrentButton

 from ayon_core.tools.ayon_utils.models import HierarchyExpectedSelection
-from ayon_core.tools.ayon_utils.widgets import FoldersWidget, TasksWidget
+from ayon_core.tools.utils import FoldersWidget, TasksWidget


 class CreateSelectionModel(object):
--- a/client/ayon_core/tools/publisher/widgets/folders_dialog.py
+++ b/client/ayon_core/tools/publisher/widgets/folders_dialog.py
@ -1,8 +1,7 @@
 from qtpy import QtWidgets, QtCore, QtGui

 from ayon_core.lib.events import QueuedEventSystem
-from ayon_core.tools.ayon_utils.widgets import FoldersWidget
-from ayon_core.tools.utils import PlaceholderLineEdit
+from ayon_core.tools.utils import PlaceholderLineEdit, FoldersWidget


 class FoldersDialogController:
--- a/client/ayon_core/tools/publisher/widgets/tasks_model.py
+++ b/client/ayon_core/tools/publisher/widgets/tasks_model.py
@ -1,6 +1,7 @@
 from qtpy import QtWidgets, QtCore, QtGui

-from ayon_core.tools.utils.lib import get_default_task_icon
+from ayon_core.style import get_default_entity_icon_color
+from ayon_core.tools.utils import get_qt_icon

 TASK_NAME_ROLE = QtCore.Qt.UserRole + 1
 TASK_TYPE_ROLE = QtCore.Qt.UserRole + 2
@ -121,6 +122,11 @@ class TasksModel(QtGui.QStandardItemModel):
                item = self._items_by_name.pop(task_name)
                root_item.removeRow(item.row())

+        icon = get_qt_icon({
+            "type": "awesome-font",
+            "name": "fa.male",
+            "color": get_default_entity_icon_color(),
+        })
        new_items = []
        for task_name in new_task_names:
            if task_name in self._items_by_name:
@ -129,7 +135,7 @@ class TasksModel(QtGui.QStandardItemModel):
            item = QtGui.QStandardItem(task_name)
            item.setData(task_name, TASK_NAME_ROLE)
            if task_name:
-                item.setData(get_default_task_icon(), QtCore.Qt.DecorationRole)
+                item.setData(icon, QtCore.Qt.DecorationRole)
            self._items_by_name[task_name] = item
            new_items.append(item)

--- a/client/ayon_core/tools/push_to_project/ui/window.py
+++ b/client/ayon_core/tools/push_to_project/ui/window.py
@ -5,8 +5,6 @@ from ayon_core.tools.utils import (
    PlaceholderLineEdit,
    SeparatorWidget,
    set_style_property,
-)
-from ayon_core.tools.ayon_utils.widgets import (
    ProjectsCombobox,
    FoldersWidget,
    TasksWidget,
--- a/client/ayon_core/tools/sceneinventory/model.py
+++ b/client/ayon_core/tools/sceneinventory/model.py
@ -13,8 +13,8 @@ from ayon_core.pipeline import (
    HeroVersionType,
 )
 from ayon_core.style import get_default_entity_icon_color
+from ayon_core.tools.utils import get_qt_icon
 from ayon_core.tools.utils.models import TreeModel, Item
-from ayon_core.tools.ayon_utils.widgets import get_qt_icon


 def walk_hierarchy(node):
--- a/client/ayon_core/tools/sceneinventory/switch_dialog/folders_input.py
+++ b/client/ayon_core/tools/sceneinventory/switch_dialog/folders_input.py
@ -5,8 +5,8 @@ from ayon_core.tools.utils import (
    PlaceholderLineEdit,
    BaseClickableFrame,
    set_style_property,
+    FoldersWidget,
 )
-from ayon_core.tools.ayon_utils.widgets import FoldersWidget

 NOT_SET = object()

--- a/client/ayon_core/tools/traypublisher/window.py
+++ b/client/ayon_core/tools/traypublisher/window.py
@ -16,9 +16,10 @@ from ayon_core.pipeline import install_host
 from ayon_core.hosts.traypublisher.api import TrayPublisherHost
 from ayon_core.tools.publisher.control_qt import QtPublisherController
 from ayon_core.tools.publisher.window import PublisherWindow
-from ayon_core.tools.utils import PlaceholderLineEdit, get_ayon_qt_app
 from ayon_core.tools.ayon_utils.models import ProjectsModel
-from ayon_core.tools.ayon_utils.widgets import (
+from ayon_core.tools.utils import (
+    PlaceholderLineEdit,
+    get_ayon_qt_app,
    ProjectsQtModel,
    ProjectSortFilterProxy,
    PROJECT_NAME_ROLE,
--- a/client/ayon_core/tools/workfiles/widgets/window.py
+++ b/client/ayon_core/tools/workfiles/widgets/window.py
@ -6,9 +6,13 @@ from ayon_core.tools.utils import (
    MessageOverlayObject,
 )

-from ayon_core.tools.ayon_utils.widgets import FoldersWidget, TasksWidget
 from ayon_core.tools.workfiles.control import BaseWorkfileController
-from ayon_core.tools.utils import GoToCurrentButton, RefreshButton
+from ayon_core.tools.utils import (
+    GoToCurrentButton,
+    RefreshButton,
+    FoldersWidget,
+    TasksWidget,
+)

 from .side_panel import SidePanelWidget
 from .files_widget import FilesWidget