From d585450f9917023e382ccd1be44fb33b40011a78 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 16 Dec 2022 17:03:19 +0100 Subject: [PATCH 1/3] use qtpy module in igniter instead of Qt.py --- igniter/__init__.py | 6 +++--- igniter/__main__.py | 3 +-- igniter/install_dialog.py | 4 +--- igniter/install_thread.py | 10 +++++----- igniter/message_dialog.py | 2 +- igniter/nice_progress_bar.py | 2 +- igniter/update_thread.py | 10 +++++----- igniter/update_window.py | 4 +++- 8 files changed, 20 insertions(+), 21 deletions(-) diff --git a/igniter/__init__.py b/igniter/__init__.py index 02cba6a483a..aa1b1d209ea 100644 --- a/igniter/__init__.py +++ b/igniter/__init__.py @@ -24,7 +24,7 @@ def open_dialog(): if os.getenv("OPENPYPE_HEADLESS_MODE"): print("!!! Can't open dialog in headless mode. Exiting.") sys.exit(1) - from Qt import QtWidgets, QtCore + from qtpy import QtWidgets, QtCore from .install_dialog import InstallDialog scale_attr = getattr(QtCore.Qt, "AA_EnableHighDpiScaling", None) @@ -47,7 +47,7 @@ def open_update_window(openpype_version): if os.getenv("OPENPYPE_HEADLESS_MODE"): print("!!! Can't open dialog in headless mode. Exiting.") sys.exit(1) - from Qt import QtWidgets, QtCore + from qtpy import QtWidgets, QtCore from .update_window import UpdateWindow scale_attr = getattr(QtCore.Qt, "AA_EnableHighDpiScaling", None) @@ -71,7 +71,7 @@ def show_message_dialog(title, message): if os.getenv("OPENPYPE_HEADLESS_MODE"): print("!!! Can't open dialog in headless mode. Exiting.") sys.exit(1) - from Qt import QtWidgets, QtCore + from qtpy import QtWidgets, QtCore from .message_dialog import MessageDialog scale_attr = getattr(QtCore.Qt, "AA_EnableHighDpiScaling", None) diff --git a/igniter/__main__.py b/igniter/__main__.py index b453d29d5f0..9783b20f499 100644 --- a/igniter/__main__.py +++ b/igniter/__main__.py @@ -2,8 +2,7 @@ """Open install dialog.""" import sys -from Qt import QtWidgets # noqa -from Qt.QtCore import Signal # noqa +from qtpy import QtWidgets from .install_dialog import InstallDialog diff --git a/igniter/install_dialog.py b/igniter/install_dialog.py index 65ddd58735a..551e2da9187 100644 --- a/igniter/install_dialog.py +++ b/igniter/install_dialog.py @@ -5,9 +5,7 @@ import re import collections -from Qt import QtCore, QtGui, QtWidgets # noqa -from Qt.QtGui import QValidator # noqa -from Qt.QtCore import QTimer # noqa +from qtpy import QtCore, QtGui, QtWidgets from .install_thread import InstallThread from .tools import ( diff --git a/igniter/install_thread.py b/igniter/install_thread.py index 3c9abece65b..70164198299 100644 --- a/igniter/install_thread.py +++ b/igniter/install_thread.py @@ -4,7 +4,7 @@ import sys from pathlib import Path -from Qt.QtCore import QThread, Signal, QObject # noqa +from qtpy import QtCore from .bootstrap_repos import ( BootstrapRepos, @@ -17,7 +17,7 @@ from .tools import validate_mongo_connection -class InstallThread(QThread): +class InstallThread(QtCore.QThread): """Install Worker thread. This class takes care of finding OpenPype version on user entered path @@ -28,14 +28,14 @@ class InstallThread(QThread): user data dir. """ - progress = Signal(int) - message = Signal((str, bool)) + progress = QtCore.Signal(int) + message = QtCore.Signal((str, bool)) def __init__(self, parent=None,): self._mongo = None self._result = None - QThread.__init__(self, parent) + super().__init__(self, parent) def result(self): """Result of finished installation.""" diff --git a/igniter/message_dialog.py b/igniter/message_dialog.py index c8e875cc37e..a2a8bce3a21 100644 --- a/igniter/message_dialog.py +++ b/igniter/message_dialog.py @@ -1,4 +1,4 @@ -from Qt import QtWidgets, QtGui +from qtpy import QtWidgets, QtGui from .tools import ( load_stylesheet, diff --git a/igniter/nice_progress_bar.py b/igniter/nice_progress_bar.py index 47d695a101c..ee16d108d41 100644 --- a/igniter/nice_progress_bar.py +++ b/igniter/nice_progress_bar.py @@ -1,4 +1,4 @@ -from Qt import QtCore, QtGui, QtWidgets # noqa +from qtpy import QtWidgets class NiceProgressBar(QtWidgets.QProgressBar): diff --git a/igniter/update_thread.py b/igniter/update_thread.py index f4fc729faf6..e98c95f8923 100644 --- a/igniter/update_thread.py +++ b/igniter/update_thread.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Working thread for update.""" -from Qt.QtCore import QThread, Signal, QObject # noqa +from qtpy import QtCore from .bootstrap_repos import ( BootstrapRepos, @@ -8,7 +8,7 @@ ) -class UpdateThread(QThread): +class UpdateThread(QtCore.QThread): """Install Worker thread. This class takes care of finding OpenPype version on user entered path @@ -19,13 +19,13 @@ class UpdateThread(QThread): user data dir. """ - progress = Signal(int) - message = Signal((str, bool)) + progress = QtCore.Signal(int) + message = QtCore.Signal((str, bool)) def __init__(self, parent=None): self._result = None self._openpype_version = None - QThread.__init__(self, parent) + super().__init__(parent) def set_version(self, openpype_version: OpenPypeVersion): self._openpype_version = openpype_version diff --git a/igniter/update_window.py b/igniter/update_window.py index d7908c240be..9cf4abf2445 100644 --- a/igniter/update_window.py +++ b/igniter/update_window.py @@ -1,8 +1,10 @@ # -*- coding: utf-8 -*- """Progress window to show when OpenPype is updating/installing locally.""" import os + +from qtpy import QtCore, QtGui, QtWidgets + from .update_thread import UpdateThread -from Qt import QtCore, QtGui, QtWidgets # noqa from .bootstrap_repos import OpenPypeVersion from .nice_progress_bar import NiceProgressBar from .tools import load_stylesheet From f8cf45dfbc72487c30832d9bc1f4892f65a0de25 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 16 Dec 2022 17:03:54 +0100 Subject: [PATCH 2/3] added qtpy to install_requires --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index eab0187983f..ab6e22bcccd 100644 --- a/setup.py +++ b/setup.py @@ -98,6 +98,7 @@ def validate_thirdparty_binaries(): "jinxed", "blessed", "Qt", + "qtpy", "speedcopy", "googleapiclient", "httplib2", From 07e14f968897e34f38f41eb694f7787fb4d0b18c Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 16 Dec 2022 17:45:27 +0100 Subject: [PATCH 3/3] fix super init call --- igniter/install_thread.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/igniter/install_thread.py b/igniter/install_thread.py index 70164198299..4723e6adfb8 100644 --- a/igniter/install_thread.py +++ b/igniter/install_thread.py @@ -35,7 +35,7 @@ def __init__(self, parent=None,): self._mongo = None self._result = None - super().__init__(self, parent) + super().__init__(parent) def result(self): """Result of finished installation."""