diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py index b500ecc..6f6f90b 100644 --- a/kindlecomicconverter/KCC_gui.py +++ b/kindlecomicconverter/KCC_gui.py @@ -26,7 +26,7 @@ from time import sleep from shutil import move, rmtree from subprocess import STDOUT, PIPE # noinspection PyUnresolvedReferences -from PyQt5 import QtGui, QtCore, QtWidgets, QtNetwork +from PyQt6 import QtGui, QtCore, QtWidgets, QtNetwork from xml.sax.saxutils import escape from psutil import Popen, Process from copy import copy @@ -51,7 +51,7 @@ class QApplicationMessaging(QtWidgets.QApplication): self._timeout = 1000 self._locked = False socket = QtNetwork.QLocalSocket(self) - socket.connectToServer(self._key, QtCore.QIODevice.WriteOnly) + socket.connectToServer(self._key, QtCore.QIODeviceBase.OpenModeFlag.WriteOnly) if not socket.waitForConnected(self._timeout): self._server = QtNetwork.QLocalServer(self) self._server.newConnection.connect(self.handleMessage) @@ -65,7 +65,7 @@ class QApplicationMessaging(QtWidgets.QApplication): self._server.close() def event(self, e): - if e.type() == QtCore.QEvent.FileOpen: + if e.type() == QtCore.QEvent.Type.FileOpen: self.messageFromOtherInstance.emit(bytes(e.file(), 'UTF-8')) return True else: @@ -81,7 +81,7 @@ class QApplicationMessaging(QtWidgets.QApplication): def sendMessage(self, message): socket = QtNetwork.QLocalSocket(self) - socket.connectToServer(self._key, QtCore.QIODevice.WriteOnly) + socket.connectToServer(self._key, QtCore.QIODeviceBase.OpenModeFlag.WriteOnly) socket.waitForConnected(self._timeout) socket.write(bytes(message, 'UTF-8')) socket.waitForBytesWritten(self._timeout) @@ -101,34 +101,34 @@ class QMainWindowKCC(QtWidgets.QMainWindow): class Icons: def __init__(self): self.deviceKindle = QtGui.QIcon() - self.deviceKindle.addPixmap(QtGui.QPixmap(":/Devices/icons/Kindle.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.deviceKindle.addPixmap(QtGui.QPixmap(":/Devices/icons/Kindle.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.deviceKobo = QtGui.QIcon() - self.deviceKobo.addPixmap(QtGui.QPixmap(":/Devices/icons/Kobo.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.deviceKobo.addPixmap(QtGui.QPixmap(":/Devices/icons/Kobo.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.deviceOther = QtGui.QIcon() - self.deviceOther.addPixmap(QtGui.QPixmap(":/Devices/icons/Other.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.deviceOther.addPixmap(QtGui.QPixmap(":/Devices/icons/Other.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.MOBIFormat = QtGui.QIcon() - self.MOBIFormat.addPixmap(QtGui.QPixmap(":/Formats/icons/MOBI.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.MOBIFormat.addPixmap(QtGui.QPixmap(":/Formats/icons/MOBI.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.CBZFormat = QtGui.QIcon() - self.CBZFormat.addPixmap(QtGui.QPixmap(":/Formats/icons/CBZ.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.CBZFormat.addPixmap(QtGui.QPixmap(":/Formats/icons/CBZ.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.EPUBFormat = QtGui.QIcon() - self.EPUBFormat.addPixmap(QtGui.QPixmap(":/Formats/icons/EPUB.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.EPUBFormat.addPixmap(QtGui.QPixmap(":/Formats/icons/EPUB.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.KFXFormat = QtGui.QIcon() - self.KFXFormat.addPixmap(QtGui.QPixmap(":/Formats/icons/KFX.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.KFXFormat.addPixmap(QtGui.QPixmap(":/Formats/icons/KFX.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.MOBIEPUBFormat = QtGui.QIcon() - self.MOBIEPUBFormat.addPixmap(QtGui.QPixmap(":/Formats/icons/MOBI.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.MOBIEPUBFormat.addPixmap(QtGui.QPixmap(":/Formats/icons/MOBI.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.EPUB200MBFormat = QtGui.QIcon() - self.EPUB200MBFormat.addPixmap(QtGui.QPixmap(":/Formats/icons/EPUB.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.EPUB200MBFormat.addPixmap(QtGui.QPixmap(":/Formats/icons/EPUB.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.info = QtGui.QIcon() - self.info.addPixmap(QtGui.QPixmap(":/Status/icons/info.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.info.addPixmap(QtGui.QPixmap(":/Status/icons/info.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.warning = QtGui.QIcon() - self.warning.addPixmap(QtGui.QPixmap(":/Status/icons/warning.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.warning.addPixmap(QtGui.QPixmap(":/Status/icons/warning.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.error = QtGui.QIcon() - self.error.addPixmap(QtGui.QPixmap(":/Status/icons/error.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.error.addPixmap(QtGui.QPixmap(":/Status/icons/error.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.programIcon = QtGui.QIcon() - self.programIcon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.programIcon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) class VersionThread(QtCore.QThread): @@ -227,28 +227,28 @@ class WorkerThread(QtCore.QThread): options.format = str(GUI.formatBox.currentText()).replace('/AZW3', '') if GUI.mangaBox.isChecked(): options.righttoleft = True - if GUI.rotateBox.checkState() == 1: + if GUI.rotateBox.checkState().value == 1: options.splitter = 2 - elif GUI.rotateBox.checkState() == 2: + elif GUI.rotateBox.checkState().value == 2: options.splitter = 1 - if GUI.qualityBox.checkState() == 1: + if GUI.qualityBox.checkState().value == 1: options.autoscale = True - elif GUI.qualityBox.checkState() == 2: + elif GUI.qualityBox.checkState().value == 2: options.hq = True if GUI.webtoonBox.isChecked(): options.webtoon = True - if GUI.upscaleBox.checkState() == 1: + if GUI.upscaleBox.checkState().value == 1: options.stretch = True - elif GUI.upscaleBox.checkState() == 2: + elif GUI.upscaleBox.checkState().value == 2: options.upscale = True if GUI.gammaBox.isChecked() and float(GUI.gammaValue) > 0.09: options.gamma = float(GUI.gammaValue) - options.cropping = GUI.croppingBox.checkState() - if GUI.croppingBox.checkState() >= 1: + options.cropping = GUI.croppingBox.checkState().value + if GUI.croppingBox.checkState().value >= 1: options.croppingp = float(GUI.croppingPowerValue) if GUI.borderBox.checkState() == 1: options.white_borders = True - elif GUI.borderBox.checkState() == 2: + elif GUI.borderBox.checkState().value == 2: options.black_borders = True if GUI.outputSplit.isChecked(): options.batchsplit = 2 @@ -260,9 +260,9 @@ class WorkerThread(QtCore.QThread): options.noprocessing = True if GUI.deleteBox.isChecked(): options.delete = True - if GUI.mozJpegBox.checkState() == 1: + if GUI.mozJpegBox.checkState().value == 1: options.forcepng = True - elif GUI.mozJpegBox.checkState() == 2: + elif GUI.mozJpegBox.checkState().value == 2: options.mozjpeg = True if GUI.currentMode > 2: options.customwidth = str(GUI.widthBox.value()) @@ -444,7 +444,7 @@ class SystemTrayIcon(QtWidgets.QSystemTrayIcon): MW.activateWindow() def addTrayMessage(self, message, icon): - icon = eval('QtWidgets.QSystemTrayIcon.' + icon) + icon = eval('QtWidgets.QSystemTrayIcon.MessageIcon.' + icon) if self.supportsMessages() and not MW.isActiveWindow(): self.showMessage('Kindle Comic Converter', message, icon) @@ -554,7 +554,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): self.conversionAlive = False self.worker.sync() icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) GUI.convertButton.setIcon(icon) GUI.convertButton.setText('Convert') GUI.centralWidget.setAcceptDrops(True) @@ -562,7 +562,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): self.conversionAlive = True self.worker.sync() icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) GUI.convertButton.setIcon(icon) GUI.convertButton.setText('Abort') GUI.centralWidget.setAcceptDrops(False) @@ -693,7 +693,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): def showDialog(self, message, kind): if kind == 'error': - QtWidgets.QMessageBox.critical(MW, 'KCC - Error', message, QtWidgets.QMessageBox.Ok) + QtWidgets.QMessageBox.critical(MW, 'KCC - Error', message, QtWidgets.QMessageBox.StandardButton.Ok) elif kind == 'question': GUI.versionCheck.setAnswer(QtWidgets.QMessageBox.question(MW, 'KCC - Question', message, QtWidgets.QMessageBox.Yes, @@ -721,7 +721,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): self.conversionAlive = False self.worker.sync() else: - if QtWidgets.QApplication.keyboardModifiers() == QtCore.Qt.ShiftModifier: + if QtWidgets.QApplication.keyboardModifiers() == QtCore.Qt.KeyboardModifier.ShiftModifier: dname = QtWidgets.QFileDialog.getExistingDirectory(MW, 'Select output directory', self.lastPath) if dname != '': if sys.platform.startswith('win'): @@ -1024,7 +1024,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): 'com/ciromattia/kcc/blob/master/README.md#issues--new-features--donations">DO' 'NATE - FORUM') - statusBarLabel.setAlignment(QtCore.Qt.AlignCenter) + statusBarLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) statusBarLabel.setOpenExternalLinks(True) GUI.statusBar.addPermanentWidget(statusBarLabel, 1) @@ -1111,7 +1111,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): else: try: if eval('GUI.' + str(option)).isEnabled(): - eval('GUI.' + str(option)).setCheckState(self.options[option]) + eval('GUI.' + str(option)).setCheckState(QtCore.CheckState(self.options[option])) except AttributeError: pass self.worker.sync() @@ -1185,7 +1185,7 @@ class KCCGUI_MetaEditor(KCC_ui_editor.Ui_editorDialog): self.ui = QtWidgets.QDialog() self.parser = None self.setupUi(self.ui) - self.ui.setWindowFlags(self.ui.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint) + self.ui.setWindowFlags(self.ui.windowFlags() & ~QtCore.Qt.WindowType.WindowContextHelpButtonHint) self.okButton.clicked.connect(self.saveData) self.cancelButton.clicked.connect(self.ui.close) if sys.platform.startswith('linux'): diff --git a/kindlecomicconverter/KCC_rc.py b/kindlecomicconverter/KCC_rc.py index 4176bc9..b9ac41c 100644 --- a/kindlecomicconverter/KCC_rc.py +++ b/kindlecomicconverter/KCC_rc.py @@ -6,7 +6,7 @@ # # WARNING! All changes made in this file will be lost! -from PyQt5 import QtCore +from PyQt6 import QtCore qt_resource_data = b"\ \x00\x00\x0c\x65\ diff --git a/kindlecomicconverter/KCC_ui.py b/kindlecomicconverter/KCC_ui.py index 0db83b0..46d2f18 100644 --- a/kindlecomicconverter/KCC_ui.py +++ b/kindlecomicconverter/KCC_ui.py @@ -8,7 +8,7 @@ # run again. Do not edit this file unless you know what you are doing. -from PyQt5 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets class Ui_mainWindow(object): @@ -16,7 +16,7 @@ class Ui_mainWindow(object): mainWindow.setObjectName("mainWindow") mainWindow.resize(450, 400) icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) mainWindow.setWindowIcon(icon) self.centralWidget = QtWidgets.QWidget(mainWindow) self.centralWidget.setObjectName("centralWidget") @@ -89,7 +89,7 @@ class Ui_mainWindow(object): self.gammaSlider = QtWidgets.QSlider(self.gammaWidget) self.gammaSlider.setMaximum(250) self.gammaSlider.setSingleStep(5) - self.gammaSlider.setOrientation(QtCore.Qt.Horizontal) + self.gammaSlider.setOrientation(QtCore.Qt.Orientation.Horizontal) self.gammaSlider.setObjectName("gammaSlider") self.horizontalLayout_2.addWidget(self.gammaSlider) self.gridLayout.addWidget(self.gammaWidget, 6, 0, 1, 2) @@ -105,12 +105,12 @@ class Ui_mainWindow(object): self.croppingPowerSlider = QtWidgets.QSlider(self.croppingWidget) self.croppingPowerSlider.setMaximum(200) self.croppingPowerSlider.setSingleStep(1) - self.croppingPowerSlider.setOrientation(QtCore.Qt.Horizontal) + self.croppingPowerSlider.setOrientation(QtCore.Qt.Orientation.Horizontal) self.croppingPowerSlider.setObjectName("croppingPowerSlider") self.horizontalLayout_3.addWidget(self.croppingPowerSlider) self.gridLayout.addWidget(self.croppingWidget, 8, 0, 1, 2) self.buttonWidget = QtWidgets.QWidget(self.centralWidget) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.buttonWidget.sizePolicy().hasHeightForWidth()) @@ -122,14 +122,14 @@ class Ui_mainWindow(object): self.directoryButton = QtWidgets.QPushButton(self.buttonWidget) self.directoryButton.setMinimumSize(QtCore.QSize(0, 30)) icon1 = QtGui.QIcon() - icon1.addPixmap(QtGui.QPixmap(":/Other/icons/folder_new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon1.addPixmap(QtGui.QPixmap(":/Other/icons/folder_new.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.directoryButton.setIcon(icon1) self.directoryButton.setObjectName("directoryButton") self.gridLayout_4.addWidget(self.directoryButton, 0, 0, 1, 1) self.fileButton = QtWidgets.QPushButton(self.buttonWidget) self.fileButton.setMinimumSize(QtCore.QSize(0, 30)) icon2 = QtGui.QIcon() - icon2.addPixmap(QtGui.QPixmap(":/Other/icons/document_new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon2.addPixmap(QtGui.QPixmap(":/Other/icons/document_new.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.fileButton.setIcon(icon2) self.fileButton.setObjectName("fileButton") self.gridLayout_4.addWidget(self.fileButton, 0, 3, 1, 1) @@ -147,14 +147,14 @@ class Ui_mainWindow(object): font.setBold(True) self.convertButton.setFont(font) icon3 = QtGui.QIcon() - icon3.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon3.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.convertButton.setIcon(icon3) self.convertButton.setObjectName("convertButton") self.gridLayout_4.addWidget(self.convertButton, 1, 2, 1, 1) self.clearButton = QtWidgets.QPushButton(self.buttonWidget) self.clearButton.setMinimumSize(QtCore.QSize(0, 30)) icon4 = QtGui.QIcon() - icon4.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon4.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.clearButton.setIcon(icon4) self.clearButton.setObjectName("clearButton") self.gridLayout_4.addWidget(self.clearButton, 0, 2, 1, 1) @@ -173,23 +173,23 @@ class Ui_mainWindow(object): self.editorButton = QtWidgets.QPushButton(self.toolWidget) self.editorButton.setMinimumSize(QtCore.QSize(0, 30)) icon5 = QtGui.QIcon() - icon5.addPixmap(QtGui.QPixmap(":/Other/icons/editor.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon5.addPixmap(QtGui.QPixmap(":/Other/icons/editor.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.editorButton.setIcon(icon5) self.editorButton.setObjectName("editorButton") self.horizontalLayout.addWidget(self.editorButton) self.wikiButton = QtWidgets.QPushButton(self.toolWidget) self.wikiButton.setMinimumSize(QtCore.QSize(0, 30)) icon6 = QtGui.QIcon() - icon6.addPixmap(QtGui.QPixmap(":/Other/icons/wiki.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon6.addPixmap(QtGui.QPixmap(":/Other/icons/wiki.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.wikiButton.setIcon(icon6) self.wikiButton.setObjectName("wikiButton") self.horizontalLayout.addWidget(self.wikiButton) self.gridLayout.addWidget(self.toolWidget, 0, 0, 1, 2) self.jobList = QtWidgets.QListWidget(self.centralWidget) self.jobList.setStyleSheet("QListWidget#jobList {background:#ffffff;background-image:url(:/Other/icons/list_background.png);background-position:center center;background-repeat:no-repeat;color:rgb(0,0,0);}") - self.jobList.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection) - self.jobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) - self.jobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) + self.jobList.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.NoSelection) + self.jobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollMode.ScrollPerPixel) + self.jobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollMode.ScrollPerPixel) self.jobList.setObjectName("jobList") self.gridLayout.addWidget(self.jobList, 2, 0, 1, 2) self.progressBar = QtWidgets.QProgressBar(self.centralWidget) @@ -198,7 +198,7 @@ class Ui_mainWindow(object): font.setBold(True) self.progressBar.setFont(font) self.progressBar.setVisible(False) - self.progressBar.setAlignment(QtCore.Qt.AlignJustify|QtCore.Qt.AlignVCenter) + self.progressBar.setAlignment(QtCore.Qt.AlignmentFlag.AlignJustify|QtCore.Qt.AlignmentFlag.AlignVCenter) self.progressBar.setObjectName("progressBar") self.gridLayout.addWidget(self.progressBar, 1, 0, 1, 2) self.customWidget = QtWidgets.QWidget(self.centralWidget) @@ -208,7 +208,7 @@ class Ui_mainWindow(object): self.gridLayout_3.setContentsMargins(0, 0, 0, 0) self.gridLayout_3.setObjectName("gridLayout_3") self.hLabel = QtWidgets.QLabel(self.customWidget) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.hLabel.sizePolicy().hasHeightForWidth()) @@ -220,7 +220,7 @@ class Ui_mainWindow(object): self.widthBox.setObjectName("widthBox") self.gridLayout_3.addWidget(self.widthBox, 0, 1, 1, 1) self.wLabel = QtWidgets.QLabel(self.customWidget) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.wLabel.sizePolicy().hasHeightForWidth()) diff --git a/kindlecomicconverter/KCC_ui_editor.py b/kindlecomicconverter/KCC_ui_editor.py index 3822dba..ff5d324 100644 --- a/kindlecomicconverter/KCC_ui_editor.py +++ b/kindlecomicconverter/KCC_ui_editor.py @@ -8,7 +8,7 @@ # run again. Do not edit this file unless you know what you are doing. -from PyQt5 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets class Ui_editorDialog(object): @@ -17,7 +17,7 @@ class Ui_editorDialog(object): editorDialog.resize(400, 260) editorDialog.setMinimumSize(QtCore.QSize(400, 260)) icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) editorDialog.setWindowIcon(icon) self.verticalLayout = QtWidgets.QVBoxLayout(editorDialog) self.verticalLayout.setContentsMargins(-1, -1, -1, 5) @@ -76,7 +76,7 @@ class Ui_editorDialog(object): self.horizontalLayout.setContentsMargins(0, 0, 0, 0) self.horizontalLayout.setObjectName("horizontalLayout") self.statusLabel = QtWidgets.QLabel(self.optionWidget) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.statusLabel.sizePolicy().hasHeightForWidth()) @@ -87,14 +87,14 @@ class Ui_editorDialog(object): self.okButton = QtWidgets.QPushButton(self.optionWidget) self.okButton.setMinimumSize(QtCore.QSize(0, 30)) icon1 = QtGui.QIcon() - icon1.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon1.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.okButton.setIcon(icon1) self.okButton.setObjectName("okButton") self.horizontalLayout.addWidget(self.okButton) self.cancelButton = QtWidgets.QPushButton(self.optionWidget) self.cancelButton.setMinimumSize(QtCore.QSize(0, 30)) icon2 = QtGui.QIcon() - icon2.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon2.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.cancelButton.setIcon(icon2) self.cancelButton.setObjectName("cancelButton") self.horizontalLayout.addWidget(self.cancelButton) diff --git a/kindlecomicconverter/comic2ebook.py b/kindlecomicconverter/comic2ebook.py index 398bf21..b26c839 100755 --- a/kindlecomicconverter/comic2ebook.py +++ b/kindlecomicconverter/comic2ebook.py @@ -36,10 +36,6 @@ from PIL import Image from subprocess import STDOUT, PIPE from psutil import Popen, virtual_memory, disk_usage from html import escape as hescape -try: - from PyQt5 import QtCore -except ImportError: - QtCore = None from .shared import md5Checksum, getImageFileName, walkSort, walkLevel, sanitizeTrace from . import comic2panel from . import image diff --git a/kindlecomicconverter/comic2panel.py b/kindlecomicconverter/comic2panel.py index 48244ad..3de1ffd 100644 --- a/kindlecomicconverter/comic2panel.py +++ b/kindlecomicconverter/comic2panel.py @@ -25,10 +25,6 @@ from shutil import rmtree, copytree, move from multiprocessing import Pool from PIL import Image, ImageChops, ImageOps, ImageDraw from .shared import getImageFileName, walkLevel, walkSort, sanitizeTrace -try: - from PyQt5 import QtCore -except ImportError: - QtCore = None def mergeDirectoryTick(output): diff --git a/kindlecomicconverter/image.py b/kindlecomicconverter/image.py index 9df8049..9e7b85b 100755 --- a/kindlecomicconverter/image.py +++ b/kindlecomicconverter/image.py @@ -20,7 +20,7 @@ # along with this program. If not, see . import io import os -import mozjpeg_lossless_optimization +#import mozjpeg_lossless_optimization from PIL import Image, ImageOps, ImageStat, ImageChops, ImageFilter from .shared import md5Checksum diff --git a/kindlecomicconverter/shared.py b/kindlecomicconverter/shared.py index 5c1136b..7d6f63d 100644 --- a/kindlecomicconverter/shared.py +++ b/kindlecomicconverter/shared.py @@ -100,7 +100,7 @@ def dependencyCheck(level): missing = [] if level > 2: try: - from PyQt5.QtCore import qVersion as qtVersion + from PyQt6.QtCore import qVersion as qtVersion if StrictVersion('5.6.0') > StrictVersion(qtVersion()): missing.append('PyQt 5.6.0+') except ImportError: diff --git a/kindlecomicconverter/startup.py b/kindlecomicconverter/startup.py index c92579d..50c30b2 100644 --- a/kindlecomicconverter/startup.py +++ b/kindlecomicconverter/startup.py @@ -39,7 +39,7 @@ def start(): KCCUI = KCC_gui.KCCGUI(KCCAplication, KCCWindow) for i in range(1, len(sys.argv)): KCCUI.handleMessage(sys.argv[i]) - sys.exit(KCCAplication.exec_()) + sys.exit(KCCAplication.exec()) def startC2E(): diff --git a/requirements.txt b/requirements.txt index 156b842..763b567 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -PyQt5>=5.6.0 +PyQt6 Pillow>=5.2.0 psutil>=5.0.0 python-slugify>=1.2.1