Factor out PySide2

PierreRochard · PierreRochard · commit 0ca26d5c4787 · 2021-09-04T14:49:38.000-05:00
diff --git a/node_launcher/gui/application.py b/node_launcher/gui/application.py
@@ -1,6 +1,15 @@
-from PySide2 import QtCore
-from PySide2.QtCore import QCoreApplication, Slot, QTimer, Qt
-from PySide2.QtWidgets import QApplication, QWidget, QMessageBox
+import sys
+
+from node_launcher.gui.qt import (
+    QtCore,
+    QCoreApplication,
+    Slot,
+    QTimer,
+    Qt,
+    QApplication,
+    QWidget,
+    QMessageBox
+)
 
 from node_launcher.constants import NODE_LAUNCHER_RELEASE, UPGRADE
 from node_launcher.gui.system_tray import SystemTray
@@ -10,7 +19,7 @@
 
 class Application(QApplication):
     def __init__(self):
-        super().__init__()
+        super().__init__(sys.argv)
 
         self.node_set = NodeSet()
         self.parent = QWidget()
diff --git a/node_launcher/gui/components/copy_button.py b/node_launcher/gui/components/copy_button.py
@@ -1,6 +1,4 @@
-from PySide2.QtCore import QTimer
-from PySide2.QtGui import QClipboard
-from PySide2.QtWidgets import QVBoxLayout, QPushButton
+from node_launcher.gui.qt import QTimer, QClipboard, QVBoxLayout, QPushButton
 
 
 class CopyButton(QVBoxLayout):
diff --git a/node_launcher/gui/components/grid_layout.py b/node_launcher/gui/components/grid_layout.py
@@ -1,5 +1,4 @@
-from PySide2 import QtWidgets
-from PySide2.QtWidgets import QWidget
+from node_launcher.gui.qt import QtWidgets, QWidget
 
 
 class QGridLayout(QtWidgets.QGridLayout):
diff --git a/node_launcher/gui/components/horizontal_line.py b/node_launcher/gui/components/horizontal_line.py
@@ -1,4 +1,4 @@
-from PySide2.QtWidgets import QFrame
+from node_launcher.gui.qt import QFrame
 
 
 class HorizontalLine(QFrame):
diff --git a/node_launcher/gui/components/image_label.py b/node_launcher/gui/components/image_label.py
@@ -1,6 +1,4 @@
-from PySide2 import QtWidgets
-from PySide2.QtCore import Qt
-from PySide2.QtGui import QPixmap
+from node_launcher.gui.qt import QtWidgets, Qt, QPixmap
 
 from node_launcher.assets.asset_access import asset_access
 
diff --git a/node_launcher/gui/components/section_name.py b/node_launcher/gui/components/section_name.py
@@ -1,4 +1,4 @@
-from PySide2.QtWidgets import QLabel
+from node_launcher.gui.qt import QLabel
 
 
 class SectionName(QLabel):
diff --git a/node_launcher/gui/components/selectable_text.py b/node_launcher/gui/components/selectable_text.py
@@ -1,5 +1,4 @@
-from PySide2.QtCore import Qt
-from PySide2.QtWidgets import QLabel
+from node_launcher.gui.qt import Qt, QLabel
 
 
 class SelectableText(QLabel):
diff --git a/node_launcher/gui/components/thread_worker.py b/node_launcher/gui/components/thread_worker.py
@@ -1,12 +1,13 @@
 import time
+import traceback
+import sys
 
 import grpc
-from PySide2.QtCore import QRunnable, Slot, QThreadPool, Signal, QObject, QTimer
 
-import traceback, sys
-
-from PySide2.QtWidgets import QMainWindow, QVBoxLayout, QLabel, QPushButton, \
-    QWidget, QApplication
+from node_launcher.gui.qt import (
+    QMainWindow, QVBoxLayout, QLabel, QPushButton,
+    QWidget, QApplication, QRunnable, Slot, QThreadPool, Signal, QObject, QTimer
+)
 
 
 class WorkerSignals(QObject):
