From 585545c53b1a4b7e4621850bec2c1a3352b14f21 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 6 May 2021 10:13:50 +0200 Subject: [PATCH] moved settings UI files one golder hierarchy level higher --- openpype/tools/settings/local_settings/widgets.py | 2 +- openpype/tools/settings/settings/__init__.py | 6 ++---- openpype/tools/settings/settings/{widgets => }/base.py | 0 .../tools/settings/settings/{widgets => }/categories.py | 0 .../settings/{widgets => }/dict_mutable_widget.py | 0 .../tools/settings/settings/{widgets => }/item_widgets.py | 0 .../settings/settings/{widgets => }/list_item_widget.py | 0 .../settings/settings/{widgets => }/list_strict_widget.py | 0 .../settings/{widgets => }/multiselection_combobox.py | 0 openpype/tools/settings/settings/{widgets => }/tests.py | 0 openpype/tools/settings/settings/{widgets => }/widgets.py | 0 openpype/tools/settings/settings/widgets/__init__.py | 8 -------- openpype/tools/settings/settings/{widgets => }/window.py | 2 +- .../settings/settings/{widgets => }/wrapper_widgets.py | 0 14 files changed, 4 insertions(+), 14 deletions(-) rename openpype/tools/settings/settings/{widgets => }/base.py (100%) rename openpype/tools/settings/settings/{widgets => }/categories.py (100%) rename openpype/tools/settings/settings/{widgets => }/dict_mutable_widget.py (100%) rename openpype/tools/settings/settings/{widgets => }/item_widgets.py (100%) rename openpype/tools/settings/settings/{widgets => }/list_item_widget.py (100%) rename openpype/tools/settings/settings/{widgets => }/list_strict_widget.py (100%) rename openpype/tools/settings/settings/{widgets => }/multiselection_combobox.py (100%) rename openpype/tools/settings/settings/{widgets => }/tests.py (100%) rename openpype/tools/settings/settings/{widgets => }/widgets.py (100%) delete mode 100644 openpype/tools/settings/settings/widgets/__init__.py rename openpype/tools/settings/settings/{widgets => }/window.py (99%) rename openpype/tools/settings/settings/{widgets => }/wrapper_widgets.py (100%) diff --git a/openpype/tools/settings/local_settings/widgets.py b/openpype/tools/settings/local_settings/widgets.py index a262188906..b164f1b407 100644 --- a/openpype/tools/settings/local_settings/widgets.py +++ b/openpype/tools/settings/local_settings/widgets.py @@ -1,5 +1,5 @@ from Qt import QtWidgets, QtCore -from openpype.tools.settings.settings.widgets.widgets import ( +from openpype.tools.settings.settings.widgets import ( ExpandingWidget, SpacerWidget ) diff --git a/openpype/tools/settings/settings/__init__.py b/openpype/tools/settings/settings/__init__.py index 3c12a73639..6b4cf94357 100644 --- a/openpype/tools/settings/settings/__init__.py +++ b/openpype/tools/settings/settings/__init__.py @@ -1,8 +1,6 @@ from . import style -from .widgets import ( - MainWidget, - ProjectListWidget -) +from .window import MainWidget +from .widgets import ProjectListWidget __all__ = ( diff --git a/openpype/tools/settings/settings/widgets/base.py b/openpype/tools/settings/settings/base.py similarity index 100% rename from openpype/tools/settings/settings/widgets/base.py rename to openpype/tools/settings/settings/base.py diff --git a/openpype/tools/settings/settings/widgets/categories.py b/openpype/tools/settings/settings/categories.py similarity index 100% rename from openpype/tools/settings/settings/widgets/categories.py rename to openpype/tools/settings/settings/categories.py diff --git a/openpype/tools/settings/settings/widgets/dict_mutable_widget.py b/openpype/tools/settings/settings/dict_mutable_widget.py similarity index 100% rename from openpype/tools/settings/settings/widgets/dict_mutable_widget.py rename to openpype/tools/settings/settings/dict_mutable_widget.py diff --git a/openpype/tools/settings/settings/widgets/item_widgets.py b/openpype/tools/settings/settings/item_widgets.py similarity index 100% rename from openpype/tools/settings/settings/widgets/item_widgets.py rename to openpype/tools/settings/settings/item_widgets.py diff --git a/openpype/tools/settings/settings/widgets/list_item_widget.py b/openpype/tools/settings/settings/list_item_widget.py similarity index 100% rename from openpype/tools/settings/settings/widgets/list_item_widget.py rename to openpype/tools/settings/settings/list_item_widget.py diff --git a/openpype/tools/settings/settings/widgets/list_strict_widget.py b/openpype/tools/settings/settings/list_strict_widget.py similarity index 100% rename from openpype/tools/settings/settings/widgets/list_strict_widget.py rename to openpype/tools/settings/settings/list_strict_widget.py diff --git a/openpype/tools/settings/settings/widgets/multiselection_combobox.py b/openpype/tools/settings/settings/multiselection_combobox.py similarity index 100% rename from openpype/tools/settings/settings/widgets/multiselection_combobox.py rename to openpype/tools/settings/settings/multiselection_combobox.py diff --git a/openpype/tools/settings/settings/widgets/tests.py b/openpype/tools/settings/settings/tests.py similarity index 100% rename from openpype/tools/settings/settings/widgets/tests.py rename to openpype/tools/settings/settings/tests.py diff --git a/openpype/tools/settings/settings/widgets/widgets.py b/openpype/tools/settings/settings/widgets.py similarity index 100% rename from openpype/tools/settings/settings/widgets/widgets.py rename to openpype/tools/settings/settings/widgets.py diff --git a/openpype/tools/settings/settings/widgets/__init__.py b/openpype/tools/settings/settings/widgets/__init__.py deleted file mode 100644 index c9fec16f6e..0000000000 --- a/openpype/tools/settings/settings/widgets/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -from .window import MainWidget -from .widgets import ProjectListWidget - - -__all__ = [ - "MainWidget", - "ProjectListWidget" -] diff --git a/openpype/tools/settings/settings/widgets/window.py b/openpype/tools/settings/settings/window.py similarity index 99% rename from openpype/tools/settings/settings/widgets/window.py rename to openpype/tools/settings/settings/window.py index 495f909e51..9b368588c3 100644 --- a/openpype/tools/settings/settings/widgets/window.py +++ b/openpype/tools/settings/settings/window.py @@ -5,7 +5,7 @@ from .categories import ( ProjectWidget ) from .widgets import ShadowWidget -from .. import style +from . import style from openpype.tools.settings import ( is_password_required, diff --git a/openpype/tools/settings/settings/widgets/wrapper_widgets.py b/openpype/tools/settings/settings/wrapper_widgets.py similarity index 100% rename from openpype/tools/settings/settings/widgets/wrapper_widgets.py rename to openpype/tools/settings/settings/wrapper_widgets.py