Start switching from PyQt5 to PySide2

This commit is contained in:
Micah Lee 2020-10-26 14:52:45 -07:00
parent 71fff406d2
commit 31b63e5471
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
9 changed files with 24 additions and 24 deletions

View file

@ -5,10 +5,10 @@
Install dependencies: Install dependencies:
```sh ```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: Run from source tree:

View file

@ -1,8 +1,8 @@
from PyQt5 import QtCore, QtGui, QtWidgets from PySide2 import QtCore, QtGui, QtWidgets
class DocSelectionWidget(QtWidgets.QWidget): class DocSelectionWidget(QtWidgets.QWidget):
document_selected = QtCore.pyqtSignal() document_selected = QtCore.Signal()
def __init__(self, common): def __init__(self, common):
super(DocSelectionWidget, self).__init__() super(DocSelectionWidget, self).__init__()

View file

@ -6,7 +6,7 @@ import subprocess
import shutil import shutil
import time import time
import platform import platform
from PyQt5 import QtCore, QtGui, QtWidgets from PySide2 import QtCore, QtGui, QtWidgets
from .container import container_runtime from .container import container_runtime
@ -194,9 +194,9 @@ class DockerInstaller(QtWidgets.QDialog):
class Downloader(QtCore.QThread): class Downloader(QtCore.QThread):
download_finished = QtCore.pyqtSignal() download_finished = QtCore.Signal()
download_failed = QtCore.pyqtSignal(int) download_failed = QtCore.Signal(int)
update_progress = QtCore.pyqtSignal(int, int) update_progress = QtCore.Signal(int, int)
def __init__(self, installer_filename): def __init__(self, installer_filename):
super(Downloader, self).__init__() super(Downloader, self).__init__()

View file

@ -7,7 +7,7 @@ import platform
import subprocess import subprocess
import shlex import shlex
import pipes import pipes
from PyQt5 import QtCore, QtGui, QtWidgets from PySide2 import QtCore, QtGui, QtWidgets
if platform.system() == "Darwin": if platform.system() == "Darwin":
import CoreServices import CoreServices

View file

@ -1,4 +1,3 @@
from PyQt5 import QtCore, QtWidgets
import os import os
import sys import sys
import signal import signal
@ -7,6 +6,7 @@ import click
import time import time
import uuid import uuid
import subprocess import subprocess
from PySide2 import QtCore, QtWidgets
from .global_common import GlobalCommon from .global_common import GlobalCommon
from .main_window import MainWindow from .main_window import MainWindow
@ -21,8 +21,8 @@ from .container import container_runtime
class Application(QtWidgets.QApplication): class Application(QtWidgets.QApplication):
document_selected = QtCore.pyqtSignal(str) document_selected = QtCore.Signal(str)
application_activated = QtCore.pyqtSignal() application_activated = QtCore.Signal()
def __init__(self): def __init__(self):
QtWidgets.QApplication.__init__(self, sys.argv) QtWidgets.QApplication.__init__(self, sys.argv)

View file

@ -1,7 +1,7 @@
import shutil import shutil
import os import os
import platform import platform
from PyQt5 import QtCore, QtGui, QtWidgets from PySide2 import QtCore, QtGui, QtWidgets
from .doc_selection_widget import DocSelectionWidget from .doc_selection_widget import DocSelectionWidget
from .settings_widget import SettingsWidget from .settings_widget import SettingsWidget
@ -10,7 +10,7 @@ from .common import Common
class MainWindow(QtWidgets.QMainWindow): class MainWindow(QtWidgets.QMainWindow):
delete_window = QtCore.pyqtSignal(str) delete_window = QtCore.Signal(str)
def __init__(self, global_common, window_id): def __init__(self, global_common, window_id):
super(MainWindow, self).__init__() super(MainWindow, self).__init__()

View file

@ -1,12 +1,12 @@
import os import os
import subprocess import subprocess
import platform import platform
from PyQt5 import QtCore, QtGui, QtWidgets from PySide2 import QtCore, QtGui, QtWidgets
class SettingsWidget(QtWidgets.QWidget): class SettingsWidget(QtWidgets.QWidget):
start_clicked = QtCore.pyqtSignal() start_clicked = QtCore.Signal()
close_window = QtCore.pyqtSignal() close_window = QtCore.Signal()
def __init__(self, global_common, common): def __init__(self, global_common, common):
super(SettingsWidget, self).__init__() super(SettingsWidget, self).__init__()

View file

@ -3,15 +3,15 @@ import time
import os import os
import pipes import pipes
import platform import platform
from PyQt5 import QtCore, QtWidgets, QtGui from PySide2 import QtCore, QtWidgets, QtGui
from termcolor import cprint from termcolor import cprint
class TaskBase(QtCore.QThread): class TaskBase(QtCore.QThread):
task_finished = QtCore.pyqtSignal() task_finished = QtCore.Signal()
task_failed = QtCore.pyqtSignal(str) task_failed = QtCore.Signal(str)
update_label = QtCore.pyqtSignal(str) update_label = QtCore.Signal(str)
update_details = QtCore.pyqtSignal(str) update_details = QtCore.Signal(str)
def __init__(self): def __init__(self):
super(TaskBase, self).__init__() super(TaskBase, self).__init__()

View file

@ -3,13 +3,13 @@ import tempfile
import os import os
import platform import platform
import subprocess import subprocess
from PyQt5 import QtCore, QtGui, QtWidgets from PySide2 import QtCore, QtGui, QtWidgets
from .tasks import PullImageTask, ConvertToPixels, ConvertToPDF from .tasks import PullImageTask, ConvertToPixels, ConvertToPDF
class TasksWidget(QtWidgets.QWidget): class TasksWidget(QtWidgets.QWidget):
close_window = QtCore.pyqtSignal() close_window = QtCore.Signal()
def __init__(self, global_common, common): def __init__(self, global_common, common):
super(TasksWidget, self).__init__() super(TasksWidget, self).__init__()