From ac8d9865f5902f01ea9d6750b09b82a2995d54dc Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 3 Jun 2021 12:16:39 +0200 Subject: [PATCH] moved password dialog to openpype widgets --- .../resources/images => resources/icons}/eye.png | Bin .../tools/project_manager/project_manager/window.py | 6 ++---- openpype/tools/settings/__init__.py | 2 -- .../tools/settings/local_settings/general_widget.py | 6 ++---- openpype/tools/settings/settings/window.py | 6 ++---- openpype/widgets/__init__.py | 6 ++++++ .../widgets.py => widgets/password_dialog.py} | 4 ++-- 7 files changed, 14 insertions(+), 16 deletions(-) rename openpype/{tools/settings/resources/images => resources/icons}/eye.png (100%) rename openpype/{tools/settings/widgets.py => widgets/password_dialog.py} (98%) diff --git a/openpype/tools/settings/resources/images/eye.png b/openpype/resources/icons/eye.png similarity index 100% rename from openpype/tools/settings/resources/images/eye.png rename to openpype/resources/icons/eye.png diff --git a/openpype/tools/project_manager/project_manager/window.py b/openpype/tools/project_manager/project_manager/window.py index d04d1dd2d1..15da7a37b8 100644 --- a/openpype/tools/project_manager/project_manager/window.py +++ b/openpype/tools/project_manager/project_manager/window.py @@ -11,10 +11,8 @@ from . import ( ) from openpype.style import load_stylesheet from .style import ResourceCache -from openpype.tools.settings import ( - is_password_required, - PasswordDialog -) +from openpype.tools.settings import is_password_required +from openpype.widgets import PasswordDialog from openpype import resources from avalon.api import AvalonMongoDB diff --git a/openpype/tools/settings/__init__.py b/openpype/tools/settings/__init__.py index 1a4752fe54..d94c5497b8 100644 --- a/openpype/tools/settings/__init__.py +++ b/openpype/tools/settings/__init__.py @@ -5,7 +5,6 @@ from .lib import ( BTN_FIXED_SIZE, CHILD_OFFSET ) -from .widgets import PasswordDialog from .local_settings import LocalSettingsWindow from .settings import ( style, @@ -41,7 +40,6 @@ __all__ = ( "style", - "PasswordDialog", "MainWidget", "ProjectListWidget", "LocalSettingsWindow", diff --git a/openpype/tools/settings/local_settings/general_widget.py b/openpype/tools/settings/local_settings/general_widget.py index d01c16ff82..c69824802e 100644 --- a/openpype/tools/settings/local_settings/general_widget.py +++ b/openpype/tools/settings/local_settings/general_widget.py @@ -1,10 +1,8 @@ import getpass from Qt import QtWidgets, QtCore -from openpype.tools.settings import ( - is_password_required, - PasswordDialog -) +from openpype.tools.settings import is_password_required +from openpype.widgets import PasswordDialog class LocalGeneralWidgets(QtWidgets.QWidget): diff --git a/openpype/tools/settings/settings/window.py b/openpype/tools/settings/settings/window.py index bddac7e98b..6c45b60620 100644 --- a/openpype/tools/settings/settings/window.py +++ b/openpype/tools/settings/settings/window.py @@ -7,10 +7,8 @@ from .categories import ( from .widgets import ShadowWidget, RestartDialog from . import style -from openpype.tools.settings import ( - is_password_required, - PasswordDialog -) +from openpype.tools.settings import is_password_required +from openpype.widgets import PasswordDialog class MainWidget(QtWidgets.QWidget): diff --git a/openpype/widgets/__init__.py b/openpype/widgets/__init__.py index e69de29bb2..b0552c7a0d 100644 --- a/openpype/widgets/__init__.py +++ b/openpype/widgets/__init__.py @@ -0,0 +1,6 @@ +from .password_dialog import PasswordDialog + + +__all__ = ( + "PasswordDialog", +) diff --git a/openpype/tools/settings/widgets.py b/openpype/widgets/password_dialog.py similarity index 98% rename from openpype/tools/settings/widgets.py rename to openpype/widgets/password_dialog.py index 5b975edadd..eca925ec5f 100644 --- a/openpype/tools/settings/widgets.py +++ b/openpype/widgets/password_dialog.py @@ -1,6 +1,6 @@ from Qt import QtWidgets, QtCore, QtGui -from .resources import get_resource +from openpype.resources import get_resource from openpype.api import get_system_settings from openpype.settings.lib import ( @@ -62,7 +62,7 @@ class PasswordDialog(QtWidgets.QDialog): password_input = QtWidgets.QLineEdit(password_widget) password_input.setEchoMode(QtWidgets.QLineEdit.Password) - show_password_icon_path = get_resource("images", "eye.png") + show_password_icon_path = get_resource("icons", "eye.png") show_password_icon = QtGui.QIcon(show_password_icon_path) show_password_btn = PressHoverButton(password_widget) show_password_btn.setObjectName("PasswordBtn")