From 31b63e547156870a969a5744e297b0460bb6e009 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Mon, 26 Oct 2020 14:52:45 -0700 Subject: [PATCH] Start switching from PyQt5 to PySide2 --- BUILD.md | 4 ++-- dangerzone/doc_selection_widget.py | 4 ++-- dangerzone/docker_installer.py | 8 ++++---- dangerzone/global_common.py | 2 +- dangerzone/gui.py | 6 +++--- dangerzone/main_window.py | 4 ++-- dangerzone/settings_widget.py | 6 +++--- dangerzone/tasks.py | 10 +++++----- dangerzone/tasks_widget.py | 4 ++-- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/BUILD.md b/BUILD.md index bf8971d..87c9c7b 100644 --- a/BUILD.md +++ b/BUILD.md @@ -5,10 +5,10 @@ Install dependencies: ```sh -sudo apt install -y python-all dh-python python3-stdeb python3 python3-pyqt5 python3-appdirs python3-click python3-xdg python3-requests python3-termcolor +sudo apt install -y python3 python3-stdeb python3-pyside2.qtcore python3-pyside2.qtgui python3-pyside2.qtwidgets python3-appdirs python3-click python3-xdg python3-requests python3-termcolor ``` -You also need docker, either by installing the `docker.io` package, or by installing `docker-ce` by following [these instructions for Ubuntu](https://docs.docker.com/install/linux/docker-ce/ubuntu/) or [for Debian](https://docs.docker.com/install/linux/docker-ce/debian/). +You also need docker, either by installing the `docker.io` package, or by installing `docker-ce` by following [these instructions for Ubuntu](https://docs.docker.com/install/linux/docker-ce/ubuntu/) or [for Debian](https://docs.docker.com/install/linux/docker-ce/debian/), or installing the [Docker snap package](https://snapcraft.io/docker). Run from source tree: diff --git a/dangerzone/doc_selection_widget.py b/dangerzone/doc_selection_widget.py index 5609135..c7d8506 100644 --- a/dangerzone/doc_selection_widget.py +++ b/dangerzone/doc_selection_widget.py @@ -1,8 +1,8 @@ -from PyQt5 import QtCore, QtGui, QtWidgets +from PySide2 import QtCore, QtGui, QtWidgets class DocSelectionWidget(QtWidgets.QWidget): - document_selected = QtCore.pyqtSignal() + document_selected = QtCore.Signal() def __init__(self, common): super(DocSelectionWidget, self).__init__() diff --git a/dangerzone/docker_installer.py b/dangerzone/docker_installer.py index 6a7596d..6398631 100644 --- a/dangerzone/docker_installer.py +++ b/dangerzone/docker_installer.py @@ -6,7 +6,7 @@ import subprocess import shutil import time import platform -from PyQt5 import QtCore, QtGui, QtWidgets +from PySide2 import QtCore, QtGui, QtWidgets from .container import container_runtime @@ -194,9 +194,9 @@ class DockerInstaller(QtWidgets.QDialog): class Downloader(QtCore.QThread): - download_finished = QtCore.pyqtSignal() - download_failed = QtCore.pyqtSignal(int) - update_progress = QtCore.pyqtSignal(int, int) + download_finished = QtCore.Signal() + download_failed = QtCore.Signal(int) + update_progress = QtCore.Signal(int, int) def __init__(self, installer_filename): super(Downloader, self).__init__() diff --git a/dangerzone/global_common.py b/dangerzone/global_common.py index ab88d14..0e4aa54 100644 --- a/dangerzone/global_common.py +++ b/dangerzone/global_common.py @@ -7,7 +7,7 @@ import platform import subprocess import shlex import pipes -from PyQt5 import QtCore, QtGui, QtWidgets +from PySide2 import QtCore, QtGui, QtWidgets if platform.system() == "Darwin": import CoreServices diff --git a/dangerzone/gui.py b/dangerzone/gui.py index ec83a1e..60602b7 100644 --- a/dangerzone/gui.py +++ b/dangerzone/gui.py @@ -1,4 +1,3 @@ -from PyQt5 import QtCore, QtWidgets import os import sys import signal @@ -7,6 +6,7 @@ import click import time import uuid import subprocess +from PySide2 import QtCore, QtWidgets from .global_common import GlobalCommon from .main_window import MainWindow @@ -21,8 +21,8 @@ from .container import container_runtime class Application(QtWidgets.QApplication): - document_selected = QtCore.pyqtSignal(str) - application_activated = QtCore.pyqtSignal() + document_selected = QtCore.Signal(str) + application_activated = QtCore.Signal() def __init__(self): QtWidgets.QApplication.__init__(self, sys.argv) diff --git a/dangerzone/main_window.py b/dangerzone/main_window.py index 38789d9..209af08 100644 --- a/dangerzone/main_window.py +++ b/dangerzone/main_window.py @@ -1,7 +1,7 @@ import shutil import os import platform -from PyQt5 import QtCore, QtGui, QtWidgets +from PySide2 import QtCore, QtGui, QtWidgets from .doc_selection_widget import DocSelectionWidget from .settings_widget import SettingsWidget @@ -10,7 +10,7 @@ from .common import Common class MainWindow(QtWidgets.QMainWindow): - delete_window = QtCore.pyqtSignal(str) + delete_window = QtCore.Signal(str) def __init__(self, global_common, window_id): super(MainWindow, self).__init__() diff --git a/dangerzone/settings_widget.py b/dangerzone/settings_widget.py index c3cbfc3..22a15e0 100644 --- a/dangerzone/settings_widget.py +++ b/dangerzone/settings_widget.py @@ -1,12 +1,12 @@ import os import subprocess import platform -from PyQt5 import QtCore, QtGui, QtWidgets +from PySide2 import QtCore, QtGui, QtWidgets class SettingsWidget(QtWidgets.QWidget): - start_clicked = QtCore.pyqtSignal() - close_window = QtCore.pyqtSignal() + start_clicked = QtCore.Signal() + close_window = QtCore.Signal() def __init__(self, global_common, common): super(SettingsWidget, self).__init__() diff --git a/dangerzone/tasks.py b/dangerzone/tasks.py index e19f459..bf950a3 100644 --- a/dangerzone/tasks.py +++ b/dangerzone/tasks.py @@ -3,15 +3,15 @@ import time import os import pipes import platform -from PyQt5 import QtCore, QtWidgets, QtGui +from PySide2 import QtCore, QtWidgets, QtGui from termcolor import cprint class TaskBase(QtCore.QThread): - task_finished = QtCore.pyqtSignal() - task_failed = QtCore.pyqtSignal(str) - update_label = QtCore.pyqtSignal(str) - update_details = QtCore.pyqtSignal(str) + task_finished = QtCore.Signal() + task_failed = QtCore.Signal(str) + update_label = QtCore.Signal(str) + update_details = QtCore.Signal(str) def __init__(self): super(TaskBase, self).__init__() diff --git a/dangerzone/tasks_widget.py b/dangerzone/tasks_widget.py index a8436ac..4688d36 100644 --- a/dangerzone/tasks_widget.py +++ b/dangerzone/tasks_widget.py @@ -3,13 +3,13 @@ import tempfile import os import platform import subprocess -from PyQt5 import QtCore, QtGui, QtWidgets +from PySide2 import QtCore, QtGui, QtWidgets from .tasks import PullImageTask, ConvertToPixels, ConvertToPDF class TasksWidget(QtWidgets.QWidget): - close_window = QtCore.pyqtSignal() + close_window = QtCore.Signal() def __init__(self, global_common, common): super(TasksWidget, self).__init__()