Skip to content
Snippets Groups Projects
Verified Commit ddc9b95a authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Replace PySide2 by PyQt5

parent 99d55ffc
No related branches found
No related tags found
No related merge requests found
from typing import Optional from typing import Optional
import requests import requests
from PySide2.QtCore import QObject from PyQt5.QtCore import QObject
class APIException(Exception): class APIException(Exception):
......
import os import os
from PySide2.QtCore import QRectF, QSize from PyQt5.QtCore import QRectF, QSize, Qt
from PySide2.QtGui import QImage, QPainter, QPainterPath, QPen, Qt from PyQt5.QtGui import QImage, QPainter, QPainterPath, QPen
from PySide2.QtWidgets import QStyledItemDelegate from PyQt5.QtWidgets import QStyledItemDelegate
from documento_client.constants import BASE_DIR, THUMBNAIL_MARGIN, THUMBNAIL_WIDTH from documento_client.constants import BASE_DIR, THUMBNAIL_MARGIN, THUMBNAIL_WIDTH
from documento_client.scan_object import Scan from documento_client.scan_object import Scan
......
import os import os
import sys
from PySide2.QtCore import QFile, QIODevice, QObject, Signal from PyQt5 import uic
from PySide2.QtUiTools import QUiLoader from PyQt5.QtCore import QObject, pyqtSignal
from requests import RequestException from requests import RequestException
from documento_client.api_manager import AuthException from documento_client.api_manager import AuthException
...@@ -10,23 +9,17 @@ from documento_client.constants import BASE_DIR ...@@ -10,23 +9,17 @@ from documento_client.constants import BASE_DIR
class LoginDialog(QObject): class LoginDialog(QObject):
login_succeeded = Signal() login_succeeded = pyqtSignal()
error_network = Signal() error_network = pyqtSignal()
error_auth = Signal() error_auth = pyqtSignal()
def __init__(self, api, *args, **kwargs): def __init__(self, api, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.api = api self.api = api
ui_file_name = os.path.join(BASE_DIR, "login.ui") ui_file_name = os.path.join(BASE_DIR, "login.ui")
ui_file = QFile(ui_file_name) self.dialog = uic.loadUi(ui_file_name)
if not ui_file.open(QIODevice.ReadOnly):
print("Cannot open {}: {}".format(ui_file_name, ui_file.errorString()))
sys.exit(-1)
loader = QUiLoader()
self.dialog = loader.load(ui_file)
self.dialog.login_button.clicked.connect(self.check_login) self.dialog.login_button.clicked.connect(self.check_login)
def show(self): def show(self):
......
import sys import sys
from PySide2.QtCore import Qt # noqa from PyQt5.QtCore import Qt # noqa
from PySide2.QtWidgets import QApplication from PyQt5.QtWidgets import QApplication
from documento_client.scan_manager import ScanManager from documento_client.scan_manager import ScanManager
from documento_client.ui_manager import MainWindowManager from documento_client.ui_manager import MainWindowManager
......
import os import os
import sys
from PySide2.QtCore import QFile, QIODevice from PyQt5 import uic
from PySide2.QtUiTools import QUiLoader
from documento_client.constants import BASE_DIR from documento_client.constants import BASE_DIR
ui_file_name = os.path.join(BASE_DIR, "progress.ui") ui_file_name = os.path.join(BASE_DIR, "progress.ui")
ui_file = QFile(ui_file_name) progress_dialog = uic.loadUi(ui_file_name)
if not ui_file.open(QIODevice.ReadOnly):
print("Cannot open {}: {}".format(ui_file_name, ui_file.errorString()))
sys.exit(-1)
loader = QUiLoader()
progress_dialog = loader.load(ui_file)
import os import os
import sys
from PySide2.QtCore import QFile, QIODevice, QObject, Signal from PyQt5 import uic
from PySide2.QtUiTools import QUiLoader from PyQt5.QtCore import QObject, pyqtSignal
from requests import RequestException from requests import RequestException
from documento_client.api_manager import AuthException from documento_client.api_manager import AuthException
...@@ -10,9 +9,9 @@ from documento_client.constants import BASE_DIR ...@@ -10,9 +9,9 @@ from documento_client.constants import BASE_DIR
class SaveDialog(QObject): class SaveDialog(QObject):
save_succeeded = Signal() save_succeeded = pyqtSignal()
error_network = Signal() error_network = pyqtSignal()
error_auth = Signal() error_auth = pyqtSignal()
def __init__(self, api, manager, *args, **kwargs): def __init__(self, api, manager, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
...@@ -20,16 +19,9 @@ class SaveDialog(QObject): ...@@ -20,16 +19,9 @@ class SaveDialog(QObject):
self.manager = manager self.manager = manager
ui_file_name = os.path.join(BASE_DIR, "save.ui") ui_file_name = os.path.join(BASE_DIR, "save.ui")
ui_file = QFile(ui_file_name) self.dialog = uic.loadUi(ui_file_name)
if not ui_file.open(QIODevice.ReadOnly):
print("Cannot open {}: {}".format(ui_file_name, ui_file.errorString()))
sys.exit(-1)
loader = QUiLoader()
self.dialog = loader.load(ui_file)
self.dialog.save_button.clicked.connect(self.save_document) self.dialog.save_button.clicked.connect(self.save_document)
self.dialog.pages_count.setText(str(self.manager.scanned_count)) self.dialog.pages_count.setText(str(self.manager.scanned_count))
# Load categories # Load categories
......
...@@ -4,13 +4,13 @@ from typing import Optional, Tuple ...@@ -4,13 +4,13 @@ from typing import Optional, Tuple
import sane import sane
from PyPDF2 import PdfFileMerger from PyPDF2 import PdfFileMerger
from PySide2.QtCore import QObject, Signal from PyQt5.QtCore import QObject, pyqtSignal
from documento_client.scan_object import Scan, ScanList from documento_client.scan_object import Scan, ScanList
class ScanManager(QObject): class ScanManager(QObject):
scan_status_updated = Signal() scan_status_updated = pyqtSignal()
def __init__(self): def __init__(self):
super().__init__() super().__init__()
......
...@@ -3,7 +3,7 @@ from threading import Thread ...@@ -3,7 +3,7 @@ from threading import Thread
import pytesseract import pytesseract
from PIL.ImageQt import ImageQt from PIL.ImageQt import ImageQt
from PySide2.QtCore import QAbstractListModel, QObject, Qt, Signal from PyQt5.QtCore import QAbstractListModel, QObject, Qt, pyqtSignal
from documento_client.constants import THUMBNAIL_WIDTH from documento_client.constants import THUMBNAIL_WIDTH
...@@ -60,7 +60,7 @@ class ScanList(QAbstractListModel): ...@@ -60,7 +60,7 @@ class ScanList(QAbstractListModel):
class Scan(QObject): class Scan(QObject):
data_changed = Signal(QObject) data_changed = pyqtSignal(QObject)
def __init__(self, *args): def __init__(self, *args):
super().__init__(*args) super().__init__(*args)
......
import os import os
import sys import sys
from PySide2.QtCore import QFile, QIODevice, Qt from PyQt5 import uic
from PySide2.QtGui import QPixmap from PyQt5.QtCore import Qt
from PySide2.QtUiTools import QUiLoader from PyQt5.QtGui import QPixmap
from PySide2.QtWidgets import QLabel, QMessageBox from PyQt5.QtWidgets import QLabel, QMessageBox
from documento_client.api_manager import APIManager from documento_client.api_manager import APIManager
from documento_client.constants import BASE_DIR from documento_client.constants import BASE_DIR
...@@ -23,15 +23,8 @@ class MainWindowManager: ...@@ -23,15 +23,8 @@ class MainWindowManager:
# Load UI file from QtDesigner # Load UI file from QtDesigner
ui_file_name = os.path.join(BASE_DIR, "main.ui") ui_file_name = os.path.join(BASE_DIR, "main.ui")
ui_file = QFile(ui_file_name) self.window = uic.loadUi(ui_file_name)
if not ui_file.open(QIODevice.ReadOnly):
print("Cannot open {}: {}".format(ui_file_name, ui_file.errorString()))
sys.exit(-1)
loader = QUiLoader()
self.window = loader.load(ui_file)
ui_file.close()
if not self.window: if not self.window:
print(loader.errorString())
sys.exit(-1) sys.exit(-1)
# Connect listview for scans with model and delegate # Connect listview for scans with model and delegate
......
...@@ -6,10 +6,10 @@ authors = ["Jonathan Weth <dev@jonathanweth.de>"] ...@@ -6,10 +6,10 @@ authors = ["Jonathan Weth <dev@jonathanweth.de>"]
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "^3.6,<3.10" python = "^3.6,<3.10"
PySide2 = "^5.15.2"
python-sane = "^2.9.1" python-sane = "^2.9.1"
pytesseract = "^0.3.7" pytesseract = "^0.3.7"
PyPDF2 = "^1.26.0" PyPDF2 = "^1.26.0"
PyQt5 = "^5.15.4"
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]
sphinx = "^3.5" sphinx = "^3.5"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment