From b36c501824b5c23ffe9f3d587e7d05989a3ecddd Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 6 May 2021 10:11:52 +0200 Subject: [PATCH] CHILD_OFFSET and BTN_FIXED_SIZE are defined at top of settings tool --- openpype/tools/settings/__init__.py | 10 +++++++++- openpype/tools/settings/lib.py | 4 ++++ openpype/tools/settings/local_settings/apps_widget.py | 2 +- openpype/tools/settings/local_settings/constants.py | 2 -- openpype/tools/settings/local_settings/window.py | 2 +- openpype/tools/settings/settings/widgets/base.py | 2 +- .../settings/settings/widgets/dict_mutable_widget.py | 2 +- .../tools/settings/settings/widgets/item_widgets.py | 2 +- openpype/tools/settings/settings/widgets/lib.py | 2 -- .../settings/settings/widgets/list_item_widget.py | 2 +- .../tools/settings/settings/widgets/wrapper_widgets.py | 2 +- 11 files changed, 20 insertions(+), 12 deletions(-) diff --git a/openpype/tools/settings/__init__.py b/openpype/tools/settings/__init__.py index 547f4097a2..8f60276cc4 100644 --- a/openpype/tools/settings/__init__.py +++ b/openpype/tools/settings/__init__.py @@ -1,6 +1,10 @@ import sys from Qt import QtWidgets, QtGui -from .lib import is_password_required +from .lib import ( + is_password_required, + BTN_FIXED_SIZE, + CHILD_OFFSET +) from .widgets import PasswordDialog from .local_settings import LocalSettingsWindow from .settings import ( @@ -32,7 +36,11 @@ def main(user_role=None): __all__ = ( "is_password_required", + "BTN_FIXED_SIZE", + "CHILD_OFFSET", + "style", + "PasswordDialog", "MainWidget", "ProjectListWidget", diff --git a/openpype/tools/settings/lib.py b/openpype/tools/settings/lib.py index 0317941021..4b48746a18 100644 --- a/openpype/tools/settings/lib.py +++ b/openpype/tools/settings/lib.py @@ -1,3 +1,7 @@ +CHILD_OFFSET = 15 +BTN_FIXED_SIZE = 20 + + def is_password_required(): from openpype.settings import ( get_system_settings, diff --git a/openpype/tools/settings/local_settings/apps_widget.py b/openpype/tools/settings/local_settings/apps_widget.py index 2e12c010d1..5f4e5dd1c5 100644 --- a/openpype/tools/settings/local_settings/apps_widget.py +++ b/openpype/tools/settings/local_settings/apps_widget.py @@ -4,7 +4,7 @@ from .widgets import ( Separator, ExpandingWidget ) -from .constants import CHILD_OFFSET +from openpype.tools.settings import CHILD_OFFSET class AppVariantWidget(QtWidgets.QWidget): diff --git a/openpype/tools/settings/local_settings/constants.py b/openpype/tools/settings/local_settings/constants.py index 83c45afba8..7a8774467f 100644 --- a/openpype/tools/settings/local_settings/constants.py +++ b/openpype/tools/settings/local_settings/constants.py @@ -14,8 +14,6 @@ LOCAL_APPS_KEY = "applications" # Roots key constant LOCAL_ROOTS_KEY = "roots" -# Child offset in expandable widget -CHILD_OFFSET = 15 __all__ = ( "LABEL_REMOVE_DEFAULT", diff --git a/openpype/tools/settings/local_settings/window.py b/openpype/tools/settings/local_settings/window.py index e117e7fa5d..69562d0b1f 100644 --- a/openpype/tools/settings/local_settings/window.py +++ b/openpype/tools/settings/local_settings/window.py @@ -7,6 +7,7 @@ from openpype.settings.lib import ( get_local_settings, save_local_settings ) +from openpype.tools.settings import CHILD_OFFSET from openpype.api import ( SystemSettings, ProjectSettings @@ -23,7 +24,6 @@ from .apps_widget import LocalApplicationsWidgets from .projects_widget import ProjectSettingsWidget from .constants import ( - CHILD_OFFSET, LOCAL_GENERAL_KEY, LOCAL_PROJECTS_KEY, LOCAL_APPS_KEY diff --git a/openpype/tools/settings/settings/widgets/base.py b/openpype/tools/settings/settings/widgets/base.py index 3d633a100e..03f920b7dc 100644 --- a/openpype/tools/settings/settings/widgets/base.py +++ b/openpype/tools/settings/settings/widgets/base.py @@ -1,5 +1,5 @@ from Qt import QtWidgets, QtGui, QtCore -from .lib import CHILD_OFFSET +from openpype.tools.settings import CHILD_OFFSET from .widgets import ExpandingWidget diff --git a/openpype/tools/settings/settings/widgets/dict_mutable_widget.py b/openpype/tools/settings/settings/widgets/dict_mutable_widget.py index ff4905c480..d29b72f2fc 100644 --- a/openpype/tools/settings/settings/widgets/dict_mutable_widget.py +++ b/openpype/tools/settings/settings/widgets/dict_mutable_widget.py @@ -8,7 +8,7 @@ from .widgets import ( IconButton, SpacerWidget ) -from .lib import ( +from openpype.tools.settings import ( BTN_FIXED_SIZE, CHILD_OFFSET ) diff --git a/openpype/tools/settings/settings/widgets/item_widgets.py b/openpype/tools/settings/settings/widgets/item_widgets.py index c962219f2b..11ccb60ae4 100644 --- a/openpype/tools/settings/settings/widgets/item_widgets.py +++ b/openpype/tools/settings/settings/widgets/item_widgets.py @@ -19,7 +19,7 @@ from .base import ( BaseWidget, InputWidget ) -from .lib import CHILD_OFFSET +from openpype.tools.settings import CHILD_OFFSET class DictImmutableKeysWidget(BaseWidget): diff --git a/openpype/tools/settings/settings/widgets/lib.py b/openpype/tools/settings/settings/widgets/lib.py index aeca943617..67461cb7f3 100644 --- a/openpype/tools/settings/settings/widgets/lib.py +++ b/openpype/tools/settings/settings/widgets/lib.py @@ -18,8 +18,6 @@ class TypeToKlass: NOT_SET = type("NOT_SET", (), {"__bool__": lambda obj: False})() METADATA_KEY = type("METADATA_KEY", (), {})() OVERRIDE_VERSION = 1 -CHILD_OFFSET = 15 -BTN_FIXED_SIZE = 20 key_pattern = re.compile(r"(\{.*?[^{0]*\})") diff --git a/openpype/tools/settings/settings/widgets/list_item_widget.py b/openpype/tools/settings/settings/widgets/list_item_widget.py index 699669abab..e1990d0bf6 100644 --- a/openpype/tools/settings/settings/widgets/list_item_widget.py +++ b/openpype/tools/settings/settings/widgets/list_item_widget.py @@ -2,7 +2,7 @@ from Qt import QtWidgets, QtCore from .base import InputWidget from .widgets import ExpandingWidget -from .lib import ( +from openpype.tools.settings import ( BTN_FIXED_SIZE, CHILD_OFFSET ) diff --git a/openpype/tools/settings/settings/widgets/wrapper_widgets.py b/openpype/tools/settings/settings/widgets/wrapper_widgets.py index 9d5fdeb213..915a2cf875 100644 --- a/openpype/tools/settings/settings/widgets/wrapper_widgets.py +++ b/openpype/tools/settings/settings/widgets/wrapper_widgets.py @@ -5,7 +5,7 @@ from .widgets import ( ExpandingWidget, GridLabelWidget ) -from .lib import CHILD_OFFSET +from openpype.tools.settings import CHILD_OFFSET class WrapperWidget(QtWidgets.QWidget):