update Dockerfile-base file version

Merge branch 'ciromattia:master' into pyqt6
prioritize KC2 over KP3 kindlegen version (#574 )
2026-04-18 15:08:48 +00:00 · 2023-08-09 18:40:32 +02:00 · 2023-08-08 14:38:44 -07:00 · 2023-08-08 20:25:03 +00:00 · 2023-08-07 20:55:52 -07:00 · 2023-08-07 18:22:46 +00:00
27 changed files with 12224 additions and 12144 deletions
--- a/.github/workflows/package-linux.yml
+++ b/.github/workflows/package-linux.yml
@@ -34,8 +34,8 @@ jobs:
    - name: Install python dependencies
      run: |
        sudo apt-get update 
-        sudo apt-get install -y libpng-dev libjpeg-dev p7zip-full p7zip-rar python3-pyqt5 python3-pip squashfs-tools libfuse2
+        sudo apt-get install -y libpng-dev libjpeg-dev p7zip-full p7zip-rar python3-pip squashfs-tools libfuse2
-        python -m pip install --upgrade pip setuptools wheel certifi pyinstaller PyQt6 --no-binary pyinstaller 
+        python -m pip install --upgrade pip setuptools wheel certifi pyinstaller --no-binary pyinstaller 
        python -m pip install -r requirements.txt
    - name: build binary
      run: |
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ KindleComicConverter*.egg-info/
 /venv/
 /kindlegen*
 /kcc.bat
 .DS_Store
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # CHANGELOG
 #### 5.6.2:
 * build pipeline : drop pypi by @darodi in [#465](https://github.com/ciromattia/kcc/pull/465)
 * supporting Kindle Previewer by @darodi in [#466](https://github.com/ciromattia/kcc/pull/466)
 * Bump actions/upload-artifact from 2 to 3 by @dependabot in [#468](https://github.com/ciromattia/kcc/pull/468)
 * new appImage by @darodi in [#483](https://github.com/ciromattia/kcc/pull/483)
 * Bump actions/checkout from 2 to 3 by @dependabot in [#484](https://github.com/ciromattia/kcc/pull/484)
 * supporting Kindle Previewer by @darodi in [#486](https://github.com/ciromattia/kcc/pull/486)
 * comic2ebook/func: Add a delete option (closes #458) by @Constantin1489 in [#485](https://github.com/ciromattia/kcc/pull/485)
 * Add command line executables to CI/pipelines by @darodi in [#487](https://github.com/ciromattia/kcc/pull/487)
 * gui/func: Add a 'delete after conversion' button (closes #458) by @Constantin1489 in [#488](https://github.com/ciromattia/kcc/pull/488)
 * fix crashes on png transparency by @axu2 in [#494](https://github.com/ciromattia/kcc/pull/494)
 * Update python-slugify requirement from <8.0.0,>=1.2.1 to >=1.2.1,<9.0.0 by @dependabot in [#473](https://github.com/ciromattia/kcc/pull/473)
 * Updates GUI text for new Homebrew version by @thatrobotdev in [#491](https://github.com/ciromattia/kcc/pull/491)
 * Even with EPUB-200MB option selected, created file is above 200MB by @darodi in [#503](https://github.com/ciromattia/kcc/pull/503)
 * limit kindle scribe image size to (1440, 1920) when using kindlegen by @darodi in [#514](https://github.com/ciromattia/kcc/pull/514)
 * add 7z to PATH by @axu2 in [#513](https://github.com/ciromattia/kcc/pull/513)
 * use unrar for fedora only by @darodi in [#515](https://github.com/ciromattia/kcc/pull/515)
 #### 5.6.1:
 * Fix pillow backwards compatibility, add mozjpeg-lossless-optimization to setup.py by @corylk in #461
 * fix in fedora: 7z doesn't support rar archives, use unrar by @AlicesReflexion in #370
--- a/2
+++ b/2
@@ -1,5 +1,5 @@
 # Select final stage based on TARGETARCH ARG
-FROM ghcr.io/ciromattia/kcc:docker-base-20230514
+FROM ghcr.io/ciromattia/kcc:docker-base-20230809
 LABEL com.kcc.name="Kindle Comic Converter"
 LABEL com.kcc.author="Ciro Mattia Gonano, Paweł Jastrzębski and Darodi"
 LABEL org.opencontainers.image.description='Kindle Comic Converter'
--- a/6
+++ b/6
@@ -8,7 +8,7 @@ RUN echo "I'm building for $TARGETOS/$TARGETARCH/$TARGETVARIANT"
 COPY requirements.txt /opt/kcc/
 ENV PATH="/opt/venv/bin:$PATH"
 RUN DEBIAN_FRONTEND=noninteractive apt-get update -y && apt-get -yq upgrade && \
-    apt-get install -y libpng-dev libjpeg-dev p7zip-full unrar-free libgl1 python3-pyqt5 && \
+    apt-get install -y libpng-dev libjpeg-dev p7zip-full unrar-free libgl1 && \
    python -m pip install --upgrade pip && \
    python -m venv /opt/venv && \
    python -m pip install -r /opt/kcc/requirements.txt
@@ -55,7 +55,6 @@ RUN set -x && \
    KEPT_PACKAGES+=(p7zip-full) && \
    KEPT_PACKAGES+=(python3) && \
    KEPT_PACKAGES+=(python3-pip) && \
    KEPT_PACKAGES+=(python3-pyqt5) && \
    KEPT_PACKAGES+=(unrar-free) && \
    # Install packages
    DEBIAN_FRONTEND=noninteractive apt-get update -y && apt-get -yq upgrade && \
@@ -112,7 +111,6 @@ RUN set -x && \
    KEPT_PACKAGES+=(p7zip-full) && \
    KEPT_PACKAGES+=(python3) && \
    KEPT_PACKAGES+=(python3-pip) && \
    KEPT_PACKAGES+=(python3-pyqt5) && \
    KEPT_PACKAGES+=(unrar-free) && \
    # Install packages
    DEBIAN_FRONTEND=noninteractive apt-get update -y && apt-get -yq upgrade && \
@@ -158,5 +156,5 @@ WORKDIR /app
 RUN DEBIAN_FRONTEND=noninteractive apt-get update -y && apt-get -yq upgrade && \
    apt-get install -y p7zip-full unrar-free  && \
    ln -s /app/kindlegen /bin/kindlegen && \
-    echo docker-base-20230514 > /IMAGE_VERSION
+    echo docker-base-20230809 > /IMAGE_VERSION
--- a/README.md
+++ b/README.md
@@ -32,25 +32,21 @@ If you find **KCC** valuable you can consider donating to the authors:
 ## INSTALLATION 
-### BINARY RELEASES
+### DOWNLOADS
 You can find the latest binary at the following link:
 - **https://github.com/ciromattia/kcc/releases**
 - flatpak : https://flathub.org/apps/details/io.github.ciromattia.kcc
 - Docker: https://github.com/ciromattia/kcc/pkgs/container/kcc
 ~~- **[Windows](http://kcc.iosphe.re/Windows/) (64-bit only)**~~  
 ~~- **[macOS](http://kcc.iosphe.re/OSX/) (10.14+)**~~  
 ~~- **Linux:** Currently unavailable.~~
 more information on [installation](https://github.com/ciromattia/kcc/wiki/Installation)
 ### DEPENDENCIES
 Following software is required to run Linux version of **KCC** and/or bare sources:
 - Python 3.3+
- [PyQt5](https://pypi.python.org/pypi/PyQt5) 5.6.0+ (only needed for GUI)
+- [PySide6](https://pypi.org/project/PySide6/) 6.5.1+ (only needed for GUI)
 - [Pillow](https://pypi.python.org/pypi/Pillow/) 4.0.0+ (5.2.0+ needed for WebP support)
- [psutil](https://pypi.python.org/pypi/psutil) 5.0.0+
+- [psutil](https://pypi.python.org/pypi/psutil) 5.9.5+
 - [python-slugify](https://pypi.python.org/pypi/python-slugify) 1.2.1+, <8.0.0
 - [raven](https://pypi.python.org/pypi/raven) 6.0.0+ (only needed for GUI)
@@ -59,21 +55,17 @@ On Debian based distributions these two commands should install all needed depen
 ```bash
-$ sudo apt-get install -y python3 python3-dev libpng-dev libjpeg-dev p7zip-full p7zip-rar unrar-free libgl1 python3-pyqt5 && \
+$ sudo apt-get install -y python3 python3-dev libpng-dev libjpeg-dev p7zip-full p7zip-rar unrar-free libgl1 && \
    python -m pip install --upgrade pip && \
    python -m pip install --upgrade -r requirements.txt
 ```
 #### Optional dependencies
- Qt platform integration plugin for Deepin Desktop Environment
+- KindleGen ~~[(deprecated link)](http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211)~~ v2.9+  (For MOBI generation) 
-```bash
+  - should be placed in a directory reachable by your _PATH_ or in _KCC_ directory
-$ sudo apt-get install qt5dxcb-plugin
+  - `KindleGen` can be found in [Kindle Previewer](https://www.amazon.com/Kindle-Previewer/b?ie=UTF8&node=21381691011)
-```
+  - `KindleGen` can be also be found in [Kindle Comic Creator](https://www.amazon.com/b?node=23496309011)
 - KindleGen ~~[deprecated link](http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211)~~ v2.9+ in a directory reachable by your _PATH_ or in _KCC_ directory *(For MOBI generation) 
  - It can be found in [Kindle Previewer](https://www.amazon.com/Kindle-Previewer/b?ie=UTF8&node=21381691011)
    `Amazon Kindle Previewer 3 Folder\lib\fc\bin`, the usual location in windows is in windows is `C:\Users\user\AppData\Local\Amazon\Kindle Previewer 3\lib\fc\bin\`
 - [7z](http://www.7-zip.org/download.html) *(For CBZ/ZIP, CBR/RAR, 7z/CB7 support)*
 - Unrar (no rar in 7z on Fedora)
@@ -87,8 +79,6 @@ $ sudo apt-get install qt5dxcb-plugin
 - CB7, 7Z *(With `7z` executable)*
 - PDF *(Only extracting JPG images)*
 Add 7z to PATH via `setx path "%path%;C:\Program Files\7-Zip"`
 ## USAGE
 Should be pretty self-explanatory. All options have detailed information in tooltips.
--- a/environment.yml
+++ b/environment.yml
@@ -3,13 +3,13 @@ channels:
  - conda-forge
  - defaults
 dependencies:
-  - python=3.8
+  - python=3.11
  - Pillow>=5.2.0
-  - psutil>=5.0.0
+  - psutil>=5.9.5
  - python-slugify>=1.2.1
  - raven>=6.0.0
  - distro
  - pip
  - pip:
    - mozjpeg-lossless-optimization>=1.1.2
-    - PyQt5>=5.6.0
+    - pyside6>=6.5.1
--- a/gen_ui_files.bat
+++ b/gen_ui_files.bat
@@ -1,11 +1,3 @@
-
+pyside6-uic gui/KCC.ui > kindlecomicconverter/KCC_ui.py
-REM install qt creator
+pyside6-uic gui/MetaEditor.ui > kindlecomicconverter/KCC_ui_editor.py
-REM conda create -n qtenv python=3.7
+pyside6-rcc gui/KCC.qrc > kindlecomicconverter/KCC_rc.py
 REM conda activate qtenv 
 REM pip install PyQt5
 pyuic5 gui/KCC.ui > kindlecomicconverter/KCC_ui.py
 pyuic5 gui/MetaEditor.ui > kindlecomicconverter/KCC_ui_editor.py
 pyrcc5 gui/KCC.qrc > kindlecomicconverter/KCC_rc.py
--- a/gen_ui_files.sh
+++ b/gen_ui_files.sh
@@ -1,10 +1,5 @@
 #!/bin/sh
-# PREPARE PYTHON ENV
+pyside6-uic gui/KCC.ui --from-imports > kindlecomicconverter/KCC_ui.py
-# conda create -n pyqt5 python=3.7
+pyside6-uic gui/MetaEditor.ui --from-imports > kindlecomicconverter/KCC_ui_editor.py
-# source activate pyqt5
+pyside6-rcc gui/KCC.qrc > kindlecomicconverter/KCC_rc.py
 # pip install pyqt5
 pyuic5 gui/KCC.ui --from-imports > kindlecomicconverter/KCC_ui.py
 pyuic5 gui/MetaEditor.ui --from-imports > kindlecomicconverter/KCC_ui_editor.py
 pyrcc5 gui/KCC.qrc > kindlecomicconverter/KCC_rc.py
--- a/kcc.py
+++ b/kcc.py
@@ -27,22 +27,40 @@ if sys.version_info < (3, 8, 0):
 # OS specific workarounds
 import os
 if sys.platform.startswith('darwin'):
    # prioritize KC2 since it optionally also installs KP3
    mac_paths = [
        '/Applications/Kindle Comic Creator/Kindle Comic Creator.app/Contents/MacOS',
        '/Applications/Kindle Previewer 3.app/Contents/lib/fc/bin/',
    ]
    if getattr(sys, 'frozen', False):
-        os.environ['PATH'] = os.path.dirname(os.path.abspath(sys.executable)) + \
+        os.environ['PATH'] += os.pathsep + os.pathsep.join(mac_paths +
-                             '/../Resources:/Applications/Kindle Comic Creator/Kindle Comic Creator.app/Contents/MacOS:' \
+            [
-                             '/Applications/Kindle Previewer 3.app/Contents/lib/fc/bin/:/usr/local/bin:/usr/bin:/bin'
+                '/opt/homebrew/bin',
-        os.chdir(os.path.dirname(os.path.abspath(sys.executable)) + '/../Resources')
+                '/usr/local/bin',
-    else:
+                '/usr/bin',
-        os.chdir(os.path.dirname(os.path.abspath(__file__)))
+                '/bin',
-elif sys.platform.startswith('win'):
+            ]
-    if getattr(sys, 'frozen', False):
+        )
        os.environ['PATH'] = '%LOCALAPPDATA%\\Amazon\\Kindle Previewer 3\\lib\\fc\\bin\\;' + \
                             os.environ['PATH']
        os.chdir(os.path.dirname(os.path.abspath(sys.executable)))
    else:
-        os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/windows/;' \
+        os.environ['PATH'] += os.pathsep + os.pathsep.join(mac_paths)
-                             '%LOCALAPPDATA%\\Amazon\\Kindle Previewer 3\\lib\\fc\\bin\\;' + \
+        os.chdir(os.path.dirname(os.path.abspath(__file__)))
-                             os.environ['PATH']
+elif sys.platform.startswith('win'):
    # prioritize KC2 since it optionally also installs KP3
    win_paths = [
        os.path.expandvars('%LOCALAPPDATA%\\Amazon\\KC2'),
        os.path.expandvars('%LOCALAPPDATA%\\Amazon\\Kindle Previewer 3\\lib\\fc\\bin\\'),
        'C:\\Program Files\\7-Zip',
    ]
    if getattr(sys, 'frozen', False):
        os.environ['PATH'] += os.pathsep + os.pathsep.join(win_paths)
        os.chdir(os.path.dirname(os.path.abspath(sys.executable)))
    else:
        os.environ['PATH'] += os.pathsep + os.pathsep.join(win_paths +
            [
                os.path.dirname(os.path.abspath(__file__)) + '/other/windows/',
            ]
        )
        os.chdir(os.path.dirname(os.path.abspath(__file__)))
 # Load additional Sentry configuration
 # if getattr(sys, 'frozen', False):
--- a/kindlecomicconverter/KCC_gui.py
+++ b/kindlecomicconverter/KCC_gui.py
@@ -19,21 +19,23 @@
 import json
 import os
 import re
 import subprocess
 import sys
 from urllib.parse import unquote
-from urllib.request import urlretrieve, urlopen
+from urllib.request import urlopen
 from time import sleep
 from shutil import move, rmtree
 from subprocess import STDOUT, PIPE
 # noinspection PyUnresolvedReferences
-from PyQt5 import QtGui, QtCore, QtWidgets, QtNetwork
+from PySide6 import QtGui, QtCore, QtWidgets, QtNetwork
 from PySide6.QtCore import Qt
 from xml.sax.saxutils import escape
 from psutil import Popen, Process
 from copy import copy
 from distutils.version import StrictVersion
 from raven import Client
 from tempfile import gettempdir
-from .shared import md5Checksum, HTMLStripper, sanitizeTrace, walkLevel
+from .shared import HTMLStripper, sanitizeTrace, walkLevel
 from . import __version__
 from . import comic2ebook
 from . import metadata
@@ -43,7 +45,7 @@ from . import KCC_ui_editor
 class QApplicationMessaging(QtWidgets.QApplication):
-    messageFromOtherInstance = QtCore.pyqtSignal(bytes)
+    messageFromOtherInstance = QtCore.Signal(bytes)
    def __init__(self, argv):
        QtWidgets.QApplication.__init__(self, argv)
@@ -51,7 +53,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 +67,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 +83,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)
@@ -89,46 +91,40 @@ class QApplicationMessaging(QtWidgets.QApplication):
 class QMainWindowKCC(QtWidgets.QMainWindow):
-    progressBarTick = QtCore.pyqtSignal(str)
+    progressBarTick = QtCore.Signal(str)
-    modeConvert = QtCore.pyqtSignal(int)
+    modeConvert = QtCore.Signal(int)
-    addMessage = QtCore.pyqtSignal(str, str, bool)
+    addMessage = QtCore.Signal(str, str, bool)
-    addTrayMessage = QtCore.pyqtSignal(str, str)
+    addTrayMessage = QtCore.Signal(str, str)
-    showDialog = QtCore.pyqtSignal(str, str)
+    showDialog = QtCore.Signal(str, str)
-    hideProgressBar = QtCore.pyqtSignal()
+    hideProgressBar = QtCore.Signal()
-    forceShutdown = QtCore.pyqtSignal()
+    forceShutdown = QtCore.Signal()
 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.MOBIEPUBFormat = QtGui.QIcon()
        self.MOBIEPUBFormat.addPixmap(QtGui.QPixmap(":/Formats/icons/MOBI.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
        self.EPUB200MBFormat = QtGui.QIcon()
        self.EPUB200MBFormat.addPixmap(QtGui.QPixmap(":/Formats/icons/EPUB.png"), QtGui.QIcon.Normal, QtGui.QIcon.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):
@@ -224,31 +220,32 @@ class WorkerThread(QtCore.QThread):
        currentJobs = []
        options.profile = GUI.profiles[str(GUI.deviceBox.currentText())]['Label']
-        options.format = str(GUI.formatBox.currentText()).replace('/AZW3', '')
+        gui_current_format = GUI.formats[str(GUI.formatBox.currentText())]['format']
        options.format = gui_current_format
        if GUI.mangaBox.isChecked():
            options.righttoleft = True
-        if GUI.rotateBox.checkState() == 1:
+        if GUI.rotateBox.checkState() == Qt.CheckState.PartiallyChecked:
            options.splitter = 2
-        elif GUI.rotateBox.checkState() == 2:
+        elif GUI.rotateBox.checkState() == Qt.CheckState.Checked:
            options.splitter = 1
-        if GUI.qualityBox.checkState() == 1:
+        if GUI.qualityBox.checkState() == Qt.CheckState.PartiallyChecked:
            options.autoscale = True
-        elif GUI.qualityBox.checkState() == 2:
+        elif GUI.qualityBox.checkState() == Qt.CheckState.Checked:
            options.hq = True
        if GUI.webtoonBox.isChecked():
            options.webtoon = True
-        if GUI.upscaleBox.checkState() == 1:
+        if GUI.upscaleBox.checkState() == Qt.CheckState.PartiallyChecked:
            options.stretch = True
-        elif GUI.upscaleBox.checkState() == 2:
+        elif GUI.upscaleBox.checkState() == Qt.CheckState.Checked:
            options.upscale = True
        if GUI.gammaBox.isChecked() and float(GUI.gammaValue) > 0.09:
            options.gamma = float(GUI.gammaValue)
-        options.cropping = GUI.croppingBox.checkState()
+        options.cropping = GUI.croppingBox.checkState().value
-        if GUI.croppingBox.checkState() >= 1:
+        if GUI.croppingBox.checkState() != Qt.CheckState.Unchecked:
            options.croppingp = float(GUI.croppingPowerValue)
-        if GUI.borderBox.checkState() == 1:
+        if GUI.borderBox.checkState() == Qt.CheckState.PartiallyChecked:
            options.white_borders = True
-        elif GUI.borderBox.checkState() == 2:
+        elif GUI.borderBox.checkState() == Qt.CheckState.Checked:
            options.black_borders = True
        if GUI.outputSplit.isChecked():
            options.batchsplit = 2
@@ -260,9 +257,9 @@ class WorkerThread(QtCore.QThread):
            options.noprocessing = True
        if GUI.deleteBox.isChecked():
            options.delete = True
-        if GUI.mozJpegBox.checkState() == 1:
+        if GUI.mozJpegBox.checkState() == Qt.CheckState.PartiallyChecked:
            options.forcepng = True
-        elif GUI.mozJpegBox.checkState() == 2:
+        elif GUI.mozJpegBox.checkState() == Qt.CheckState.Checked:
            options.mozjpeg = True
        if GUI.currentMode > 2:
            options.customwidth = str(GUI.widthBox.value())
@@ -280,7 +277,7 @@ class WorkerThread(QtCore.QThread):
                return
            self.errors = False
            MW.addMessage.emit('<b>Source:</b> ' + job, 'info', False)
-            if str(GUI.formatBox.currentText()) == 'CBZ':
+            if gui_current_format == 'CBZ':
                MW.addMessage.emit('Creating CBZ files', 'info', False)
                GUI.progress.content = 'Creating CBZ files'
            else:
@@ -330,11 +327,11 @@ class WorkerThread(QtCore.QThread):
                return
            if not self.errors:
                GUI.progress.content = ''
-                if str(GUI.formatBox.currentText()) == 'CBZ':
+                if gui_current_format == 'CBZ':
                    MW.addMessage.emit('Creating CBZ files... <b>Done!</b>', 'info', True)
                else:
                    MW.addMessage.emit('Creating EPUB files... <b>Done!</b>', 'info', True)
-                if str(GUI.formatBox.currentText()) == 'MOBI/AZW3' or str(GUI.formatBox.currentText()) == 'MOBI+EPUB':
+                if 'MOBI' in gui_current_format:
                    MW.progressBarTick.emit('Creating MOBI files')
                    MW.progressBarTick.emit(str(len(outputPath) * 2 + 1))
                    MW.progressBarTick.emit('tick')
@@ -435,7 +432,7 @@ class SystemTrayIcon(QtWidgets.QSystemTrayIcon):
    def __init__(self):
        super().__init__()
        if self.isSystemTrayAvailable():
-            QtWidgets.QSystemTrayIcon.__init__(self, GUI.icons.programIcon, MW)
+            self.setIcon(GUI.icons.programIcon)
            self.activated.connect(self.catchClicks)
    def catchClicks(self):
@@ -444,7 +441,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 +551,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 +559,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)
@@ -648,6 +645,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
        if not GUI.webtoonBox.isChecked():
            GUI.qualityBox.setEnabled(profile['PVOptions'])
        GUI.upscaleBox.setChecked(profile['DefaultUpscale'])
        GUI.mangaBox.setChecked(True)
        if not profile['PVOptions']:
            GUI.qualityBox.setChecked(False)
        if str(GUI.deviceBox.currentText()) == 'Other':
@@ -662,7 +660,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
            GUI.formatBox.setCurrentIndex(profile['DefaultFormat'])
        if not GUI.webtoonBox.isChecked():
            GUI.qualityBox.setEnabled(profile['PVOptions'])
-        if str(GUI.formatBox.currentText()) == 'MOBI/AZW3':
+        if GUI.formats[str(GUI.formatBox.currentText())]['format'] == 'MOBI':
            GUI.outputSplit.setEnabled(True)
        else:
            GUI.outputSplit.setEnabled(False)
@@ -693,7 +691,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 +719,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'):
@@ -744,22 +742,21 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                self.addMessage('Target resolution is not set!', 'error')
                self.needClean = True
                return
-            if str(GUI.formatBox.currentText()) == 'MOBI/AZW3' and not self.kindleGen:
+            if 'MOBI' in GUI.formats[str(GUI.formatBox.currentText())]['format'] and not self.kindleGen:
                self.detectKindleGen()
                if not self.kindleGen:
                    GUI.jobList.clear()
-                    self.addMessage('Cannot find <a href="http://www.amazon.com/gp/feature.html?ie=UTF8&docId='
+                    self.display_kindlegen_missing()
                                    '1000765211"><b>KindleGen</b></a>! MOBI conversion is unavailable!', 'error')
                    if sys.platform.startswith('win'):
                        self.addMessage('Download it and place EXE in KCC directory.', 'error')
                    elif sys.platform.startswith('darwin'):
                        self.addMessage('Install it using <a href="http://brew.sh/">Homebrew</a>.', 'error')
                    else:
                        self.addMessage('Download it and place executable in /usr/local/bin directory.', 'error')
                    self.needClean = True
                    return
            self.worker.start()
    def display_kindlegen_missing(self):
        self.addMessage(
            '<a href="https://github.com/ciromattia/kcc/wiki/Installation#kindlegen"><b>Cannot find KindleGen</b></a>: MOBI conversion is unavailable!', 
            'error'
        )
    def saveSettings(self, event):
        if self.conversionAlive:
            GUI.convertButton.setEnabled(False)
@@ -775,23 +772,23 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
        self.settings.setValue('currentFormat', GUI.formatBox.currentIndex())
        self.settings.setValue('startNumber', self.startNumber + 1)
        self.settings.setValue('windowSize', str(MW.size().width()) + 'x' + str(MW.size().height()))
-        self.settings.setValue('options', {'mangaBox': GUI.mangaBox.checkState(),
+        self.settings.setValue('options', {'mangaBox': GUI.mangaBox.checkState().value,
-                                           'rotateBox': GUI.rotateBox.checkState(),
+                                           'rotateBox': GUI.rotateBox.checkState().value,
-                                           'qualityBox': GUI.qualityBox.checkState(),
+                                           'qualityBox': GUI.qualityBox.checkState().value,
-                                           'gammaBox': GUI.gammaBox.checkState(),
+                                           'gammaBox': GUI.gammaBox.checkState().value,
-                                           'croppingBox': GUI.croppingBox.checkState(),
+                                           'croppingBox': GUI.croppingBox.checkState().value,
                                           'croppingPowerSlider': float(self.croppingPowerValue) * 100,
-                                           'upscaleBox': GUI.upscaleBox.checkState(),
+                                           'upscaleBox': GUI.upscaleBox.checkState().value,
-                                           'borderBox': GUI.borderBox.checkState(),
+                                           'borderBox': GUI.borderBox.checkState().value,
-                                           'webtoonBox': GUI.webtoonBox.checkState(),
+                                           'webtoonBox': GUI.webtoonBox.checkState().value,
-                                           'outputSplit': GUI.outputSplit.checkState(),
+                                           'outputSplit': GUI.outputSplit.checkState().value,
-                                           'colorBox': GUI.colorBox.checkState(),
+                                           'colorBox': GUI.colorBox.checkState().value,
-                                           'disableProcessingBox': GUI.disableProcessingBox.checkState(),
+                                           'disableProcessingBox': GUI.disableProcessingBox.checkState().value,
-                                           'mozJpegBox': GUI.mozJpegBox.checkState(),
+                                           'mozJpegBox': GUI.mozJpegBox.checkState().value,
                                           'widthBox': GUI.widthBox.value(),
                                           'heightBox': GUI.heightBox.value(),
-                                           'deleteBox': GUI.deleteBox.checkState(),
+                                           'deleteBox': GUI.deleteBox.checkState().value,
-                                           'maximizeStrips': GUI.maximizeStrips.checkState(),
+                                           'maximizeStrips': GUI.maximizeStrips.checkState().value,
                                           'gammaSlider': float(self.gammaValue) * 100})
        self.settings.sync()
        self.tray.hide()
@@ -853,22 +850,21 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                if 'Amazon kindlegen' in line:
                    versionCheck = line.split('V')[1].split(' ')[0]
                    if StrictVersion(versionCheck) < StrictVersion('2.9'):
-                        self.addMessage('Your <a href="http://www.amazon.com/gp/feature.html?ie=UTF8&docId='
+                        self.addMessage('Your <a href="https://www.amazon.com/b?node=23496309011">KindleGen</a>'
-                                        '1000765211">KindleGen</a> is outdated! MOBI conversion might fail.', 'warning')
+                                        ' is outdated! MOBI conversion might fail.', 'warning')
                    break
            where_command = 'where kindlegen.exe'
            if os.name == 'posix':
                where_command = 'which kindlegen'
            process = subprocess.run(where_command, stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
            locations = process.stdout.decode('utf-8').split('\n')
            self.addMessage(f"<b>KindleGen Found:</b> {locations[0]}", 'info')
        else:
            self.kindleGen = False
            if startup:
-                self.addMessage('Cannot find <a href="http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211">'
+                self.display_kindlegen_missing()
-                                '<b>KindleGen</b></a>! MOBI conversion will be unavailable!', 'error')
+
-                if sys.platform.startswith('win'):
+
                    self.addMessage('Download it and place EXE in KCC directory.', 'error')
                elif sys.platform.startswith('darwin'):
                    self.addMessage('Install it using <a href="http://brew.sh/">Homebrew</a>: '
                                    '<i>brew install --cask kindle-comic-creator</i> or '
                                    '<i>brew install --cask kindle-previewer</i>', 'error')
                else:
                    self.addMessage('Download it and place executable in /usr/local/bin directory.', 'error')
    def __init__(self, kccapp, kccwindow):
        global APP, MW, GUI
@@ -918,6 +914,16 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
            if self.windowSize == '0x0':
                MW.resize(500, 500)
        self.formats = {  # text, icon, data/option_format
            "MOBI/AZW3": {'icon': 'MOBI', 'format': 'MOBI'},
            "EPUB": {'icon': 'EPUB', 'format': 'EPUB'},
            "CBZ": {'icon': 'CBZ', 'format': 'CBZ'},
            "EPUB (Calibre KFX)": {'icon': 'EPUB', 'format': 'KFX'},
            "MOBI + EPUB": {'icon': 'MOBI', 'format': 'MOBI+EPUB'},
            "EPUB (200MB limit)": {'icon': 'EPUB', 'format': 'EPUB-200MB'}
        }
        self.profiles = {
            "Kindle Oasis 2/3": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0,
                                 'DefaultUpscale': True, 'Label': 'KO'},
@@ -926,7 +932,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
            "Kindle Voyage": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0,
                              'DefaultUpscale': True, 'Label': 'KV'},
            "Kindle Scribe": {
-                'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'Label': 'KS',
+                'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'Label': 'KS',
            },
            "Kindle 11": {
                'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'Label': 'K11',
@@ -1024,7 +1030,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                                          'com/ciromattia/kcc/blob/master/README.md#issues--new-features--donations">DO'
                                          'NATE</a> - <a href="http://www.mobileread.com/forums/showthread.php?t=207461'
                                          '">FORUM</a></b>')
-        statusBarLabel.setAlignment(QtCore.Qt.AlignCenter)
+        statusBarLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
        statusBarLabel.setOpenExternalLinks(True)
        GUI.statusBar.addPermanentWidget(statusBarLabel, 1)
@@ -1040,8 +1046,8 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
            self.sevenzip = True
        else:
            self.sevenzip = False
-            self.addMessage('Add <a href="http://www.7-zip.org/download.html">7z</a> to PATH!'
+            self.addMessage('<a href="https://github.com/ciromattia/kcc/wiki/Installation#7-zip">Cannot find 7z</a>!'
-                            ' Processing of archives will be disabled.', 'warning')
+                            ' CBZ/CBR/ZIP/etc processing disabled.', 'warning')
        self.detectKindleGen(True)
        APP.messageFromOtherInstance.connect(self.handleMessage)
@@ -1082,9 +1088,8 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                GUI.deviceBox.addItem(self.icons.deviceKobo, profile)
            else:
                GUI.deviceBox.addItem(self.icons.deviceKindle, profile)
-        for f in ['MOBI/AZW3', 'EPUB', 'CBZ', 'KFX', 'MOBI+EPUB', 'EPUB-200MB']:
+        for f in self.formats:
-            format_prefix = f.replace('/AZW3', '').replace('+', '').replace('-', '')
+            GUI.formatBox.addItem(eval('self.icons.' + self.formats[f]['icon'] + 'Format'), f)
            GUI.formatBox.addItem(eval('self.icons.' + format_prefix + 'Format'), f)
        if self.lastDevice > GUI.deviceBox.count():
            self.lastDevice = 0
        if profilesGUI[self.lastDevice] == "Separator":
@@ -1111,7 +1116,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(Qt.CheckState(self.options[option]))
                except AttributeError:
                    pass
        self.worker.sync()
@@ -1185,7 +1190,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'):
--- a/kindlecomicconverter/KCC_rc.py
+++ b/kindlecomicconverter/KCC_rc.py
--- a/kindlecomicconverter/KCC_ui.py
+++ b/kindlecomicconverter/KCC_ui.py
@@ -1,321 +1,454 @@
 # -*- coding: utf-8 -*-
-# Form implementation generated from reading ui file 'gui/KCC.ui'
+################################################################################
-#
+## Form generated from reading UI file 'KCC.ui'
-# Created by: PyQt5 UI code generator 5.15.7
+##
-#
+## Created by: Qt User Interface Compiler version 6.5.1
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+##
-# run again.  Do not edit this file unless you know what you are doing.
+## WARNING! All changes made in this file will be lost when recompiling UI file!
-
+################################################################################
 from PyQt5 import QtCore, QtGui, QtWidgets
 from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
    QMetaObject, QObject, QPoint, QRect,
    QSize, QTime, QUrl, Qt)
 from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
    QFont, QFontDatabase, QGradient, QIcon,
    QImage, QKeySequence, QLinearGradient, QPainter,
    QPalette, QPixmap, QRadialGradient, QTransform)
 from PySide6.QtWidgets import (QAbstractItemView, QApplication, QCheckBox, QComboBox,
    QGridLayout, QHBoxLayout, QLabel, QListWidget,
    QListWidgetItem, QMainWindow, QProgressBar, QPushButton,
    QSizePolicy, QSlider, QSpinBox, QStatusBar,
    QWidget)
 from . import KCC_rc
 class Ui_mainWindow(object):
    def setupUi(self, mainWindow):
-        mainWindow.setObjectName("mainWindow")
+        if not mainWindow.objectName():
            mainWindow.setObjectName(u"mainWindow")
        mainWindow.resize(450, 400)
-        icon = QtGui.QIcon()
+        icon = QIcon()
-        icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon.addFile(u":/Icon/icons/comic2ebook.png", QSize(), QIcon.Normal, QIcon.Off)
        mainWindow.setWindowIcon(icon)
-        self.centralWidget = QtWidgets.QWidget(mainWindow)
+        self.centralWidget = QWidget(mainWindow)
-        self.centralWidget.setObjectName("centralWidget")
+        self.centralWidget.setObjectName(u"centralWidget")
-        self.gridLayout = QtWidgets.QGridLayout(self.centralWidget)
+        self.gridLayout = QGridLayout(self.centralWidget)
        self.gridLayout.setObjectName(u"gridLayout")
        self.gridLayout.setContentsMargins(-1, -1, -1, 5)
-        self.gridLayout.setObjectName("gridLayout")
+        self.optionWidget = QWidget(self.centralWidget)
-        self.optionWidget = QtWidgets.QWidget(self.centralWidget)
+        self.optionWidget.setObjectName(u"optionWidget")
-        self.optionWidget.setObjectName("optionWidget")
+        self.gridLayout_2 = QGridLayout(self.optionWidget)
-        self.gridLayout_2 = QtWidgets.QGridLayout(self.optionWidget)
+        self.gridLayout_2.setObjectName(u"gridLayout_2")
        self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
-        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.upscaleBox = QCheckBox(self.optionWidget)
-        self.upscaleBox = QtWidgets.QCheckBox(self.optionWidget)
+        self.upscaleBox.setObjectName(u"upscaleBox")
        self.upscaleBox.setTristate(True)
-        self.upscaleBox.setObjectName("upscaleBox")
+
        self.gridLayout_2.addWidget(self.upscaleBox, 1, 1, 1, 1)
-        self.rotateBox = QtWidgets.QCheckBox(self.optionWidget)
+
        self.rotateBox = QCheckBox(self.optionWidget)
        self.rotateBox.setObjectName(u"rotateBox")
        self.rotateBox.setTristate(True)
-        self.rotateBox.setObjectName("rotateBox")
+
        self.gridLayout_2.addWidget(self.rotateBox, 0, 1, 1, 1)
-        self.outputSplit = QtWidgets.QCheckBox(self.optionWidget)
+
-        self.outputSplit.setObjectName("outputSplit")
+        self.outputSplit = QCheckBox(self.optionWidget)
        self.outputSplit.setObjectName(u"outputSplit")
        self.gridLayout_2.addWidget(self.outputSplit, 2, 1, 1, 1)
-        self.webtoonBox = QtWidgets.QCheckBox(self.optionWidget)
+
-        self.webtoonBox.setObjectName("webtoonBox")
+        self.webtoonBox = QCheckBox(self.optionWidget)
        self.webtoonBox.setObjectName(u"webtoonBox")
        self.gridLayout_2.addWidget(self.webtoonBox, 1, 0, 1, 1)
-        self.colorBox = QtWidgets.QCheckBox(self.optionWidget)
+
-        self.colorBox.setObjectName("colorBox")
+        self.colorBox = QCheckBox(self.optionWidget)
        self.colorBox.setObjectName(u"colorBox")
        self.gridLayout_2.addWidget(self.colorBox, 2, 2, 1, 1)
-        self.gammaBox = QtWidgets.QCheckBox(self.optionWidget)
+
-        self.gammaBox.setObjectName("gammaBox")
+        self.gammaBox = QCheckBox(self.optionWidget)
        self.gammaBox.setObjectName(u"gammaBox")
        self.gridLayout_2.addWidget(self.gammaBox, 1, 2, 1, 1)
-        self.borderBox = QtWidgets.QCheckBox(self.optionWidget)
+
        self.borderBox = QCheckBox(self.optionWidget)
        self.borderBox.setObjectName(u"borderBox")
        self.borderBox.setTristate(True)
-        self.borderBox.setObjectName("borderBox")
+
        self.gridLayout_2.addWidget(self.borderBox, 2, 0, 1, 1)
-        self.mangaBox = QtWidgets.QCheckBox(self.optionWidget)
+
-        self.mangaBox.setObjectName("mangaBox")
+        self.mangaBox = QCheckBox(self.optionWidget)
        self.mangaBox.setObjectName(u"mangaBox")
        self.gridLayout_2.addWidget(self.mangaBox, 0, 0, 1, 1)
-        self.qualityBox = QtWidgets.QCheckBox(self.optionWidget)
+
        self.qualityBox = QCheckBox(self.optionWidget)
        self.qualityBox.setObjectName(u"qualityBox")
        self.qualityBox.setTristate(True)
-        self.qualityBox.setObjectName("qualityBox")
+
        self.gridLayout_2.addWidget(self.qualityBox, 0, 2, 1, 1)
-        self.mozJpegBox = QtWidgets.QCheckBox(self.optionWidget)
+
        self.mozJpegBox = QCheckBox(self.optionWidget)
        self.mozJpegBox.setObjectName(u"mozJpegBox")
        self.mozJpegBox.setTristate(True)
-        self.mozJpegBox.setObjectName("mozJpegBox")
+
        self.gridLayout_2.addWidget(self.mozJpegBox, 3, 0, 1, 1)
-        self.maximizeStrips = QtWidgets.QCheckBox(self.optionWidget)
+
-        self.maximizeStrips.setObjectName("maximizeStrips")
+        self.maximizeStrips = QCheckBox(self.optionWidget)
        self.maximizeStrips.setObjectName(u"maximizeStrips")
        self.gridLayout_2.addWidget(self.maximizeStrips, 3, 1, 1, 1)
-        self.croppingBox = QtWidgets.QCheckBox(self.optionWidget)
+
        self.croppingBox = QCheckBox(self.optionWidget)
        self.croppingBox.setObjectName(u"croppingBox")
        self.croppingBox.setTristate(True)
-        self.croppingBox.setObjectName("croppingBox")
+
        self.gridLayout_2.addWidget(self.croppingBox, 3, 2, 1, 1)
-        self.deleteBox = QtWidgets.QCheckBox(self.optionWidget)
+
-        self.deleteBox.setObjectName("deleteBox")
+        self.deleteBox = QCheckBox(self.optionWidget)
        self.deleteBox.setObjectName(u"deleteBox")
        self.gridLayout_2.addWidget(self.deleteBox, 4, 1, 1, 1)
-        self.disableProcessingBox = QtWidgets.QCheckBox(self.optionWidget)
+
-        self.disableProcessingBox.setObjectName("disableProcessingBox")
+        self.disableProcessingBox = QCheckBox(self.optionWidget)
        self.disableProcessingBox.setObjectName(u"disableProcessingBox")
        self.gridLayout_2.addWidget(self.disableProcessingBox, 4, 2, 1, 1)
        self.gridLayout.addWidget(self.optionWidget, 5, 0, 1, 2)
-        self.gammaWidget = QtWidgets.QWidget(self.centralWidget)
+
        self.gammaWidget = QWidget(self.centralWidget)
        self.gammaWidget.setObjectName(u"gammaWidget")
        self.gammaWidget.setVisible(False)
-        self.gammaWidget.setObjectName("gammaWidget")
+        self.horizontalLayout_2 = QHBoxLayout(self.gammaWidget)
-        self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.gammaWidget)
+        self.horizontalLayout_2.setObjectName(u"horizontalLayout_2")
        self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0)
-        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+        self.gammaLabel = QLabel(self.gammaWidget)
-        self.gammaLabel = QtWidgets.QLabel(self.gammaWidget)
+        self.gammaLabel.setObjectName(u"gammaLabel")
-        self.gammaLabel.setObjectName("gammaLabel")
+
        self.horizontalLayout_2.addWidget(self.gammaLabel)
-        self.gammaSlider = QtWidgets.QSlider(self.gammaWidget)
+
        self.gammaSlider = QSlider(self.gammaWidget)
        self.gammaSlider.setObjectName(u"gammaSlider")
        self.gammaSlider.setMaximum(250)
        self.gammaSlider.setSingleStep(5)
-        self.gammaSlider.setOrientation(QtCore.Qt.Horizontal)
+        self.gammaSlider.setOrientation(Qt.Horizontal)
-        self.gammaSlider.setObjectName("gammaSlider")
+
        self.horizontalLayout_2.addWidget(self.gammaSlider)
        self.gridLayout.addWidget(self.gammaWidget, 6, 0, 1, 2)
-        self.croppingWidget = QtWidgets.QWidget(self.centralWidget)
+
        self.croppingWidget = QWidget(self.centralWidget)
        self.croppingWidget.setObjectName(u"croppingWidget")
        self.croppingWidget.setVisible(False)
-        self.croppingWidget.setObjectName("croppingWidget")
+        self.horizontalLayout_3 = QHBoxLayout(self.croppingWidget)
-        self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.croppingWidget)
+        self.horizontalLayout_3.setObjectName(u"horizontalLayout_3")
        self.horizontalLayout_3.setContentsMargins(0, 0, 0, 0)
-        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
+        self.croppingPowerLabel = QLabel(self.croppingWidget)
-        self.croppingPowerLabel = QtWidgets.QLabel(self.croppingWidget)
+        self.croppingPowerLabel.setObjectName(u"croppingPowerLabel")
-        self.croppingPowerLabel.setObjectName("croppingPowerLabel")
+
        self.horizontalLayout_3.addWidget(self.croppingPowerLabel)
-        self.croppingPowerSlider = QtWidgets.QSlider(self.croppingWidget)
+
        self.croppingPowerSlider = QSlider(self.croppingWidget)
        self.croppingPowerSlider.setObjectName(u"croppingPowerSlider")
        self.croppingPowerSlider.setMaximum(200)
        self.croppingPowerSlider.setSingleStep(1)
-        self.croppingPowerSlider.setOrientation(QtCore.Qt.Horizontal)
+        self.croppingPowerSlider.setOrientation(Qt.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)
+        self.buttonWidget = QWidget(self.centralWidget)
        self.buttonWidget.setObjectName(u"buttonWidget")
        sizePolicy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
        sizePolicy.setHorizontalStretch(0)
        sizePolicy.setVerticalStretch(0)
        sizePolicy.setHeightForWidth(self.buttonWidget.sizePolicy().hasHeightForWidth())
        self.buttonWidget.setSizePolicy(sizePolicy)
-        self.buttonWidget.setObjectName("buttonWidget")
+        self.gridLayout_4 = QGridLayout(self.buttonWidget)
-        self.gridLayout_4 = QtWidgets.QGridLayout(self.buttonWidget)
+        self.gridLayout_4.setObjectName(u"gridLayout_4")
        self.gridLayout_4.setContentsMargins(0, 0, 0, 0)
-        self.gridLayout_4.setObjectName("gridLayout_4")
+        self.directoryButton = QPushButton(self.buttonWidget)
-        self.directoryButton = QtWidgets.QPushButton(self.buttonWidget)
+        self.directoryButton.setObjectName(u"directoryButton")
-        self.directoryButton.setMinimumSize(QtCore.QSize(0, 30))
+        self.directoryButton.setMinimumSize(QSize(0, 30))
-        icon1 = QtGui.QIcon()
+        icon1 = QIcon()
-        icon1.addPixmap(QtGui.QPixmap(":/Other/icons/folder_new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon1.addFile(u":/Other/icons/folder_new.png", QSize(), QIcon.Normal, QIcon.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))
+        self.fileButton = QPushButton(self.buttonWidget)
-        icon2 = QtGui.QIcon()
+        self.fileButton.setObjectName(u"fileButton")
-        icon2.addPixmap(QtGui.QPixmap(":/Other/icons/document_new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.fileButton.setMinimumSize(QSize(0, 30))
        icon2 = QIcon()
        icon2.addFile(u":/Other/icons/document_new.png", QSize(), QIcon.Normal, QIcon.Off)
        self.fileButton.setIcon(icon2)
-        self.fileButton.setObjectName("fileButton")
+
        self.gridLayout_4.addWidget(self.fileButton, 0, 3, 1, 1)
-        self.deviceBox = QtWidgets.QComboBox(self.buttonWidget)
+
-        self.deviceBox.setMinimumSize(QtCore.QSize(0, 28))
+        self.deviceBox = QComboBox(self.buttonWidget)
-        self.deviceBox.setObjectName("deviceBox")
+        self.deviceBox.setObjectName(u"deviceBox")
        self.deviceBox.setMinimumSize(QSize(0, 28))
        self.gridLayout_4.addWidget(self.deviceBox, 1, 0, 1, 1)
-        self.formatBox = QtWidgets.QComboBox(self.buttonWidget)
+
-        self.formatBox.setMinimumSize(QtCore.QSize(0, 28))
+        self.formatBox = QComboBox(self.buttonWidget)
-        self.formatBox.setObjectName("formatBox")
+        self.formatBox.setObjectName(u"formatBox")
        self.formatBox.setMinimumSize(QSize(0, 28))
        self.gridLayout_4.addWidget(self.formatBox, 1, 3, 1, 1)
-        self.convertButton = QtWidgets.QPushButton(self.buttonWidget)
+
-        self.convertButton.setMinimumSize(QtCore.QSize(0, 30))
+        self.convertButton = QPushButton(self.buttonWidget)
-        font = QtGui.QFont()
+        self.convertButton.setObjectName(u"convertButton")
        self.convertButton.setMinimumSize(QSize(0, 30))
        font = QFont()
        font.setBold(True)
        self.convertButton.setFont(font)
-        icon3 = QtGui.QIcon()
+        icon3 = QIcon()
-        icon3.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon3.addFile(u":/Other/icons/convert.png", QSize(), QIcon.Normal, QIcon.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))
+        self.clearButton = QPushButton(self.buttonWidget)
-        icon4 = QtGui.QIcon()
+        self.clearButton.setObjectName(u"clearButton")
-        icon4.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.clearButton.setMinimumSize(QSize(0, 30))
        icon4 = QIcon()
        icon4.addFile(u":/Other/icons/clear.png", QSize(), QIcon.Normal, QIcon.Off)
        self.clearButton.setIcon(icon4)
-        self.clearButton.setObjectName("clearButton")
+
        self.gridLayout_4.addWidget(self.clearButton, 0, 2, 1, 1)
        self.directoryButton.raise_()
        self.clearButton.raise_()
        self.fileButton.raise_()
        self.deviceBox.raise_()
        self.convertButton.raise_()
        self.formatBox.raise_()
        self.gridLayout.addWidget(self.buttonWidget, 3, 0, 1, 2)
-        self.toolWidget = QtWidgets.QWidget(self.centralWidget)
+
-        self.toolWidget.setObjectName("toolWidget")
+        self.toolWidget = QWidget(self.centralWidget)
-        self.horizontalLayout = QtWidgets.QHBoxLayout(self.toolWidget)
+        self.toolWidget.setObjectName(u"toolWidget")
        self.horizontalLayout = QHBoxLayout(self.toolWidget)
        self.horizontalLayout.setObjectName(u"horizontalLayout")
        self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
-        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.editorButton = QPushButton(self.toolWidget)
-        self.editorButton = QtWidgets.QPushButton(self.toolWidget)
+        self.editorButton.setObjectName(u"editorButton")
-        self.editorButton.setMinimumSize(QtCore.QSize(0, 30))
+        self.editorButton.setMinimumSize(QSize(0, 30))
-        icon5 = QtGui.QIcon()
+        icon5 = QIcon()
-        icon5.addPixmap(QtGui.QPixmap(":/Other/icons/editor.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon5.addFile(u":/Other/icons/editor.png", QSize(), QIcon.Normal, QIcon.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))
+        self.wikiButton = QPushButton(self.toolWidget)
-        icon6 = QtGui.QIcon()
+        self.wikiButton.setObjectName(u"wikiButton")
-        icon6.addPixmap(QtGui.QPixmap(":/Other/icons/wiki.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.wikiButton.setMinimumSize(QSize(0, 30))
        icon6 = QIcon()
        icon6.addFile(u":/Other/icons/wiki.png", QSize(), QIcon.Normal, QIcon.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 = QListWidget(self.centralWidget)
-        self.jobList.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
+        self.jobList.setObjectName(u"jobList")
-        self.jobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
+        self.jobList.setStyleSheet(u"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.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
+        self.jobList.setSelectionMode(QAbstractItemView.NoSelection)
-        self.jobList.setObjectName("jobList")
+        self.jobList.setVerticalScrollMode(QAbstractItemView.ScrollPerPixel)
        self.jobList.setHorizontalScrollMode(QAbstractItemView.ScrollPerPixel)
        self.gridLayout.addWidget(self.jobList, 2, 0, 1, 2)
-        self.progressBar = QtWidgets.QProgressBar(self.centralWidget)
+
-        self.progressBar.setMinimumSize(QtCore.QSize(0, 30))
+        self.progressBar = QProgressBar(self.centralWidget)
-        font = QtGui.QFont()
+        self.progressBar.setObjectName(u"progressBar")
-        font.setBold(True)
+        self.progressBar.setMinimumSize(QSize(0, 30))
        self.progressBar.setFont(font)
        self.progressBar.setVisible(False)
-        self.progressBar.setAlignment(QtCore.Qt.AlignJustify|QtCore.Qt.AlignVCenter)
+        self.progressBar.setAlignment(Qt.AlignJustify|Qt.AlignVCenter)
-        self.progressBar.setObjectName("progressBar")
+
        self.gridLayout.addWidget(self.progressBar, 1, 0, 1, 2)
-        self.customWidget = QtWidgets.QWidget(self.centralWidget)
+
        self.customWidget = QWidget(self.centralWidget)
        self.customWidget.setObjectName(u"customWidget")
        self.customWidget.setVisible(False)
-        self.customWidget.setObjectName("customWidget")
+        self.gridLayout_3 = QGridLayout(self.customWidget)
-        self.gridLayout_3 = QtWidgets.QGridLayout(self.customWidget)
+        self.gridLayout_3.setObjectName(u"gridLayout_3")
        self.gridLayout_3.setContentsMargins(0, 0, 0, 0)
-        self.gridLayout_3.setObjectName("gridLayout_3")
+        self.hLabel = QLabel(self.customWidget)
-        self.hLabel = QtWidgets.QLabel(self.customWidget)
+        self.hLabel.setObjectName(u"hLabel")
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy1 = QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
+        sizePolicy1.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
+        sizePolicy1.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.hLabel.sizePolicy().hasHeightForWidth())
+        sizePolicy1.setHeightForWidth(self.hLabel.sizePolicy().hasHeightForWidth())
-        self.hLabel.setSizePolicy(sizePolicy)
+        self.hLabel.setSizePolicy(sizePolicy1)
-        self.hLabel.setObjectName("hLabel")
+
        self.gridLayout_3.addWidget(self.hLabel, 0, 2, 1, 1)
-        self.widthBox = QtWidgets.QSpinBox(self.customWidget)
+
        self.widthBox = QSpinBox(self.customWidget)
        self.widthBox.setObjectName(u"widthBox")
        self.widthBox.setMaximum(2160)
-        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)
+        self.wLabel = QLabel(self.customWidget)
-        sizePolicy.setHorizontalStretch(0)
+        self.wLabel.setObjectName(u"wLabel")
-        sizePolicy.setVerticalStretch(0)
+        sizePolicy1.setHeightForWidth(self.wLabel.sizePolicy().hasHeightForWidth())
-        sizePolicy.setHeightForWidth(self.wLabel.sizePolicy().hasHeightForWidth())
+        self.wLabel.setSizePolicy(sizePolicy1)
-        self.wLabel.setSizePolicy(sizePolicy)
+
        self.wLabel.setObjectName("wLabel")
        self.gridLayout_3.addWidget(self.wLabel, 0, 0, 1, 1)
-        self.heightBox = QtWidgets.QSpinBox(self.customWidget)
+
        self.heightBox = QSpinBox(self.customWidget)
        self.heightBox.setObjectName(u"heightBox")
        self.heightBox.setMaximum(3840)
-        self.heightBox.setObjectName("heightBox")
+
        self.gridLayout_3.addWidget(self.heightBox, 0, 3, 1, 1)
        self.gridLayout.addWidget(self.customWidget, 7, 0, 1, 2)
        mainWindow.setCentralWidget(self.centralWidget)
-        self.statusBar = QtWidgets.QStatusBar(mainWindow)
+        self.statusBar = QStatusBar(mainWindow)
        self.statusBar.setObjectName(u"statusBar")
        self.statusBar.setSizeGripEnabled(False)
        self.statusBar.setObjectName("statusBar")
        mainWindow.setStatusBar(self.statusBar)
        QWidget.setTabOrder(self.convertButton, self.clearButton)
        QWidget.setTabOrder(self.clearButton, self.directoryButton)
        QWidget.setTabOrder(self.directoryButton, self.fileButton)
        QWidget.setTabOrder(self.fileButton, self.deviceBox)
        QWidget.setTabOrder(self.deviceBox, self.formatBox)
        QWidget.setTabOrder(self.formatBox, self.mangaBox)
        QWidget.setTabOrder(self.mangaBox, self.rotateBox)
        QWidget.setTabOrder(self.rotateBox, self.qualityBox)
        QWidget.setTabOrder(self.qualityBox, self.webtoonBox)
        QWidget.setTabOrder(self.webtoonBox, self.upscaleBox)
        QWidget.setTabOrder(self.upscaleBox, self.gammaBox)
        QWidget.setTabOrder(self.gammaBox, self.borderBox)
        QWidget.setTabOrder(self.borderBox, self.outputSplit)
        QWidget.setTabOrder(self.outputSplit, self.colorBox)
        QWidget.setTabOrder(self.colorBox, self.croppingBox)
        QWidget.setTabOrder(self.croppingBox, self.mozJpegBox)
        QWidget.setTabOrder(self.mozJpegBox, self.maximizeStrips)
        QWidget.setTabOrder(self.maximizeStrips, self.deleteBox)
        QWidget.setTabOrder(self.deleteBox, self.disableProcessingBox)
        QWidget.setTabOrder(self.disableProcessingBox, self.editorButton)
        QWidget.setTabOrder(self.editorButton, self.wikiButton)
        QWidget.setTabOrder(self.wikiButton, self.jobList)
        QWidget.setTabOrder(self.jobList, self.gammaSlider)
        QWidget.setTabOrder(self.gammaSlider, self.widthBox)
        QWidget.setTabOrder(self.widthBox, self.heightBox)
        QWidget.setTabOrder(self.heightBox, self.croppingPowerSlider)
        self.retranslateUi(mainWindow)
-        QtCore.QMetaObject.connectSlotsByName(mainWindow)
+
-        mainWindow.setTabOrder(self.convertButton, self.clearButton)
+        QMetaObject.connectSlotsByName(mainWindow)
-        mainWindow.setTabOrder(self.clearButton, self.directoryButton)
+    # setupUi
        mainWindow.setTabOrder(self.directoryButton, self.fileButton)
        mainWindow.setTabOrder(self.fileButton, self.deviceBox)
        mainWindow.setTabOrder(self.deviceBox, self.formatBox)
        mainWindow.setTabOrder(self.formatBox, self.mangaBox)
        mainWindow.setTabOrder(self.mangaBox, self.rotateBox)
        mainWindow.setTabOrder(self.rotateBox, self.qualityBox)
        mainWindow.setTabOrder(self.qualityBox, self.webtoonBox)
        mainWindow.setTabOrder(self.webtoonBox, self.upscaleBox)
        mainWindow.setTabOrder(self.upscaleBox, self.gammaBox)
        mainWindow.setTabOrder(self.gammaBox, self.borderBox)
        mainWindow.setTabOrder(self.borderBox, self.outputSplit)
        mainWindow.setTabOrder(self.outputSplit, self.colorBox)
        mainWindow.setTabOrder(self.colorBox, self.croppingBox)
        mainWindow.setTabOrder(self.croppingBox, self.mozJpegBox)
        mainWindow.setTabOrder(self.mozJpegBox, self.maximizeStrips)
        mainWindow.setTabOrder(self.maximizeStrips, self.deleteBox)
        mainWindow.setTabOrder(self.deleteBox, self.disableProcessingBox)
        mainWindow.setTabOrder(self.disableProcessingBox, self.editorButton)
        mainWindow.setTabOrder(self.editorButton, self.wikiButton)
        mainWindow.setTabOrder(self.wikiButton, self.jobList)
        mainWindow.setTabOrder(self.jobList, self.gammaSlider)
        mainWindow.setTabOrder(self.gammaSlider, self.widthBox)
        mainWindow.setTabOrder(self.widthBox, self.heightBox)
        mainWindow.setTabOrder(self.heightBox, self.croppingPowerSlider)
    def retranslateUi(self, mainWindow):
-        _translate = QtCore.QCoreApplication.translate
+        mainWindow.setWindowTitle(QCoreApplication.translate("mainWindow", u"Kindle Comic Converter", None))
-        mainWindow.setWindowTitle(_translate("mainWindow", "Kindle Comic Converter"))
+#if QT_CONFIG(tooltip)
-        self.upscaleBox.setToolTip(_translate("mainWindow", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Nothing<br/></span>Images smaller than device resolution will not be resized.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Stretching<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be not preserved.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Upscaling<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be preserved.</p></body></html>"))
+        self.upscaleBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Nothing<br/></span>Images smaller than device resolution will not be resized.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Stretching<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be not preserved.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Upscaling<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be preserved.</p></body></html>", None))
-        self.upscaleBox.setText(_translate("mainWindow", "Stretch/Upscale"))
+#endif // QT_CONFIG(tooltip)
-        self.rotateBox.setToolTip(_translate("mainWindow", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Split<br/></span>Double page spreads will be cut into two separate pages.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Rotate and split<br/></span>Double page spreads will be displayed twice. First rotated and then split. </p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Rotate<br/></span>Double page spreads will be rotated.</p></body></html>"))
+        self.upscaleBox.setText(QCoreApplication.translate("mainWindow", u"Stretch/Upscale", None))
-        self.rotateBox.setText(_translate("mainWindow", "Spread splitter"))
+#if QT_CONFIG(tooltip)
-        self.outputSplit.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Automatic mode<br/></span>The output will be split automatically.</p><p style=\'white-space:pre\'><span style=\" font-weight:600; text-decoration: underline;\">Checked - Volume mode<br/></span>Every subdirectory will be considered as a separate volume.</p></body></html>"))
+        self.rotateBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Split<br/></span>Double page spreads will be cut into two separate pages.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Rotate and split<br/></span>Double page spreads will be displayed twice. First rotated and then split. </p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Rotate<br/></span>Double page spreads will be rotated.</p></body></html>", None))
-        self.outputSplit.setText(_translate("mainWindow", "Output split"))
+#endif // QT_CONFIG(tooltip)
-        self.webtoonBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Enable special parsing mode for Korean Webtoons.</p></body></html>"))
+        self.rotateBox.setText(QCoreApplication.translate("mainWindow", u"Spread splitter", None))
-        self.webtoonBox.setText(_translate("mainWindow", "Webtoon mode"))
+#if QT_CONFIG(tooltip)
-        self.colorBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Disable conversion to grayscale.</p></body></html>"))
+        self.outputSplit.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Automatic mode<br/></span>The output will be split automatically.</p><p style='white-space:pre'><span style=\" font-weight:600; text-decoration: underline;\">Checked - Volume mode<br/></span>Every subdirectory will be considered as a separate volume.</p></body></html>", None))
-        self.colorBox.setText(_translate("mainWindow", "Color mode"))
+#endif // QT_CONFIG(tooltip)
-        self.gammaBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Disable automatic gamma correction.</p></body></html>"))
+        self.outputSplit.setText(QCoreApplication.translate("mainWindow", u"Output split", None))
-        self.gammaBox.setText(_translate("mainWindow", "Custom gamma"))
+#if QT_CONFIG(tooltip)
-        self.borderBox.setToolTip(_translate("mainWindow", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Autodetection<br/></span>The color of margins fill will be detected automatically.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - White<br/></span>Margins will be filled with white color.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Black<br/></span>Margins will be filled with black color.</p></body></html>"))
+        self.webtoonBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Enable special parsing mode for Korean Webtoons.</p></body></html>", None))
-        self.borderBox.setText(_translate("mainWindow", "W/B margins"))
+#endif // QT_CONFIG(tooltip)
-        self.mangaBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Enable right-to-left reading.</p></body></html>"))
+        self.webtoonBox.setText(QCoreApplication.translate("mainWindow", u"Webtoon mode", None))
-        self.mangaBox.setText(_translate("mainWindow", "Manga mode"))
+#if QT_CONFIG(tooltip)
-        self.qualityBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - 4 panels<br/></span>Zoom each corner separately.</p><p style=\'white-space:pre\'><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - 2 panels<br/></span>Zoom only the top and bottom of the page.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - 4 high-quality panels<br/></span>Zoom each corner separately. Try to increase the quality of magnification. Check wiki for more details.</p></body></html>"))
+        self.colorBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Disable conversion to grayscale.</p></body></html>", None))
-        self.qualityBox.setText(_translate("mainWindow", "Panel View 4/2/HQ"))
+#endif // QT_CONFIG(tooltip)
-        self.mozJpegBox.setToolTip(_translate("mainWindow", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - JPEG<br/></span>Use JPEG files</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - force PNG<br/></span>Create PNG files instead JPEG</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - mozJpeg<br/></span>10-20% smaller JPEG file, with the same image quality, but processing time multiplied by 2</p></body></html>"))
+        self.colorBox.setText(QCoreApplication.translate("mainWindow", u"Color mode", None))
-        self.mozJpegBox.setText(_translate("mainWindow", "JPEG/PNG/mozJpeg"))
+#if QT_CONFIG(tooltip)
-        self.maximizeStrips.setToolTip(_translate("mainWindow", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - 1x4<br/></span>Keep format 1x4 panels strips.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - 2x2<br/></span>Turn 1x4 strips to 2x2 to maximize screen usage.</p></body></html>"))
+        self.gammaBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Disable automatic gamma correction.</p></body></html>", None))
-        self.maximizeStrips.setText(_translate("mainWindow", "1x4 to 2x2 strips"))
+#endif // QT_CONFIG(tooltip)
-        self.croppingBox.setToolTip(_translate("mainWindow", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Disabled</span></p><p>Disabled</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Margins<br/></span>Margins</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Margins + page numbers<br/></span>Margins +page numbers</p></body></html>"))
+        self.gammaBox.setText(QCoreApplication.translate("mainWindow", u"Custom gamma", None))
-        self.croppingBox.setText(_translate("mainWindow", "Cropping mode"))
+#if QT_CONFIG(tooltip)
-        self.deleteBox.setToolTip(_translate("mainWindow", "Delete input file(s) or directory. It\'s not recoverable!"))
+        self.borderBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Autodetection<br/></span>The color of margins fill will be detected automatically.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - White<br/></span>Margins will be filled with white color.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Black<br/></span>Margins will be filled with black color.</p></body></html>", None))
-        self.deleteBox.setText(_translate("mainWindow", "Delete input"))
+#endif // QT_CONFIG(tooltip)
-        self.disableProcessingBox.setToolTip(_translate("mainWindow", "<html><head/><body><pre style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Do not process any image, ignore profile and processing options</pre></body></html>"))
+        self.borderBox.setText(QCoreApplication.translate("mainWindow", u"W/B margins", None))
-        self.disableProcessingBox.setText(_translate("mainWindow", "Disable processing"))
+#if QT_CONFIG(tooltip)
-        self.gammaLabel.setText(_translate("mainWindow", "Gamma: Auto"))
+        self.mangaBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Enable right-to-left reading.</p></body></html>", None))
-        self.croppingPowerLabel.setText(_translate("mainWindow", "Cropping power:"))
+#endif // QT_CONFIG(tooltip)
-        self.directoryButton.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Add directory containing JPG, PNG or GIF files to queue.<br/><span style=\" font-weight:600;\">CBR, CBZ and CB7 files inside will not be processed!</span></p></body></html>"))
+        self.mangaBox.setText(QCoreApplication.translate("mainWindow", u"Manga mode", None))
-        self.directoryButton.setText(_translate("mainWindow", "Add directory"))
+#if QT_CONFIG(tooltip)
-        self.fileButton.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Add CBR, CBZ, CB7 or PDF file to queue.</p></body></html>"))
+        self.qualityBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - 4 panels<br/></span>Zoom each corner separately.</p><p style='white-space:pre'><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - 2 panels<br/></span>Zoom only the top and bottom of the page.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - 4 high-quality panels<br/></span>Zoom each corner separately. Try to increase the quality of magnification. Check wiki for more details.</p></body></html>", None))
-        self.fileButton.setText(_translate("mainWindow", "Add file"))
+#endif // QT_CONFIG(tooltip)
-        self.deviceBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Target device.</p></body></html>"))
+        self.qualityBox.setText(QCoreApplication.translate("mainWindow", u"Panel View 4/2/HQ", None))
-        self.formatBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Output format.</p></body></html>"))
+#if QT_CONFIG(tooltip)
-        self.convertButton.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Shift+Click to select the output directory.</p></body></html>"))
+        self.mozJpegBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - JPEG<br/></span>Use JPEG files</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - force PNG<br/></span>Create PNG files instead JPEG</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - mozJpeg<br/></span>10-20% smaller JPEG file, with the same image quality, but processing time multiplied by 2</p></body></html>", None))
-        self.convertButton.setText(_translate("mainWindow", "Convert"))
+#endif // QT_CONFIG(tooltip)
-        self.clearButton.setText(_translate("mainWindow", "Clear list"))
+        self.mozJpegBox.setText(QCoreApplication.translate("mainWindow", u"JPEG/PNG/mozJpeg", None))
-        self.editorButton.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Shift+Click to edit directory.</p></body></html>"))
+#if QT_CONFIG(tooltip)
-        self.editorButton.setText(_translate("mainWindow", "Editor"))
+        self.maximizeStrips.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - 1x4<br/></span>Keep format 1x4 panels strips.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - 2x2<br/></span>Turn 1x4 strips to 2x2 to maximize screen usage.</p></body></html>", None))
-        self.wikiButton.setText(_translate("mainWindow", "Wiki"))
+#endif // QT_CONFIG(tooltip)
-        self.hLabel.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Resolution of the target device.</p></body></html>"))
+        self.maximizeStrips.setText(QCoreApplication.translate("mainWindow", u"1x4 to 2x2 strips", None))
-        self.hLabel.setText(_translate("mainWindow", "Custom height:"))
+#if QT_CONFIG(tooltip)
-        self.widthBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Resolution of the target device.</p></body></html>"))
+        self.croppingBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Disabled</span></p><p>Disabled</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Margins<br/></span>Margins</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Margins + page numbers<br/></span>Margins +page numbers</p></body></html>", None))
-        self.wLabel.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Resolution of the target device.</p></body></html>"))
+#endif // QT_CONFIG(tooltip)
-        self.wLabel.setText(_translate("mainWindow", "Custom width:"))
+        self.croppingBox.setText(QCoreApplication.translate("mainWindow", u"Cropping mode", None))
-        self.heightBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Resolution of the target device.</p></body></html>"))
+#if QT_CONFIG(tooltip)
-from . import KCC_rc
+        self.deleteBox.setToolTip(QCoreApplication.translate("mainWindow", u"Delete input file(s) or directory. It's not recoverable!", None))
 #endif // QT_CONFIG(tooltip)
        self.deleteBox.setText(QCoreApplication.translate("mainWindow", u"Delete input", None))
 #if QT_CONFIG(tooltip)
        self.disableProcessingBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><pre style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Do not process any image, ignore profile and processing options</pre></body></html>", None))
 #endif // QT_CONFIG(tooltip)
        self.disableProcessingBox.setText(QCoreApplication.translate("mainWindow", u"Disable processing", None))
        self.gammaLabel.setText(QCoreApplication.translate("mainWindow", u"Gamma: Auto", None))
        self.croppingPowerLabel.setText(QCoreApplication.translate("mainWindow", u"Cropping power:", None))
 #if QT_CONFIG(tooltip)
        self.directoryButton.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Add directory containing JPG, PNG or GIF files to queue.<br/><span style=\" font-weight:600;\">CBR, CBZ and CB7 files inside will not be processed!</span></p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
        self.directoryButton.setText(QCoreApplication.translate("mainWindow", u"Add directory", None))
 #if QT_CONFIG(tooltip)
        self.fileButton.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Add CBR, CBZ, CB7 or PDF file to queue.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
        self.fileButton.setText(QCoreApplication.translate("mainWindow", u"Add file", None))
 #if QT_CONFIG(tooltip)
        self.deviceBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Target device.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
 #if QT_CONFIG(tooltip)
        self.formatBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Output format.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
 #if QT_CONFIG(tooltip)
        self.convertButton.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Shift+Click to select the output directory.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
        self.convertButton.setText(QCoreApplication.translate("mainWindow", u"Convert", None))
        self.clearButton.setText(QCoreApplication.translate("mainWindow", u"Clear list", None))
 #if QT_CONFIG(tooltip)
        self.editorButton.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Shift+Click to edit directory.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
        self.editorButton.setText(QCoreApplication.translate("mainWindow", u"Editor", None))
        self.wikiButton.setText(QCoreApplication.translate("mainWindow", u"Wiki", None))
 #if QT_CONFIG(tooltip)
        self.hLabel.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Resolution of the target device.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
        self.hLabel.setText(QCoreApplication.translate("mainWindow", u"Custom height:", None))
 #if QT_CONFIG(tooltip)
        self.widthBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Resolution of the target device.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
 #if QT_CONFIG(tooltip)
        self.wLabel.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Resolution of the target device.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
        self.wLabel.setText(QCoreApplication.translate("mainWindow", u"Custom width:", None))
 #if QT_CONFIG(tooltip)
        self.heightBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Resolution of the target device.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
    # retranslateUi
--- a/kindlecomicconverter/KCC_ui_editor.py
+++ b/kindlecomicconverter/KCC_ui_editor.py
@@ -1,118 +1,168 @@
 # -*- coding: utf-8 -*-
-# Form implementation generated from reading ui file 'gui/MetaEditor.ui'
+################################################################################
-#
+## Form generated from reading UI file 'MetaEditor.ui'
-# Created by: PyQt5 UI code generator 5.15.2
+##
-#
+## Created by: Qt User Interface Compiler version 6.5.1
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+##
-# run again.  Do not edit this file unless you know what you are doing.
+## WARNING! All changes made in this file will be lost when recompiling UI file!
-
+################################################################################
 from PyQt5 import QtCore, QtGui, QtWidgets
 from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
    QMetaObject, QObject, QPoint, QRect,
    QSize, QTime, QUrl, Qt)
 from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
    QFont, QFontDatabase, QGradient, QIcon,
    QImage, QKeySequence, QLinearGradient, QPainter,
    QPalette, QPixmap, QRadialGradient, QTransform)
 from PySide6.QtWidgets import (QApplication, QDialog, QGridLayout, QHBoxLayout,
    QLabel, QLineEdit, QPushButton, QSizePolicy,
    QVBoxLayout, QWidget)
 from . import KCC_rc
 class Ui_editorDialog(object):
    def setupUi(self, editorDialog):
-        editorDialog.setObjectName("editorDialog")
+        if not editorDialog.objectName():
            editorDialog.setObjectName(u"editorDialog")
        editorDialog.resize(400, 260)
-        editorDialog.setMinimumSize(QtCore.QSize(400, 260))
+        editorDialog.setMinimumSize(QSize(400, 260))
-        icon = QtGui.QIcon()
+        icon = QIcon()
-        icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon.addFile(u":/Icon/icons/comic2ebook.png", QSize(), QIcon.Normal, QIcon.Off)
        editorDialog.setWindowIcon(icon)
-        self.verticalLayout = QtWidgets.QVBoxLayout(editorDialog)
+        self.verticalLayout = QVBoxLayout(editorDialog)
        self.verticalLayout.setObjectName(u"verticalLayout")
        self.verticalLayout.setContentsMargins(-1, -1, -1, 5)
-        self.verticalLayout.setObjectName("verticalLayout")
+        self.editorWidget = QWidget(editorDialog)
-        self.editorWidget = QtWidgets.QWidget(editorDialog)
+        self.editorWidget.setObjectName(u"editorWidget")
-        self.editorWidget.setObjectName("editorWidget")
+        self.gridLayout = QGridLayout(self.editorWidget)
-        self.gridLayout = QtWidgets.QGridLayout(self.editorWidget)
+        self.gridLayout.setObjectName(u"gridLayout")
        self.gridLayout.setContentsMargins(0, 0, 0, 0)
-        self.gridLayout.setObjectName("gridLayout")
+        self.label_1 = QLabel(self.editorWidget)
-        self.label_1 = QtWidgets.QLabel(self.editorWidget)
+        self.label_1.setObjectName(u"label_1")
-        self.label_1.setObjectName("label_1")
+
        self.gridLayout.addWidget(self.label_1, 0, 0, 1, 1)
-        self.seriesLine = QtWidgets.QLineEdit(self.editorWidget)
+
-        self.seriesLine.setObjectName("seriesLine")
+        self.seriesLine = QLineEdit(self.editorWidget)
        self.seriesLine.setObjectName(u"seriesLine")
        self.gridLayout.addWidget(self.seriesLine, 0, 1, 1, 1)
-        self.label_2 = QtWidgets.QLabel(self.editorWidget)
+
-        self.label_2.setObjectName("label_2")
+        self.label_2 = QLabel(self.editorWidget)
        self.label_2.setObjectName(u"label_2")
        self.gridLayout.addWidget(self.label_2, 1, 0, 1, 1)
-        self.volumeLine = QtWidgets.QLineEdit(self.editorWidget)
+
-        self.volumeLine.setObjectName("volumeLine")
+        self.volumeLine = QLineEdit(self.editorWidget)
        self.volumeLine.setObjectName(u"volumeLine")
        self.gridLayout.addWidget(self.volumeLine, 1, 1, 1, 1)
-        self.label_3 = QtWidgets.QLabel(self.editorWidget)
+
-        self.label_3.setObjectName("label_3")
+        self.label_3 = QLabel(self.editorWidget)
        self.label_3.setObjectName(u"label_3")
        self.gridLayout.addWidget(self.label_3, 2, 0, 1, 1)
-        self.numberLine = QtWidgets.QLineEdit(self.editorWidget)
+
-        self.numberLine.setObjectName("numberLine")
+        self.numberLine = QLineEdit(self.editorWidget)
        self.numberLine.setObjectName(u"numberLine")
        self.gridLayout.addWidget(self.numberLine, 2, 1, 1, 1)
-        self.label_4 = QtWidgets.QLabel(self.editorWidget)
+
-        self.label_4.setObjectName("label_4")
+        self.label_4 = QLabel(self.editorWidget)
        self.label_4.setObjectName(u"label_4")
        self.gridLayout.addWidget(self.label_4, 3, 0, 1, 1)
-        self.writerLine = QtWidgets.QLineEdit(self.editorWidget)
+
-        self.writerLine.setObjectName("writerLine")
+        self.writerLine = QLineEdit(self.editorWidget)
        self.writerLine.setObjectName(u"writerLine")
        self.gridLayout.addWidget(self.writerLine, 3, 1, 1, 1)
-        self.label_5 = QtWidgets.QLabel(self.editorWidget)
+
-        self.label_5.setObjectName("label_5")
+        self.label_5 = QLabel(self.editorWidget)
        self.label_5.setObjectName(u"label_5")
        self.gridLayout.addWidget(self.label_5, 4, 0, 1, 1)
-        self.pencillerLine = QtWidgets.QLineEdit(self.editorWidget)
+
-        self.pencillerLine.setObjectName("pencillerLine")
+        self.pencillerLine = QLineEdit(self.editorWidget)
        self.pencillerLine.setObjectName(u"pencillerLine")
        self.gridLayout.addWidget(self.pencillerLine, 4, 1, 1, 1)
-        self.label_6 = QtWidgets.QLabel(self.editorWidget)
+
-        self.label_6.setObjectName("label_6")
+        self.label_6 = QLabel(self.editorWidget)
        self.label_6.setObjectName(u"label_6")
        self.gridLayout.addWidget(self.label_6, 5, 0, 1, 1)
-        self.inkerLine = QtWidgets.QLineEdit(self.editorWidget)
+
-        self.inkerLine.setObjectName("inkerLine")
+        self.inkerLine = QLineEdit(self.editorWidget)
        self.inkerLine.setObjectName(u"inkerLine")
        self.gridLayout.addWidget(self.inkerLine, 5, 1, 1, 1)
-        self.label_7 = QtWidgets.QLabel(self.editorWidget)
+
-        self.label_7.setObjectName("label_7")
+        self.label_7 = QLabel(self.editorWidget)
        self.label_7.setObjectName(u"label_7")
        self.gridLayout.addWidget(self.label_7, 6, 0, 1, 1)
-        self.coloristLine = QtWidgets.QLineEdit(self.editorWidget)
+
-        self.coloristLine.setObjectName("coloristLine")
+        self.coloristLine = QLineEdit(self.editorWidget)
        self.coloristLine.setObjectName(u"coloristLine")
        self.gridLayout.addWidget(self.coloristLine, 6, 1, 1, 1)
        self.verticalLayout.addWidget(self.editorWidget)
-        self.optionWidget = QtWidgets.QWidget(editorDialog)
+
-        self.optionWidget.setObjectName("optionWidget")
+        self.optionWidget = QWidget(editorDialog)
-        self.horizontalLayout = QtWidgets.QHBoxLayout(self.optionWidget)
+        self.optionWidget.setObjectName(u"optionWidget")
        self.horizontalLayout = QHBoxLayout(self.optionWidget)
        self.horizontalLayout.setObjectName(u"horizontalLayout")
        self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
-        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.statusLabel = QLabel(self.optionWidget)
-        self.statusLabel = QtWidgets.QLabel(self.optionWidget)
+        self.statusLabel.setObjectName(u"statusLabel")
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy = QSizePolicy(QSizePolicy.MinimumExpanding, QSizePolicy.MinimumExpanding)
        sizePolicy.setHorizontalStretch(0)
        sizePolicy.setVerticalStretch(0)
        sizePolicy.setHeightForWidth(self.statusLabel.sizePolicy().hasHeightForWidth())
        self.statusLabel.setSizePolicy(sizePolicy)
-        self.statusLabel.setText("")
+
        self.statusLabel.setObjectName("statusLabel")
        self.horizontalLayout.addWidget(self.statusLabel)
-        self.okButton = QtWidgets.QPushButton(self.optionWidget)
+
-        self.okButton.setMinimumSize(QtCore.QSize(0, 30))
+        self.okButton = QPushButton(self.optionWidget)
-        icon1 = QtGui.QIcon()
+        self.okButton.setObjectName(u"okButton")
-        icon1.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.okButton.setMinimumSize(QSize(0, 30))
        icon1 = QIcon()
        icon1.addFile(u":/Other/icons/convert.png", QSize(), QIcon.Normal, QIcon.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))
+        self.cancelButton = QPushButton(self.optionWidget)
-        icon2 = QtGui.QIcon()
+        self.cancelButton.setObjectName(u"cancelButton")
-        icon2.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cancelButton.setMinimumSize(QSize(0, 30))
        icon2 = QIcon()
        icon2.addFile(u":/Other/icons/clear.png", QSize(), QIcon.Normal, QIcon.Off)
        self.cancelButton.setIcon(icon2)
-        self.cancelButton.setObjectName("cancelButton")
+
        self.horizontalLayout.addWidget(self.cancelButton)
        self.verticalLayout.addWidget(self.optionWidget)
        self.retranslateUi(editorDialog)
-        QtCore.QMetaObject.connectSlotsByName(editorDialog)
+
        QMetaObject.connectSlotsByName(editorDialog)
    # setupUi
    def retranslateUi(self, editorDialog):
-        _translate = QtCore.QCoreApplication.translate
+        editorDialog.setWindowTitle(QCoreApplication.translate("editorDialog", u"Metadata editor", None))
-        editorDialog.setWindowTitle(_translate("editorDialog", "Metadata editor"))
+        self.label_1.setText(QCoreApplication.translate("editorDialog", u"Series:", None))
-        self.label_1.setText(_translate("editorDialog", "Series:"))
+        self.label_2.setText(QCoreApplication.translate("editorDialog", u"Volume:", None))
-        self.label_2.setText(_translate("editorDialog", "Volume:"))
+        self.label_3.setText(QCoreApplication.translate("editorDialog", u"Number:", None))
-        self.label_3.setText(_translate("editorDialog", "Number:"))
+        self.label_4.setText(QCoreApplication.translate("editorDialog", u"Writer:", None))
-        self.label_4.setText(_translate("editorDialog", "Writer:"))
+        self.label_5.setText(QCoreApplication.translate("editorDialog", u"Penciller:", None))
-        self.label_5.setText(_translate("editorDialog", "Penciller:"))
+        self.label_6.setText(QCoreApplication.translate("editorDialog", u"Inker:", None))
-        self.label_6.setText(_translate("editorDialog", "Inker:"))
+        self.label_7.setText(QCoreApplication.translate("editorDialog", u"Colorist:", None))
-        self.label_7.setText(_translate("editorDialog", "Colorist:"))
+        self.statusLabel.setText("")
-        self.okButton.setText(_translate("editorDialog", "Save"))
+        self.okButton.setText(QCoreApplication.translate("editorDialog", u"Save", None))
-        self.cancelButton.setText(_translate("editorDialog", "Cancel"))
+        self.cancelButton.setText(QCoreApplication.translate("editorDialog", u"Cancel", None))
-from . import KCC_rc
+    # retranslateUi
--- a/kindlecomicconverter/init.py
+++ b/kindlecomicconverter/init.py
@@ -1,4 +1,4 @@
-__version__ = '5.6.2'
+__version__ = '5.6.3'
 __license__ = 'ISC'
 __copyright__ = '2012-2022, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>, darodi'
 __docformat__ = 'restructuredtext en'
--- 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
@@ -295,13 +291,14 @@ def buildOPF(dstdir, title, filelist, cover=None):
                      "<meta name=\"zero-gutter\" content=\"true\"/>\n",
                      "<meta name=\"zero-margin\" content=\"true\"/>\n",
                      "<meta name=\"ke-border-color\" content=\"#FFFFFF\"/>\n",
-                      "<meta name=\"ke-border-width\" content=\"0\"/>\n"])
+                      "<meta name=\"ke-border-width\" content=\"0\"/>\n",
                      "<meta property=\"rendition:spread\">landscape</meta>\n",
                      "<meta property=\"rendition:layout\">pre-paginated</meta>\n",
                      "<meta name=\"orientation-lock\" content=\"none\"/>\n"])
        if options.kfx:
-            f.writelines(["<meta name=\"orientation-lock\" content=\"none\"/>\n",
+            f.writelines(["<meta name=\"region-mag\" content=\"false\"/>\n"])
                          "<meta name=\"region-mag\" content=\"false\"/>\n"])
        else:
-            f.writelines(["<meta name=\"orientation-lock\" content=\"portrait\"/>\n",
+            f.writelines(["<meta name=\"region-mag\" content=\"true\"/>\n"])
                          "<meta name=\"region-mag\" content=\"true\"/>\n"])
    elif options.supportSyntheticSpread:
        f.writelines([
            "<meta property=\"rendition:spread\">landscape</meta>\n",
@@ -513,18 +510,30 @@ def buildEPUB(path, chapternames, tomenumber):
    # Overwrite chapternames if tree is flat and ComicInfo.xml has bookmarks
    if not chapternames and options.chapters:
        chapterlist = []
-        globaldiff = 0
+
        global_diff = 0
        diff_delta = 0
        # if split
        if options.splitter == 0:
            diff_delta = 1
        # if rotate and split
        elif options.splitter == 2:
            diff_delta = 2
        for aChapter in options.chapters:
            pageid = aChapter[0]
-            for x in range(0, pageid + globaldiff + 1):
+            cur_diff = global_diff
            global_diff = 0
            for x in range(0, pageid + cur_diff + 1):
                if '-kcc-b' in filelist[x][1]:
-                    pageid += 1
+                    pageid += diff_delta
-            if '-kcc-c' in filelist[pageid][1]:
+                    global_diff += diff_delta
-                pageid -= 1
+
            filename = filelist[pageid][1]
            chapterlist.append((filelist[pageid][0].replace('Images', 'Text'), filename))
            chapternames[filename] = aChapter[1]
            globaldiff = pageid - (aChapter[0] + globaldiff)
    buildNCX(path, options.title, chapterlist, chapternames)
    buildNAV(path, options.title, chapterlist, chapternames)
    buildOPF(path, options.title, filelist, cover)
@@ -631,7 +640,7 @@ def getWorkFolder(afile):
                path = cbx.extract(workdir)
            except OSError as e:
                rmtree(workdir, True)
-                raise UserWarning(e.strerror)
+                raise UserWarning(e)
    else:
        raise UserWarning("Failed to open source file/directory.")
    sanitizePermissions(path)
@@ -695,7 +704,9 @@ def getComicInfo(path, originalpath):
            os.remove(xmlPath)
            return
        options.authors = []
-        if defaultTitle:
+        if xml.data['Title']:
            options.title = hescape(xml.data['Title'])
        elif defaultTitle:
            if xml.data['Series']:
                options.title = hescape(xml.data['Series'])
            if xml.data['Volume']:
@@ -746,19 +757,23 @@ def getPanelViewSize(deviceres, size):
 def sanitizeTree(filetree):
    chapterNames = {}
    for root, dirs, files in os.walk(filetree, False):
-        for name in files:
+        for i, name in enumerate(sorted(files)):
            splitname = os.path.splitext(name)
-            slugified = slugify(splitname[0], False)
+
-            while os.path.exists(os.path.join(root, slugified + splitname[1])) and splitname[0].upper()\
+            # file needs kcc at front AND back to avoid renaming issues
-                    != slugified.upper():
+            slugified = f'kcc-{i:04}'
-                slugified += "A"
+            for suffix in '-KCC', '-KCC-A', '-KCC-B', '-KCC-C':
                if splitname[0].endswith(suffix):
                    slugified += suffix.lower()
                    break
            newKey = os.path.join(root, slugified + splitname[1])
            key = os.path.join(root, name)
            if key != newKey:
                os.replace(key, newKey)
        for name in dirs:
            tmpName = name
-            slugified = slugify(name, True)
+            slugified = slugify(name)
            while os.path.exists(os.path.join(root, slugified)) and name.upper() != slugified.upper():
                slugified += "A"
            chapterNames[slugified] = tmpName
@@ -769,23 +784,6 @@ def sanitizeTree(filetree):
    return chapterNames
 def sanitizeTreeKobo(filetree):
    pageNumber = 0
    for root, dirs, files in os.walk(filetree):
        dirs, files = walkSort(dirs, files)
        for name in files:
            splitname = os.path.splitext(name)
            slugified = str(pageNumber).zfill(5)
            pageNumber += 1
            while os.path.exists(os.path.join(root, slugified + splitname[1])) and splitname[0].upper()\
                    != slugified.upper():
                slugified += "A"
            newKey = os.path.join(root, slugified + splitname[1])
            key = os.path.join(root, name)
            if key != newKey:
                os.replace(key, newKey)
 def sanitizePermissions(filetree):
    for root, dirs, files in os.walk(filetree, False):
        for name in files:
@@ -908,11 +906,8 @@ def createNewTome():
    return tomePath, tomePathRoot
-def slugify(value, isdir):
+def slugify(value):
-    if isdir:
+    value = slugify_ext(value, regex_pattern=r'[^-a-z0-9_\.]+').strip('.')
        value = slugify_ext(value, regex_pattern=r'[^-a-z0-9_\.]+').strip('.')
    else:
        value = slugify_ext(value).strip('.')
    value = sub(r'0*([0-9]{4,})', r'\1', sub(r'([0-9]+)', r'0000\1', value, count=2))
    return value
@@ -1159,8 +1154,6 @@ def makeBook(source, qtgui=None):
    if GUI:
        GUI.progressBarTick.emit('1')
    chapterNames = sanitizeTree(os.path.join(path, 'OEBPS', 'Images'))
    if 'Ko' in options.profile and options.format == 'CBZ':
        sanitizeTreeKobo(os.path.join(path, 'OEBPS', 'Images'))
    if options.batchsplit > 0:
        tomes = splitDirectory(path)
    else:
--- 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):
--- a/kindlecomicconverter/comicarchive.py
+++ b/kindlecomicconverter/comicarchive.py
@@ -19,6 +19,8 @@
 #
 import os
 import platform
 import subprocess
 import distro
 from psutil import Popen
 from shutil import move
@@ -65,6 +67,11 @@ class ComicArchive:
            process.communicate()
            if process.returncode != 0:
                raise OSError('Failed to extract archive.')
        elif process.returncode != 0 and platform.system() == 'Darwin':
            process = subprocess.run(f"unar '{self.filepath}' -f -o '{targetdir}'", 
                stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
            if process.returncode != 0:
                raise Exception(process.stdout.decode("utf-8"))
        elif process.returncode != 0:
            raise OSError('Failed to extract archive. Check if p7zip-rar is installed.')
        tdir = os.listdir(targetdir)
--- a/kindlecomicconverter/metadata.py
+++ b/kindlecomicconverter/metadata.py
@@ -34,7 +34,8 @@ class MetadataParser:
                     'Inkers': [],
                     'Colorists': [],
                     'Summary': '',
-                     'Bookmarks': []}
+                     'Bookmarks': [],
                     'Title': ''}
        self.rawdata = None
        self.format = None
        if self.source.endswith('.xml') and os.path.exists(self.source):
@@ -45,7 +46,7 @@ class MetadataParser:
                self.rawdata = cbx.extractMetadata()
                self.format = cbx.type
            except OSError as e:
-                raise UserWarning(e.strerror)
+                raise UserWarning(e)
        if self.rawdata:
            self.parseXML()
@@ -58,6 +59,8 @@ class MetadataParser:
            self.data['Number'] = self.rawdata.getElementsByTagName('Number')[0].firstChild.nodeValue
        if len(self.rawdata.getElementsByTagName('Summary')) != 0:
            self.data['Summary'] = self.rawdata.getElementsByTagName('Summary')[0].firstChild.nodeValue
        if len(self.rawdata.getElementsByTagName('Title')) != 0:
            self.data['Title'] = self.rawdata.getElementsByTagName('Title')[0].firstChild.nodeValue
        for field in ['Writer', 'Penciller', 'Inker', 'Colorist']:
            if len(self.rawdata.getElementsByTagName(field)) != 0:
                for person in self.rawdata.getElementsByTagName(field)[0].firstChild.nodeValue.split(', '):
@@ -76,7 +79,8 @@ class MetadataParser:
            for row in (['Series', self.data['Series']], ['Volume', self.data['Volume']],
                        ['Number', self.data['Number']], ['Writer', ', '.join(self.data['Writers'])],
                        ['Penciller', ', '.join(self.data['Pencillers'])], ['Inker', ', '.join(self.data['Inkers'])],
-                        ['Colorist', ', '.join(self.data['Colorists'])], ['Summary', self.data['Summary']]):
+                        ['Colorist', ', '.join(self.data['Colorists'])], ['Summary', self.data['Summary']],
                        ['Title', self.data['Title']]):
                if self.rawdata.getElementsByTagName(row[0]):
                    node = self.rawdata.getElementsByTagName(row[0])[0]
                    if row[1]:
@@ -97,7 +101,8 @@ class MetadataParser:
            for row in (['Series', self.data['Series']], ['Volume', self.data['Volume']],
                        ['Number', self.data['Number']], ['Writer', ', '.join(self.data['Writers'])],
                        ['Penciller', ', '.join(self.data['Pencillers'])], ['Inker', ', '.join(self.data['Inkers'])],
-                        ['Colorist', ', '.join(self.data['Colorists'])], ['Summary', self.data['Summary']]):
+                        ['Colorist', ', '.join(self.data['Colorists'])], ['Summary', self.data['Summary']],
                        ['Title', self.data['Title']]):
                if row[1]:
                    main = doc.createElement(row[0])
                    root.appendChild(main)
@@ -116,5 +121,5 @@ class MetadataParser:
                cbx = comicarchive.ComicArchive(self.source)
                cbx.addFile(tmpXML)
            except OSError as e:
-                raise UserWarning(e.strerror)
+                raise UserWarning(e)
            rmtree(workdir)
--- a/kindlecomicconverter/pdfjpgextract.py
+++ b/kindlecomicconverter/pdfjpgextract.py
@@ -25,6 +25,11 @@ import os
 from random import choice
 from string import ascii_uppercase, digits
 # skip stray images a few pixels in size in some PDFs
 # typical images are many thousands in length
 # https://github.com/ciromattia/kcc/pull/546
 STRAY_IMAGE_LENGTH_THRESHOLD = 300
 class PdfJpgExtract:
    def __init__(self, fname):
@@ -60,10 +65,15 @@ class PdfJpgExtract:
                raise Exception("Didn't find end of JPG!")
            istart += startfix
            iend += endfix
            i = iend
            if iend - istart < STRAY_IMAGE_LENGTH_THRESHOLD:
                continue
            jpg = pdf[istart:iend]
            jpgfile = open(self.path + "/jpg%d.jpg" % njpg, "wb")
            jpgfile.write(jpg)
            jpgfile.close()
            njpg += 1
-            i = iend
+
        return self.path, njpg
--- a/kindlecomicconverter/shared.py
+++ b/kindlecomicconverter/shared.py
@@ -100,11 +100,11 @@ def dependencyCheck(level):
    missing = []
    if level > 2:
        try:
-            from PyQt5.QtCore import qVersion as qtVersion
+            from PySide6.QtCore import qVersion as qtVersion
-            if StrictVersion('5.6.0') > StrictVersion(qtVersion()):
+            if StrictVersion('6.5.1') > StrictVersion(qtVersion()):
-                missing.append('PyQt 5.6.0+')
+                missing.append('PySide 6.5.1+')
        except ImportError:
-            missing.append('PyQt 5.6.0+')
+            missing.append('PySide 6.5.1+')
        try:
            import raven
        except ImportError:
--- a/other/osx/7z
+++ b/other/osx/7z
--- a/other/osx/7z.so
+++ b/other/osx/7z.so
--- a/other/osx/Info.plist
+++ b/other/osx/Info.plist
@@ -1,72 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleDisplayName</key>
 	<string>Kindle Comic Converter</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
 		<key>CFBundleTypeExtensions</key>
 		<array>
 			<string>cbz</string>
 			<string>cbr</string>
 			<string>cb7</string>
 			<string>zip</string>
 			<string>rar</string>
 			<string>7z</string>
 			<string>pdf</string>
 		</array>
 		<key>CFBundleTypeIconFile</key>
 		<string>comic2ebook.icns</string>
 		<key>CFBundleTypeName</key>
 		<string>Comics</string>
 		<key>CFBundleTypeRole</key>
 		<string>Editor</string>
 		</dict>
 	</array>
 	<key>CFBundleExecutable</key>
 	<string>MacOS/Kindle Comic Converter</string>
 	<key>CFBundleGetInfoString</key>
 	<string>KindleComicConverter 5.5.2, written 2012-2019 by Ciro Mattia Gonano and Pawel Jastrzebski</string>
 	<key>CFBundleIconFile</key>
 	<string>comic2ebook.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.kindlecomicconverter.KindleComicConverter</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>Kindle Comic Converter</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>5.5.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>5.5.2</string>
 	<key>LSEnvironment</key>
 	<dict>
 		<key>PATH</key>
 		<string>./../Resources:/Applications/Kindle Comic Creator/Kindle Comic Creator.app/Contents/MacOS:/usr/local/bin:/usr/bin:/bin</string>
 	</dict>
 	<key>LSHasLocalizedDisplayName</key>
 	<false/>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.14.0</string>
 	<key>NSAppleScriptEnabled</key>
 	<false/>
 	<key>NSHumanReadableCopyright</key>
 	<string>ISC License (ISCL)</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSRequiresAquaSystemAppearance</key>
 	<string>false</string>
 	<key>NSInitialToolTipDelay</key>
 	<integer>1000</integer>
 </dict>
 </plist>
--- a/other/osx/Rar.so
+++ b/other/osx/Rar.so
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,7 @@
-PyQt5>=5.6.0
+PySide6>=6.5.1
 Pillow>=5.2.0
-psutil>=5.0.0
+psutil>=5.9.5
 python-slugify>=1.2.1
 raven>=6.0.0
 # PyQt5-tools
 mozjpeg-lossless-optimization>=1.1.2
-distro
+distro
--- a/setup.py
+++ b/setup.py
@@ -17,8 +17,6 @@ import setuptools
 import distutils.cmd
 from kindlecomicconverter import __version__
 OSX_INFO_PLIST = "other/osx/Info.plist"
 NAME = 'KindleComicConverter'
 MAIN = 'kcc.py'
 VERSION = __version__
@@ -39,22 +37,7 @@ class BuildBinaryCommand(distutils.cmd.Command):
    def run(self):
        VERSION = __version__
        if sys.platform == 'darwin':
            with open(OSX_INFO_PLIST, 'r') as file:
                filedata = file.read()
            filedata = filedata.replace('5.5.2', VERSION)
            with open(OSX_INFO_PLIST, 'w') as file:
                file.write(filedata)
            os.system('pyinstaller -y -F -i icons/comic2ebook.icns -n "Kindle Comic Converter" -w -s kcc.py')
            os.makedirs('dist/Kindle Comic Converter.app/Contents/Resources/Codecs')
            shutil.copy('other/osx/7z', 'dist/Kindle Comic Converter.app/Contents/Resources')
            shutil.copy('other/osx/7z.so', 'dist/Kindle Comic Converter.app/Contents/Resources')
            shutil.copy('other/osx/Rar.so', 'dist/Kindle Comic Converter.app/Contents/Resources/Codecs')
            shutil.copy('other/osx/Info.plist', 'dist/Kindle Comic Converter.app/Contents')
            shutil.copy('LICENSE.txt', 'dist/Kindle Comic Converter.app/Contents/Resources')
            shutil.copy('other/windows/Additional-LICENSE.txt', 'dist/Kindle Comic Converter.app/Contents/Resources')
            os.chmod('dist/Kindle Comic Converter.app/Contents/Resources/7z', 0o777)
            # TODO /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime dist/Applications/Kindle\ Comic\ Converter.app -v
            os.system('appdmg kcc.json dist/KindleComicConverter_osx_' + VERSION + '.dmg')
            exit(0)
@@ -92,9 +75,9 @@ setuptools.setup(
    },
    packages=['kindlecomicconverter'],
    install_requires=[
-        'PyQt5>=5.6.0',
+        'pyside6>=6.5.1',
        'Pillow>=5.2.0',
-        'psutil>=5.0.0',
+        'psutil>=5.9.5',
        'python-slugify>=1.2.1,<9.0.0',
        'raven>=6.0.0',
        'mozjpeg-lossless-optimization>=1.1.2',
Author	SHA1	Message	Date
darodi	b8a5582431	update Dockerfile-base file version	2023-08-09 18:40:32 +02:00
Alex Xu	9e73f065ae	Merge branch 'ciromattia:master' into pyqt6	2023-08-08 14:38:44 -07:00
Alex Xu	0d417b8e11	prioritize KC2 over KP3 kindlegen version (#574 ) * prioritize KC2 over KP3 * remove link to buggy KP3 kindlegen * prioritize KC2 since KP3 version is buggy as of v3.72 * add kindlegen install link * update comments	2023-08-08 20:25:03 +00:00
Alex Xu	b40cfcd9a6	Merge branch 'ciromattia:master' into pyqt6	2023-08-07 20:55:52 -07:00
Alex Xu	6836c20377	Fix page order and bookmarks by renaming numerically (#507 ) * disable slugify * rename to digits * add -kcc * add ABC checks * remove kobo * don't use if statements * rename to suffix * re-order check * only slugify directories * add break * add sorted * fix kcc-b logic * add kcc to front of filename --------- Co-authored-by: Alexander Xu <alexanderx@qualtrics.com>	2023-08-07 18:22:46 +00:00
swaggy-p-jp	f75ea6dfe8	enable double spread on kindle (#567 )	2023-08-07 18:07:00 +00:00
Alex Xu	77afa77d32	Display kindlegen path (#571 ) * add %LOCALAPPDATA%\\Amazon\\KC2 * fix kindlegen link * expandvars * remove link * print where kindlegen * adjust where command * remove platform	2023-08-07 17:53:38 +00:00
Alex Xu	f73d889b6e	fix damaged	2023-08-06 20:11:00 +00:00
darodi	8e04ccde18	Fix Mac CBZ, CBR, damaged, cover upload	2023-08-06 21:53:37 +02:00
darodi	cc1e5db0aa	Merge pull request #566 from axu2/mac Fix Mac CBZ, CBR, damaged, cover upload	2023-08-06 19:43:54 +00:00
Alex Xu	c5c88095ee	bump to 5.6.3	2023-08-06 21:39:40 +02:00
Alex Xu	1318b9c0f2	Fix Mac CBZ, CBR, damaged, cover upload .decode("utf-8") edit kindlegen text adjust 7z text add unar delete spec remove 7z binaries change path priorities add 7z location for m1 delete plist fix mac cover upload	2023-08-06 21:39:40 +02:00
Alex Xu	9339abb267	skip single pixel images in PDF (#546 ) * skip pixels hopefully * add comments and reorder * add constant	2023-08-05 15:37:00 +00:00
Alex Xu	154707a412	Merge pull request #559 * make scribe default to no upscale with manga mode	2023-08-05 15:18:25 +00:00
Alex Xu	42c79b326f	remove mozJpeg	2023-07-31 08:25:31 -07:00
Alex Xu	4cb986c302	remove space	2023-07-25 14:10:09 -07:00
Alex Xu	69856c7f48	use same settings save location as qt5	2023-07-25 14:02:02 -07:00
Alex Xu	a3dd23ed40	Merge branch 'master' into pyqt6	2023-07-25 13:28:23 -07:00
darodi	217f571f3d	refactor display when kindlegen is missing (#555 ) display_kindlegen_missing	2023-07-25 19:31:02 +00:00
Alex Xu	531cea88e6	Add 7z and Kindle Previewer 3 to PATH in all scenarios (#560 ) * add 7z and KP3 to path --------- Co-authored-by: darodi <4682830+darodi@users.noreply.github.com>	2023-07-25 19:27:56 +00:00
Alex Xu	5a21ff0bcf	fix state issue	2023-07-23 15:25:35 -07:00
Alex Xu	17e8ffb7c0	add warning text	2023-07-12 12:45:17 -07:00
Alex Xu	a5202458dc	Merge pull request #553 * warn p7zip-rar * replace strerror	2023-07-05 16:54:24 +00:00
Alex Xu	4499e8faa0	add mozjpeg to gitignore	2023-07-05 07:06:06 -07:00
Alex Xu	6ee685e64c	Update README.md	2023-07-04 08:47:16 -07:00
Alex Xu	9f34df1414	Update README.md	2023-07-04 08:45:20 -07:00
Alex Xu	5902d88d98	remove dead download links (#544 ) * remove old links	2023-07-04 10:48:04 +00:00
Alex Xu	6a6a363c47	Update package-linux.yml	2023-07-01 11:25:28 -07:00
Alex Xu	6ba2ef66ca	Update README.md	2023-07-01 11:24:43 -07:00
Alex Xu	264184c7e0	Update Dockerfile-base	2023-07-01 11:24:13 -07:00
Alex Xu	7e62329a51	Update package-linux.yml	2023-07-01 11:22:18 -07:00
Alex Xu	7e82f492c6	Update package-linux.yml	2023-07-01 11:21:56 -07:00
Alex Xu	829334556f	add mozJpeg warning	2023-07-01 08:31:56 -07:00
Alex Xu	5c1408e7b7	remove references to qt5	2023-06-30 10:57:27 -07:00
Alexander Xu	b51c87e3bc	import CheckedState	2023-06-30 10:39:19 -07:00
Alexander Xu	ada3232a0a	fix batch	2023-06-30 10:31:43 -07:00
Alexander Xu	44682156c9	add mozJpeg	2023-06-30 10:29:55 -07:00
Alexander Xu	242fd70b54	Add CheckState enums	2023-06-30 10:19:39 -07:00
Alexander Xu	3f2365c677	edit shared	2023-06-30 09:37:03 -07:00
Alexander Xu	f4e45e6052	change exec	2023-06-30 09:35:02 -07:00
Alexander Xu	fe81af831e	add comment back	2023-06-30 09:30:50 -07:00
Alexander Xu	eeec0501f5	add spaces	2023-06-30 09:29:34 -07:00
Alexander Xu	3d0d615879	fix tray icon	2023-06-30 09:28:03 -07:00
Alexander Xu	82bc405f6f	pyside6	2023-06-30 09:10:55 -07:00
Alexander Xu	b2a079c958	fix epub icon	2023-06-28 14:54:14 -07:00
Alex Xu	b37ea52c7d	Merge branch 'master' into pyqt6	2023-06-28 14:52:20 -07:00
Alex Xu	e7e41715d0	rename binary releases to downloads (#545 )	2023-06-27 16:59:33 +00:00
Alex Xu	62d1c7c488	add 7z wiki link (#543 )	2023-06-12 20:16:26 +00:00
darodi	95678adfd6	change format labels in gui (#538 )	2023-06-12 18:28:21 +00:00
Alex Xu	4923dac8f0	explicitly name disabled archives (#531 ) * explicitly name disabled archives	2023-06-10 11:14:41 +00:00
Vinh Quang Tran	935727c1db	Override book's title if `Title` is set in XML (#532 ) * Allow overriding title if it is set in XML	2023-06-10 09:13:01 +00:00
Jaroslaw Janas	b0e38a700a	Bump conda python to 3.11 (#524 )	2023-05-22 19:46:51 +00:00
Alex Xu	d668883b6f	initial upgrade	2023-05-21 17:13:39 -07:00
darodi	23961243b6	CHANGELOG.md	2023-05-14 19:25:07 +02:00