From 4a51c7ca47c5422c02cb0af5f637cff4f5f1d6aa Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 7 Feb 2024 11:58:28 +0100 Subject: [PATCH] move some widgets to tools/utils --- client/ayon_core/tools/attribute_defs/widgets.py | 2 +- .../publisher/publish_report_viewer/widgets.py | 2 +- .../tools/publisher/widgets/card_view_widgets.py | 2 +- .../tools/publisher/widgets/list_view_widgets.py | 2 +- client/ayon_core/tools/utils/__init__.py | 6 ++++++ .../utils}/color_widgets/__init__.py | 0 .../utils}/color_widgets/color_inputs.py | 0 .../utils}/color_widgets/color_picker_widget.py | 0 .../utils}/color_widgets/color_screen_pick.py | 0 .../utils}/color_widgets/color_triangle.py | 0 .../utils}/color_widgets/color_view.py | 0 .../utils}/color_widgets/eyedropper.png | Bin .../{widgets => tools/utils}/nice_checkbox.py | 0 .../ayon_core/{widgets => tools/utils}/sliders.py | 0 14 files changed, 10 insertions(+), 4 deletions(-) rename client/ayon_core/{widgets => tools/utils}/color_widgets/__init__.py (100%) rename client/ayon_core/{widgets => tools/utils}/color_widgets/color_inputs.py (100%) rename client/ayon_core/{widgets => tools/utils}/color_widgets/color_picker_widget.py (100%) rename client/ayon_core/{widgets => tools/utils}/color_widgets/color_screen_pick.py (100%) rename client/ayon_core/{widgets => tools/utils}/color_widgets/color_triangle.py (100%) rename client/ayon_core/{widgets => tools/utils}/color_widgets/color_view.py (100%) rename client/ayon_core/{widgets => tools/utils}/color_widgets/eyedropper.png (100%) rename client/ayon_core/{widgets => tools/utils}/nice_checkbox.py (100%) rename client/ayon_core/{widgets => tools/utils}/sliders.py (100%) diff --git a/client/ayon_core/tools/attribute_defs/widgets.py b/client/ayon_core/tools/attribute_defs/widgets.py index 368b186ea0..5ead3f46a6 100644 --- a/client/ayon_core/tools/attribute_defs/widgets.py +++ b/client/ayon_core/tools/attribute_defs/widgets.py @@ -21,7 +21,7 @@ from ayon_core.tools.utils import ( FocusDoubleSpinBox, MultiSelectionComboBox, ) -from ayon_core.widgets.nice_checkbox import NiceCheckbox +from ayon_core.tools.utils import NiceCheckbox from .files_widget import FilesWidget diff --git a/client/ayon_core/tools/publisher/publish_report_viewer/widgets.py b/client/ayon_core/tools/publisher/publish_report_viewer/widgets.py index 110d84f3a5..544d45ce89 100644 --- a/client/ayon_core/tools/publisher/publish_report_viewer/widgets.py +++ b/client/ayon_core/tools/publisher/publish_report_viewer/widgets.py @@ -1,7 +1,7 @@ from math import ceil from qtpy import QtWidgets, QtCore, QtGui -from ayon_core.widgets.nice_checkbox import NiceCheckbox +from ayon_core.tools.utils import NiceCheckbox # from ayon_core.tools.utils import DeselectableTreeView from .constants import ( diff --git a/client/ayon_core/tools/publisher/widgets/card_view_widgets.py b/client/ayon_core/tools/publisher/widgets/card_view_widgets.py index 316bc9fc56..3396110121 100644 --- a/client/ayon_core/tools/publisher/widgets/card_view_widgets.py +++ b/client/ayon_core/tools/publisher/widgets/card_view_widgets.py @@ -25,7 +25,7 @@ import collections from qtpy import QtWidgets, QtCore -from ayon_core.widgets.nice_checkbox import NiceCheckbox +from ayon_core.tools.utils import NiceCheckbox from ayon_core.tools.utils import BaseClickableFrame from ayon_core.tools.utils.lib import html_escape diff --git a/client/ayon_core/tools/publisher/widgets/list_view_widgets.py b/client/ayon_core/tools/publisher/widgets/list_view_widgets.py index 321be27b04..fc76c47334 100644 --- a/client/ayon_core/tools/publisher/widgets/list_view_widgets.py +++ b/client/ayon_core/tools/publisher/widgets/list_view_widgets.py @@ -27,7 +27,7 @@ import collections from qtpy import QtWidgets, QtCore, QtGui from ayon_core.style import get_objected_colors -from ayon_core.widgets.nice_checkbox import NiceCheckbox +from ayon_core.tools.utils import NiceCheckbox from ayon_core.tools.utils.lib import html_escape, checkstate_int_to_enum from .widgets import AbstractInstanceView from ..constants import ( diff --git a/client/ayon_core/tools/utils/__init__.py b/client/ayon_core/tools/utils/__init__.py index a35e02580e..5e1429752e 100644 --- a/client/ayon_core/tools/utils/__init__.py +++ b/client/ayon_core/tools/utils/__init__.py @@ -49,6 +49,8 @@ from .overlay_messages import ( ) from .multiselection_combobox import MultiSelectionComboBox from .thumbnail_paint_widget import ThumbnailPainterWidget +from .sliders import NiceSlider +from .nice_checkbox import NiceCheckbox __all__ = ( @@ -101,4 +103,8 @@ __all__ = ( "MultiSelectionComboBox", "ThumbnailPainterWidget", + + "NiceSlider", + + "NiceCheckbox", ) diff --git a/client/ayon_core/widgets/color_widgets/__init__.py b/client/ayon_core/tools/utils/color_widgets/__init__.py similarity index 100% rename from client/ayon_core/widgets/color_widgets/__init__.py rename to client/ayon_core/tools/utils/color_widgets/__init__.py diff --git a/client/ayon_core/widgets/color_widgets/color_inputs.py b/client/ayon_core/tools/utils/color_widgets/color_inputs.py similarity index 100% rename from client/ayon_core/widgets/color_widgets/color_inputs.py rename to client/ayon_core/tools/utils/color_widgets/color_inputs.py diff --git a/client/ayon_core/widgets/color_widgets/color_picker_widget.py b/client/ayon_core/tools/utils/color_widgets/color_picker_widget.py similarity index 100% rename from client/ayon_core/widgets/color_widgets/color_picker_widget.py rename to client/ayon_core/tools/utils/color_widgets/color_picker_widget.py diff --git a/client/ayon_core/widgets/color_widgets/color_screen_pick.py b/client/ayon_core/tools/utils/color_widgets/color_screen_pick.py similarity index 100% rename from client/ayon_core/widgets/color_widgets/color_screen_pick.py rename to client/ayon_core/tools/utils/color_widgets/color_screen_pick.py diff --git a/client/ayon_core/widgets/color_widgets/color_triangle.py b/client/ayon_core/tools/utils/color_widgets/color_triangle.py similarity index 100% rename from client/ayon_core/widgets/color_widgets/color_triangle.py rename to client/ayon_core/tools/utils/color_widgets/color_triangle.py diff --git a/client/ayon_core/widgets/color_widgets/color_view.py b/client/ayon_core/tools/utils/color_widgets/color_view.py similarity index 100% rename from client/ayon_core/widgets/color_widgets/color_view.py rename to client/ayon_core/tools/utils/color_widgets/color_view.py diff --git a/client/ayon_core/widgets/color_widgets/eyedropper.png b/client/ayon_core/tools/utils/color_widgets/eyedropper.png similarity index 100% rename from client/ayon_core/widgets/color_widgets/eyedropper.png rename to client/ayon_core/tools/utils/color_widgets/eyedropper.png diff --git a/client/ayon_core/widgets/nice_checkbox.py b/client/ayon_core/tools/utils/nice_checkbox.py similarity index 100% rename from client/ayon_core/widgets/nice_checkbox.py rename to client/ayon_core/tools/utils/nice_checkbox.py diff --git a/client/ayon_core/widgets/sliders.py b/client/ayon_core/tools/utils/sliders.py similarity index 100% rename from client/ayon_core/widgets/sliders.py rename to client/ayon_core/tools/utils/sliders.py