diff --git a/node_launcher/gui/components/warning_text.py b/node_launcher/gui/components/warning_text.py
@@ -1,5 +1,4 @@
-from PySide2.QtCore import Qt
-from PySide2.QtWidgets import QLabel
+from node_launcher.gui.qt import QLabel
 
 
 class WarningText(QLabel):
diff --git a/node_launcher/gui/menu.py b/node_launcher/gui/menu.py
@@ -1,6 +1,4 @@
-from PySide2.QtCore import QCoreApplication
-from PySide2.QtGui import QKeySequence, QClipboard
-from PySide2.QtWidgets import QMenu
+from node_launcher.gui.qt import QCoreApplication, QKeySequence, QClipboard, QMenu
 
 from node_launcher.constants import BITCOIN_CLI_COMMANDS, LNCLI_COMMANDS
 from node_launcher.gui.system_tray_widgets import (
diff --git a/node_launcher/gui/qt.py b/node_launcher/gui/qt.py
@@ -0,0 +1,98 @@
+# PyQt5
+from PyQt5 import QtGui, QtWidgets, QtCore
+from PyQt5.QtCore import (
+    QCoreApplication,
+    pyqtSignal as Signal,
+    pyqtSignal as SIGNAL,
+    pyqtSlot as Slot,
+    QTimer,
+    Qt,
+    QProcess,
+    QByteArray,
+    QFileSystemWatcher,
+    QThreadPool,
+    QRunnable,
+    QObject
+)
+from PyQt5.QtWidgets import (
+    QErrorMessage,
+    QApplication,
+    QWidget,
+    QMessageBox,
+    QDialog,
+    QTabWidget,
+    QDialogButtonBox,
+    QVBoxLayout,
+    QFrame,
+    QPushButton,
+    QGridLayout,
+    QGroupBox,
+    QLabel,
+    QFileDialog,
+    QMenu,
+    QTextEdit,
+    QColorDialog,
+    QLineEdit,
+    QSystemTrayIcon,
+    QCheckBox,
+    QCompleter,
+    QMainWindow
+)
+from PyQt5.QtGui import (
+    QPixmap,
+    QClipboard,
+    QFont,
+    QKeySequence,
+    QPalette,
+    QColor,
+    QIcon
+)
+    # # PySide2
+    # from PySide2 import QtGui, QtWidgets, QtCore
+    # from PySide2.QtCore import (
+    #     QCoreApplication,
+    #     Signal,
+    #     Slot,
+    #     QTimer,
+    #     Qt,
+    #     QProcess,
+    #     QByteArray,
+    #     QFileSystemWatcher,
+    #     QThreadPool,
+    #     QRunnable,
+    #     QObject,
+    #     SIGNAL
+    # )
+    # from PySide2.QtWidgets import (
+    #     QErrorMessage,
+    #     QApplication,
+    #     QWidget,
+    #     QMessageBox,
+    #     QDialog,
+    #     QTabWidget,
+    #     QDialogButtonBox,
+    #     QVBoxLayout,
+    #     QFrame,
+    #     QPushButton,
+    #     QGridLayout,
+    #     QGroupBox,
+    #     QLabel,
+    #     QFileDialog,
+    #     QMenu,
+    #     QTextEdit,
+    #     QColorDialog,
+    #     QLineEdit,
+    #     QSystemTrayIcon,
+    #     QCheckBox,
+    #     QCompleter,
+    #     QMainWindow
+    # )
+    # from PySide2.QtGui import (
+    #     QPixmap,
+    #     QClipboard,
+    #     QFont,
+    #     QKeySequence,
+    #     QPalette,
+    #     QColor,
+    #     QIcon
+    # )
diff --git a/node_launcher/gui/system_tray.py b/node_launcher/gui/system_tray.py
@@ -1,5 +1,4 @@
-from PySide2.QtGui import QIcon, QPixmap
-from PySide2.QtWidgets import QSystemTrayIcon, QWidget
+from node_launcher.gui.qt import QIcon, QPixmap, QSystemTrayIcon, QWidget
 
 from node_launcher.assets.asset_access import asset_access
 from node_launcher.gui.menu import Menu
diff --git a/node_launcher/gui/system_tray_widgets/advanced/advanced_widget.py b/node_launcher/gui/system_tray_widgets/advanced/advanced_widget.py
@@ -1,5 +1,4 @@
-from PySide2.QtCore import Qt
-from PySide2.QtWidgets import QWidget
+from node_launcher.gui.qt import Qt, QWidget
 
 from .configuration_files_layout import ConfigurationFilesLayout
 from .ports_layout import PortsLayout
diff --git a/node_launcher/gui/system_tray_widgets/advanced/configuration_files_layout.py b/node_launcher/gui/system_tray_widgets/advanced/configuration_files_layout.py
@@ -1,4 +1,4 @@
-from PySide2 import QtWidgets
+from node_launcher.gui.qt import QtWidgets
 
 from node_launcher.gui.components.grid_layout import QGridLayout
 from node_launcher.gui.components.section_name import SectionName
diff --git a/node_launcher/gui/system_tray_widgets/advanced/tls_layout.py b/node_launcher/gui/system_tray_widgets/advanced/tls_layout.py
@@ -1,6 +1,6 @@
 from pprint import pformat
 
-from PySide2.QtWidgets import QPushButton, QMessageBox
+from node_launcher.gui.qt import QPushButton, QMessageBox
 
 from node_launcher.gui.components.grid_layout import QGridLayout
 from node_launcher.gui.components.section_name import SectionName
diff --git a/node_launcher/gui/system_tray_widgets/advanced/zap_layout.py b/node_launcher/gui/system_tray_widgets/advanced/zap_layout.py
@@ -1,8 +1,6 @@
 import webbrowser
 
-from PySide2 import QtWidgets
-from PySide2.QtGui import QPixmap
-from PySide2.QtWidgets import QLabel
+from node_launcher.gui.qt import QtWidgets, QPixmap, QLabel
 
 from node_launcher.services.lndconnect import get_deprecated_lndconnect_url, \
     get_qrcode_img
diff --git a/node_launcher/gui/system_tray_widgets/bitcoind_output_widget.py b/node_launcher/gui/system_tray_widgets/bitcoind_output_widget.py
@@ -1,7 +1,7 @@
 from datetime import datetime, timedelta
 
 import humanize
-from PySide2.QtCore import QProcess, QThreadPool, Qt
+from node_launcher.gui.qt import QProcess, QThreadPool, Qt
 
 from node_launcher.gui.system_tray_widgets.output_widget import OutputWidget
 from node_launcher.node_set import NodeSet
diff --git a/node_launcher/gui/system_tray_widgets/console_dialog.py b/node_launcher/gui/system_tray_widgets/console_dialog.py
@@ -1,16 +1,18 @@
 from typing import List
 
-from PySide2.QtCore import SIGNAL, QProcess, QByteArray, Qt
-from PySide2.QtWidgets import QTextEdit, QLineEdit, QCompleter, QDialog
 from pygments import highlight
 from pygments.formatters.html import HtmlFormatter
 from pygments.lexers.data import JsonLexer
 
+from node_launcher.gui.qt import (
+    SIGNAL, QProcess, QByteArray, Qt, QTextEdit, QLineEdit, QCompleter, QDialog
+)
 from node_launcher.gui.components.grid_layout import QGridLayout
 from node_launcher.logging import log
 
 
 class ConsoleDialog(QDialog):
+
     def __init__(self, title: str,
                  program: str,
                  args: List[str],
@@ -35,12 +37,8 @@ def __init__(self, title: str,
         self.layout.addWidget(self.output)
         self.layout.addWidget(self.input)
         self.setLayout(self.layout)
-
-        self.connect(self.input, SIGNAL("returnPressed(void)"),
-                     self.execute_user_command)
-
-        self.connect(self.completer, SIGNAL("activated(const QString&)"),
-                     self.input.clear, Qt.QueuedConnection)
+        self.input.returnPressed.connect(self.execute_user_command)
+        self.completer.activated.connect(self.input.clear)
 
     def execute_user_command(self):
         cmd = str(self.input.text())
diff --git a/node_launcher/gui/system_tray_widgets/lnd_output_widget.py b/node_launcher/gui/system_tray_widgets/lnd_output_widget.py
@@ -3,7 +3,7 @@
 # noinspection PyPackageRequirements
 from grpc._channel import _Rendezvous
 import humanize
-from PySide2.QtCore import QThreadPool, Qt, QTimer
+from node_launcher.gui.qt import QThreadPool, Qt, QTimer
 
 from node_launcher.constants import keyring
 from node_launcher.gui.components.thread_worker import Worker
diff --git a/node_launcher/gui/system_tray_widgets/output_widget.py b/node_launcher/gui/system_tray_widgets/output_widget.py
@@ -1,5 +1,4 @@
-from PySide2.QtCore import QByteArray, QProcess
-from PySide2.QtWidgets import QDialog, QGridLayout, QTextEdit
+from node_launcher.gui.qt import QByteArray, QProcess, QDialog, QGridLayout, QTextEdit
 
 from node_launcher.node_set import NodeSet
 
diff --git a/node_launcher/gui/system_tray_widgets/restart_layout.py b/node_launcher/gui/system_tray_widgets/restart_layout.py
@@ -1,4 +1,4 @@
-from PySide2.QtCore import QTimer
+from node_launcher.gui.qt import QTimer
 from node_launcher.gui.components.grid_layout import QGridLayout
 from node_launcher.gui.components.section_name import SectionName
 from node_launcher.node_set import NodeSet
diff --git a/node_launcher/gui/system_tray_widgets/settings/alias_layout.py b/node_launcher/gui/system_tray_widgets/settings/alias_layout.py
@@ -1,6 +1,4 @@
-from PySide2.QtGui import QPalette, QColor
-from PySide2.QtWidgets import QColorDialog, QLineEdit, QLabel, QPushButton
-from PySide2.QtCore import Signal
+from node_launcher.gui.qt import QPalette, QColor, QColorDialog, QLineEdit, QLabel, QPushButton, Signal
 
 from node_launcher.gui.components.grid_layout import QGridLayout
 
diff --git a/node_launcher/gui/system_tray_widgets/settings/bitcoin_tab.py b/node_launcher/gui/system_tray_widgets/settings/bitcoin_tab.py
@@ -1,5 +1,4 @@
-from PySide2.QtCore import Qt, Signal
-from PySide2.QtWidgets import QWidget, QLabel, QCheckBox, QVBoxLayout
+from node_launcher.gui.qt import Qt, Signal, QWidget, QLabel, QCheckBox, QVBoxLayout
 
 from node_launcher.constants import Network
 from .data_directories.data_directory_box import DataDirectoryBox
diff --git a/node_launcher/gui/system_tray_widgets/settings/data_directories/data_directory_box.py b/node_launcher/gui/system_tray_widgets/settings/data_directories/data_directory_box.py
@@ -1,4 +1,4 @@
-from PySide2.QtWidgets import (
+from node_launcher.gui.qt import (
     QGridLayout,
     QGroupBox,
     QPushButton
diff --git a/node_launcher/gui/system_tray_widgets/settings/data_directories/datadir_label.py b/node_launcher/gui/system_tray_widgets/settings/data_directories/datadir_label.py
@@ -1,5 +1,4 @@
-from PySide2.QtCore import Qt
-from PySide2.QtWidgets import QLabel
+from node_launcher.gui.qt import Qt, QLabel
 
 
 class DatadirLabel(QLabel):
diff --git a/node_launcher/gui/system_tray_widgets/settings/data_directories/prune_warning_label.py b/node_launcher/gui/system_tray_widgets/settings/data_directories/prune_warning_label.py
@@ -1,6 +1,4 @@
-from PySide2.QtCore import Qt
-from PySide2.QtGui import QFont
-from PySide2.QtWidgets import QLabel
+from node_launcher.gui.qt import Qt, QFont, QLabel
 
 
 class PruneWarningLabel(QLabel):
diff --git a/node_launcher/gui/system_tray_widgets/settings/data_directories/select_directory_dialog.py b/node_launcher/gui/system_tray_widgets/settings/data_directories/select_directory_dialog.py
@@ -1,7 +1,6 @@
 import os
 
-from PySide2.QtCore import Signal
-from PySide2.QtWidgets import QFileDialog, QWidget, QErrorMessage
+from node_launcher.gui.qt import Signal, QFileDialog, QWidget, QErrorMessage
 
 
 class SelectDirectoryDialog(QFileDialog):
diff --git a/node_launcher/gui/system_tray_widgets/settings/lnd_tab.py b/node_launcher/gui/system_tray_widgets/settings/lnd_tab.py
@@ -1,4 +1,4 @@
-from PySide2.QtWidgets import QWidget
+from node_launcher.gui.qt import QWidget
 
 from node_launcher.gui.components.grid_layout import QGridLayout
 from .alias_layout import AliasLayout
diff --git a/node_launcher/gui/system_tray_widgets/settings/settings_tab_dialog.py b/node_launcher/gui/system_tray_widgets/settings/settings_tab_dialog.py
@@ -1,5 +1,4 @@
-from PySide2.QtCore import Qt
-from PySide2.QtWidgets import QDialog, QTabWidget, QDialogButtonBox, QVBoxLayout
+from node_launcher.gui.qt import Qt, QDialog, QTabWidget, QDialogButtonBox, QVBoxLayout
 
 from .bitcoin_tab import BitcoinTab
 from .lnd_tab import LndTab
diff --git a/node_launcher/gui/utilities.py b/node_launcher/gui/utilities.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from pathlib import Path
-from PySide2.QtWidgets import QErrorMessage
+from node_launcher.gui.qt import QErrorMessage
 
 from node_launcher.constants import IS_MACOS, IS_LINUX, IS_WINDOWS, OPERATING_SYSTEM
 
diff --git a/node_launcher/node_set/bitcoin.py b/node_launcher/node_set/bitcoin.py
@@ -2,7 +2,7 @@
 from typing import List
 
 import psutil
-from PySide2.QtCore import QProcess
+from node_launcher.gui.qt import QProcess
 
 from node_launcher.constants import (BITCOIN_DATA_PATH,
                                      BITCOIN_MAINNET_PEER_PORT,
diff --git a/node_launcher/node_set/lnd.py b/node_launcher/node_set/lnd.py
@@ -3,7 +3,7 @@
 import ssl
 from typing import List
 
-from PySide2.QtCore import QProcess
+from node_launcher.gui.qt import QProcess
 
 from node_launcher.constants import (
     IS_WINDOWS,
diff --git a/node_launcher/services/configuration_file.py b/node_launcher/services/configuration_file.py
diff --git a/node_launcher/utilities/except_hook.py b/node_launcher/utilities/except_hook.py
diff --git a/requirements.txt b/requirements.txt
diff --git a/run-mac.spec b/run-mac.spec
diff --git a/run-windows.spec b/run-windows.spec

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from PySide2.QtWidgets import QFrame`
	`1`	`+from node_launcher.gui.qt import QFrame`
`2`	`2`
`3`	`3`
`4`	`4`	`class HorizontalLine(QFrame):`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from PySide2.QtWidgets import QLabel`
	`1`	`+from node_launcher.gui.qt import QLabel`
`2`	`2`
`3`	`3`
`4`	`4`	`class SectionName(QLabel):`