Merge branch 'master' into metadata-editor-in-bulk

.github/workflows/package-linux.yml

@@ -59,7 +59,7 @@ jobs:
       env:
         UPDATE_INFO: gh-releases-zsync|ciromattia|kcc|latest|*x86_64.AppImage.zsync
     - name: upload artifact
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
         name: AppImage
         path: './*.AppImage*'

.github/workflows/package-macos.yml

@@ -25,8 +25,10 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ macos-13, macos-14 ]
+        os: [ macos-15-intel, macos-14 ]
     runs-on: ${{ matrix.os }}
+    env:
+      MACOSX_DEPLOYMENT_TARGET: '14.0'
     steps:
       - uses: actions/checkout@v6
       - name: Set up Python
@@ -78,7 +80,7 @@ jobs:
         run: |
           python setup.py build_binary
       - name: upload build
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: mac-os-build-${{ runner.arch }}
           path: dist/*.dmg

.github/workflows/package-osx-legacy.yml

@@ -23,7 +23,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ macos-13 ]
+        os: [ macos-15-intel ]
     runs-on: ${{ matrix.os }}
     env:
       # We need the official Python, because the GA ones only support newer macOS versions
@@ -51,7 +51,7 @@ jobs:
         run: |
           python3 setup.py build_binary
       - name: upload build
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: osx-build-${{ runner.arch }}
           path: dist/*.dmg

.github/workflows/package-windows.yml

@@ -53,7 +53,7 @@ jobs:
           python setup.py ${{ matrix.command }}
       - name: upload-unsigned-artifact
         id: upload-unsigned-artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: windows-build-${{ matrix.entry }}
           path: dist/*.exe

.github/workflows/package-windows7.yml

@@ -46,7 +46,7 @@ jobs:
           python setup.py build_binary
       - name: upload-unsigned-artifact
         id: upload-unsigned-artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: windows7-build
           path: dist/*.exe

README.md

@@ -7,7 +7,7 @@
 [![Github All Releases](https://img.shields.io/github/downloads/ciromattia/kcc/total.svg)](https://github.com/ciromattia/kcc/releases)
 
 
-**Kindle Comic Converter** optimizes black & white comics and manga for E-ink ereaders 
+**Kindle Comic Converter** optimizes black & white (or color) comics and manga for E-ink ereaders 
 like Kindle, Kobo, ReMarkable, and more.
 Pages display in fullscreen without margins, 
 with proper fixed layout support.
@@ -92,7 +92,7 @@ Click on **Assets** of the latest release.
 You probably want either
 - `KCC_*.*.*.exe` (Windows)
 - `kcc_macos_arm_*.*.*.dmg` (recent Mac with Apple Silicon M1 chip or later)
-- `kcc_macos_i386_*.*.*.dmg` (older Mac with Intel chip macOS 12+)
+- `kcc_macos_i386_*.*.*.dmg` (older Mac with Intel chip macOS 14+)
 
 There are also legacy macOS 10.14+ and Windows 7 experimental versions available.
 

gui/KCC.ui

@@ -348,6 +348,51 @@
          </property>
         </widget>
        </item>
+       <item row="0" column="2">
+        <widget class="QWidget" name="outputFolderWidget" native="true">
+         <layout class="QHBoxLayout" name="horizontalLayout_3">
+          <item>
+           <widget class="QCheckBox" name="defaultOutputFolderBox">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Unchecked - next to source&lt;br/&gt;&lt;/span&gt;Place output files next to source files&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - folder next to source&lt;br/&gt;&lt;/span&gt;Place output files in a folder next to source files&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Custom&lt;br/&gt;&lt;/span&gt;Place output files in custom directory specified by right button&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+            <property name="text">
+             <string>Output Folder</string>
+            </property>
+            <property name="tristate">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="defaultOutputFolderButton">
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>30</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to select the default output directory.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="icon">
+             <iconset resource="KCC.qrc">
+              <normaloff>:/Other/icons/folder_new.png</normaloff>:/Other/icons/folder_new.png</iconset>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
       </layout>
      </widget>
     </item>
@@ -747,7 +792,7 @@
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Add CBR, CBZ, CB7 or PDF file to queue.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="text">
-          <string>Add file(s)</string>
+          <string>Add input file(s)</string>
          </property>
          <property name="icon">
           <iconset resource="KCC.qrc">
@@ -755,19 +800,13 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="5">
+       <item row="0" column="4">
-        <widget class="QPushButton" name="defaultOutputFolderButton">
+        <widget class="QPushButton" name="directoryButton">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>30</height>
-          </size>
-         </property>
          <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to select the default output directory.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Add directory containing JPG, PNG or GIF files to queue.&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;CBR, CBZ and CB7 files inside will not be processed!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="text">
-          <string/>
+          <string>Add input folder(s)</string>
          </property>
          <property name="icon">
           <iconset resource="KCC.qrc">
@@ -775,26 +814,7 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="4">
+       <item row="1" column="4">
-        <widget class="QCheckBox" name="defaultOutputFolderBox">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Unchecked - next to source&lt;br/&gt;&lt;/span&gt;Place output files next to source files&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - folder next to source&lt;br/&gt;&lt;/span&gt;Place output files in a folder next to source files&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Custom&lt;br/&gt;&lt;/span&gt;Place output files in custom directory specified by right button&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="text">
-          <string>Output Folder</string>
-         </property>
-         <property name="tristate">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="4" colspan="2">
         <widget class="QComboBox" name="formatBox">
          <property name="minimumSize">
           <size>
@@ -811,10 +831,9 @@
       <zorder>clearButton</zorder>
       <zorder>deviceBox</zorder>
       <zorder>convertButton</zorder>
-      <zorder>formatBox</zorder>
-      <zorder>defaultOutputFolderButton</zorder>
       <zorder>fileButton</zorder>
-      <zorder>defaultOutputFolderBox</zorder>
+      <zorder>directoryButton</zorder>
+      <zorder>formatBox</zorder>
      </widget>
     </item>
     <item row="6" column="0">
@@ -901,12 +920,9 @@
   <tabstop>jobList</tabstop>
   <tabstop>fileButton</tabstop>
   <tabstop>clearButton</tabstop>
-  <tabstop>defaultOutputFolderButton</tabstop>
-  <tabstop>defaultOutputFolderBox</tabstop>
   <tabstop>deviceBox</tabstop>
   <tabstop>widthBox</tabstop>
   <tabstop>heightBox</tabstop>
-  <tabstop>formatBox</tabstop>
   <tabstop>convertButton</tabstop>
   <tabstop>mangaBox</tabstop>
   <tabstop>rotateBox</tabstop>

kindlecomicconverter/KCC_gui.py

@@ -22,7 +22,7 @@ import itertools
 from pathlib import Path
 from PySide6.QtCore import (QSize, QUrl, Qt, Signal, QIODeviceBase, QEvent, QThread, QSettings)
 from PySide6.QtGui import (QColor, QIcon, QPixmap, QDesktopServices)
-from PySide6.QtWidgets import (QApplication, QLabel, QListWidgetItem, QMainWindow, QSystemTrayIcon, QFileDialog, QMessageBox, QDialog, QAbstractItemView, QListView, QTreeView)
+from PySide6.QtWidgets import (QApplication, QLabel, QListWidgetItem, QMainWindow, QSystemTrayIcon, QFileDialog, QMessageBox, QDialog, QTreeView, QAbstractItemView)
 from PySide6.QtNetwork import (QLocalSocket, QLocalServer)
 
 import os
@@ -610,12 +610,30 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                                                             'Comic (*.pdf);;All (*.*)')
         for fname in fnames[0]:
             if fname != '':
-                if sys.platform.startswith('win'):
-                    fname = fname.replace('/', '\\')
                 self.lastPath = os.path.abspath(os.path.join(fname, os.pardir))
                 GUI.jobList.addItem(fname)
                 GUI.jobList.scrollToBottom()
 
+    def selectDir(self):
+        if self.needClean:
+            self.needClean = False
+            GUI.jobList.clear()
+ 
+        dialog = QFileDialog(MW, 'Select input folder(s)', self.lastPath)
+        dialog.setFileMode(QFileDialog.FileMode.Directory)
+        dialog.setOption(QFileDialog.Option.ShowDirsOnly, True)
+        dialog.setOption(QFileDialog.Option.DontUseNativeDialog, True)
+        dialog.findChild(QTreeView).setSelectionMode(QAbstractItemView.ExtendedSelection)
+
+        if dialog.exec():
+            dnames = dialog.selectedFiles()
+            for dname in dnames:
+                if dname != '':
+                    self.lastPath = os.path.abspath(os.path.join(dname, os.pardir))
+                    GUI.jobList.addItem(dname)
+                    GUI.jobList.scrollToBottom()
+
+
     def selectFileMetaEditor(self, sname):
         files = []
         if not sname:
@@ -1337,6 +1355,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
         GUI.defaultOutputFolderButton.clicked.connect(self.selectDefaultOutputFolder)
         GUI.clearButton.clicked.connect(self.clearJobs)
         GUI.fileButton.clicked.connect(self.selectFile)
+        GUI.directoryButton.clicked.connect(self.selectDir)
         GUI.editorButton.clicked.connect(self.selectFileMetaEditor)
         GUI.wikiButton.clicked.connect(self.openWiki)
         GUI.kofiButton.clicked.connect(self.openKofi)

kindlecomicconverter/KCC_ui.py

@@ -190,6 +190,33 @@ class Ui_mainWindow(object):
 
         self.gridLayout_2.addWidget(self.autocontrastBox, 9, 2, 1, 1)
 
+        self.outputFolderWidget = QWidget(self.optionWidget)
+        self.outputFolderWidget.setObjectName(u"outputFolderWidget")
+        self.horizontalLayout_3 = QHBoxLayout(self.outputFolderWidget)
+        self.horizontalLayout_3.setObjectName(u"horizontalLayout_3")
+        self.defaultOutputFolderBox = QCheckBox(self.outputFolderWidget)
+        self.defaultOutputFolderBox.setObjectName(u"defaultOutputFolderBox")
+        sizePolicy1 = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
+        sizePolicy1.setHorizontalStretch(0)
+        sizePolicy1.setVerticalStretch(0)
+        sizePolicy1.setHeightForWidth(self.defaultOutputFolderBox.sizePolicy().hasHeightForWidth())
+        self.defaultOutputFolderBox.setSizePolicy(sizePolicy1)
+        self.defaultOutputFolderBox.setTristate(True)
+
+        self.horizontalLayout_3.addWidget(self.defaultOutputFolderBox)
+
+        self.defaultOutputFolderButton = QPushButton(self.outputFolderWidget)
+        self.defaultOutputFolderButton.setObjectName(u"defaultOutputFolderButton")
+        self.defaultOutputFolderButton.setMinimumSize(QSize(0, 30))
+        icon1 = QIcon()
+        icon1.addFile(u":/Other/icons/folder_new.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.defaultOutputFolderButton.setIcon(icon1)
+
+        self.horizontalLayout_3.addWidget(self.defaultOutputFolderButton)
+
+
+        self.gridLayout_2.addWidget(self.outputFolderWidget, 0, 2, 1, 1)
+
 
         self.gridLayout.addWidget(self.optionWidget, 5, 0, 1, 2)
 
@@ -211,11 +238,11 @@ class Ui_mainWindow(object):
         self.gridLayout_3.setContentsMargins(0, 0, 0, 0)
         self.hLabel = QLabel(self.customWidget)
         self.hLabel.setObjectName(u"hLabel")
-        sizePolicy1 = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred)
+        sizePolicy2 = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred)
-        sizePolicy1.setHorizontalStretch(0)
+        sizePolicy2.setHorizontalStretch(0)
-        sizePolicy1.setVerticalStretch(0)
+        sizePolicy2.setVerticalStretch(0)
-        sizePolicy1.setHeightForWidth(self.hLabel.sizePolicy().hasHeightForWidth())
+        sizePolicy2.setHeightForWidth(self.hLabel.sizePolicy().hasHeightForWidth())
-        self.hLabel.setSizePolicy(sizePolicy1)
+        self.hLabel.setSizePolicy(sizePolicy2)
 
         self.gridLayout_3.addWidget(self.hLabel, 0, 2, 1, 1)
 
@@ -227,8 +254,8 @@ class Ui_mainWindow(object):
 
         self.wLabel = QLabel(self.customWidget)
         self.wLabel.setObjectName(u"wLabel")
-        sizePolicy1.setHeightForWidth(self.wLabel.sizePolicy().hasHeightForWidth())
+        sizePolicy2.setHeightForWidth(self.wLabel.sizePolicy().hasHeightForWidth())
-        self.wLabel.setSizePolicy(sizePolicy1)
+        self.wLabel.setSizePolicy(sizePolicy2)
 
         self.gridLayout_3.addWidget(self.wLabel, 0, 0, 1, 1)
 
@@ -271,18 +298,18 @@ class Ui_mainWindow(object):
         self.editorButton = QPushButton(self.toolWidget)
         self.editorButton.setObjectName(u"editorButton")
         self.editorButton.setMinimumSize(QSize(0, 30))
-        icon1 = QIcon()
+        icon2 = QIcon()
-        icon1.addFile(u":/Other/icons/editor.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        icon2.addFile(u":/Other/icons/editor.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.editorButton.setIcon(icon1)
+        self.editorButton.setIcon(icon2)
 
         self.horizontalLayout.addWidget(self.editorButton)
 
         self.kofiButton = QPushButton(self.toolWidget)
         self.kofiButton.setObjectName(u"kofiButton")
         self.kofiButton.setMinimumSize(QSize(0, 30))
-        icon2 = QIcon()
+        icon3 = QIcon()
-        icon2.addFile(u":/Brand/icons/kofi_symbol.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        icon3.addFile(u":/Brand/icons/kofi_symbol.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.kofiButton.setIcon(icon2)
+        self.kofiButton.setIcon(icon3)
         self.kofiButton.setIconSize(QSize(19, 16))
 
         self.horizontalLayout.addWidget(self.kofiButton)
@@ -290,9 +317,9 @@ class Ui_mainWindow(object):
         self.wikiButton = QPushButton(self.toolWidget)
         self.wikiButton.setObjectName(u"wikiButton")
         self.wikiButton.setMinimumSize(QSize(0, 30))
-        icon3 = QIcon()
+        icon4 = QIcon()
-        icon3.addFile(u":/Other/icons/wiki.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        icon4.addFile(u":/Other/icons/wiki.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.wikiButton.setIcon(icon3)
+        self.wikiButton.setIcon(icon4)
 
         self.horizontalLayout.addWidget(self.wikiButton)
 
@@ -336,11 +363,8 @@ class Ui_mainWindow(object):
 
         self.preserveMarginBox = QSpinBox(self.croppingWidget)
         self.preserveMarginBox.setObjectName(u"preserveMarginBox")
-        sizePolicy2 = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
+        sizePolicy1.setHeightForWidth(self.preserveMarginBox.sizePolicy().hasHeightForWidth())
-        sizePolicy2.setHorizontalStretch(0)
+        self.preserveMarginBox.setSizePolicy(sizePolicy1)
-        sizePolicy2.setVerticalStretch(0)
-        sizePolicy2.setHeightForWidth(self.preserveMarginBox.sizePolicy().hasHeightForWidth())
-        self.preserveMarginBox.setSizePolicy(sizePolicy2)
         self.preserveMarginBox.setMaximum(99)
         self.preserveMarginBox.setSingleStep(5)
         self.preserveMarginBox.setValue(0)
@@ -364,18 +388,18 @@ class Ui_mainWindow(object):
         self.convertButton.setObjectName(u"convertButton")
         self.convertButton.setMinimumSize(QSize(0, 30))
         self.convertButton.setFont(font)
-        icon4 = QIcon()
+        icon5 = QIcon()
-        icon4.addFile(u":/Other/icons/convert.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        icon5.addFile(u":/Other/icons/convert.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.convertButton.setIcon(icon4)
+        self.convertButton.setIcon(icon5)
 
         self.gridLayout_4.addWidget(self.convertButton, 1, 3, 1, 1)
 
         self.clearButton = QPushButton(self.buttonWidget)
         self.clearButton.setObjectName(u"clearButton")
         self.clearButton.setMinimumSize(QSize(0, 30))
-        icon5 = QIcon()
+        icon6 = QIcon()
-        icon5.addFile(u":/Other/icons/clear.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        icon6.addFile(u":/Other/icons/clear.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.clearButton.setIcon(icon5)
+        self.clearButton.setIcon(icon6)
 
         self.gridLayout_4.addWidget(self.clearButton, 0, 3, 1, 1)
 
@@ -388,42 +412,30 @@ class Ui_mainWindow(object):
         self.fileButton = QPushButton(self.buttonWidget)
         self.fileButton.setObjectName(u"fileButton")
         self.fileButton.setMinimumSize(QSize(0, 30))
-        icon6 = QIcon()
+        icon7 = QIcon()
-        icon6.addFile(u":/Other/icons/document_new.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        icon7.addFile(u":/Other/icons/document_new.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.fileButton.setIcon(icon6)
+        self.fileButton.setIcon(icon7)
 
         self.gridLayout_4.addWidget(self.fileButton, 0, 1, 1, 1)
 
-        self.defaultOutputFolderButton = QPushButton(self.buttonWidget)
+        self.directoryButton = QPushButton(self.buttonWidget)
-        self.defaultOutputFolderButton.setObjectName(u"defaultOutputFolderButton")
+        self.directoryButton.setObjectName(u"directoryButton")
-        self.defaultOutputFolderButton.setMinimumSize(QSize(0, 30))
+        self.directoryButton.setIcon(icon1)
-        icon7 = QIcon()
-        icon7.addFile(u":/Other/icons/folder_new.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.defaultOutputFolderButton.setIcon(icon7)
 
-        self.gridLayout_4.addWidget(self.defaultOutputFolderButton, 0, 5, 1, 1)
+        self.gridLayout_4.addWidget(self.directoryButton, 0, 4, 1, 1)
-
-        self.defaultOutputFolderBox = QCheckBox(self.buttonWidget)
-        self.defaultOutputFolderBox.setObjectName(u"defaultOutputFolderBox")
-        sizePolicy2.setHeightForWidth(self.defaultOutputFolderBox.sizePolicy().hasHeightForWidth())
-        self.defaultOutputFolderBox.setSizePolicy(sizePolicy2)
-        self.defaultOutputFolderBox.setTristate(True)
-
-        self.gridLayout_4.addWidget(self.defaultOutputFolderBox, 0, 4, 1, 1)
 
         self.formatBox = QComboBox(self.buttonWidget)
         self.formatBox.setObjectName(u"formatBox")
         self.formatBox.setMinimumSize(QSize(0, 28))
 
-        self.gridLayout_4.addWidget(self.formatBox, 1, 4, 1, 2)
+        self.gridLayout_4.addWidget(self.formatBox, 1, 4, 1, 1)
 
         self.clearButton.raise_()
         self.deviceBox.raise_()
         self.convertButton.raise_()
-        self.formatBox.raise_()
-        self.defaultOutputFolderButton.raise_()
         self.fileButton.raise_()
-        self.defaultOutputFolderBox.raise_()
+        self.directoryButton.raise_()
+        self.formatBox.raise_()
 
         self.gridLayout.addWidget(self.buttonWidget, 3, 0, 1, 2)
 
@@ -471,13 +483,10 @@ class Ui_mainWindow(object):
         mainWindow.setStatusBar(self.statusBar)
         QWidget.setTabOrder(self.jobList, self.fileButton)
         QWidget.setTabOrder(self.fileButton, self.clearButton)
-        QWidget.setTabOrder(self.clearButton, self.defaultOutputFolderButton)
+        QWidget.setTabOrder(self.clearButton, self.deviceBox)
-        QWidget.setTabOrder(self.defaultOutputFolderButton, self.defaultOutputFolderBox)
-        QWidget.setTabOrder(self.defaultOutputFolderBox, self.deviceBox)
         QWidget.setTabOrder(self.deviceBox, self.widthBox)
         QWidget.setTabOrder(self.widthBox, self.heightBox)
-        QWidget.setTabOrder(self.heightBox, self.formatBox)
+        QWidget.setTabOrder(self.heightBox, self.convertButton)
-        QWidget.setTabOrder(self.formatBox, self.convertButton)
         QWidget.setTabOrder(self.convertButton, self.mangaBox)
         QWidget.setTabOrder(self.mangaBox, self.rotateBox)
         QWidget.setTabOrder(self.rotateBox, self.qualityBox)
@@ -621,6 +630,14 @@ class Ui_mainWindow(object):
         self.autocontrastBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - BW only<br/></span>Only autocontrast bw pages. Ignored for pages where near blacks or whites don't exist.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Disabled<br/></span>Disable autocontrast</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - BW and Color<br/></span>BW and color images will be autocontrasted. Ignored for pages where near blacks or whites don't exist.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
         self.autocontrastBox.setText(QCoreApplication.translate("mainWindow", u"Autocontrast", None))
+#if QT_CONFIG(tooltip)
+        self.defaultOutputFolderBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - next to source<br/></span>Place output files next to source files</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - folder next to source<br/></span>Place output files in a folder next to source files</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Custom<br/></span>Place output files in custom directory specified by right button</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.defaultOutputFolderBox.setText(QCoreApplication.translate("mainWindow", u"Output Folder", None))
+#if QT_CONFIG(tooltip)
+        self.defaultOutputFolderButton.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p>Use this to select the default output directory.</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.defaultOutputFolderButton.setText("")
 #if QT_CONFIG(tooltip)
         self.jobList.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p>Double click on source to open it in metadata editor.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
@@ -661,15 +678,11 @@ class Ui_mainWindow(object):
 #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(s)", None))
+        self.fileButton.setText(QCoreApplication.translate("mainWindow", u"Add input file(s)", None))
 #if QT_CONFIG(tooltip)
-        self.defaultOutputFolderButton.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p>Use this to select the default output directory.</p></body></html>", None))
+        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.defaultOutputFolderButton.setText("")
+        self.directoryButton.setText(QCoreApplication.translate("mainWindow", u"Add input folder(s)", None))
-#if QT_CONFIG(tooltip)
-        self.defaultOutputFolderBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - next to source<br/></span>Place output files next to source files</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - folder next to source<br/></span>Place output files in a folder next to source files</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Custom<br/></span>Place output files in custom directory specified by right button</p></body></html>", None))
-#endif // QT_CONFIG(tooltip)
-        self.defaultOutputFolderBox.setText(QCoreApplication.translate("mainWindow", u"Output Folder", None))
 #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)

kindlecomicconverter/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '9.3.3'
+__version__ = '9.3.7'
 __license__ = 'ISC'
 __copyright__ = '2012-2022, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>, darodi'
 __docformat__ = 'restructuredtext en'

kindlecomicconverter/comic2ebook.py

@@ -905,7 +905,9 @@ def getWorkFolder(afile):
                             os.path.join(fullPath, tdir[0], 'ComicInfo.xml')
                         )
                 if len(tdir) == 1 and os.path.isdir(os.path.join(fullPath, tdir[0])):
-                    path = os.path.join(fullPath, tdir[0])
+                    for file in os.listdir(os.path.join(fullPath, tdir[0])):
+                        move(os.path.join(fullPath, tdir[0], file), fullPath)
+                    os.rmdir(os.path.join(fullPath, tdir[0]))
                 return workdir
  
             except OSError as e:

requirements-osx-legacy.txt

@@ -1,4 +1,4 @@
-PySide6==6.5.2
+PySide6==6.4.3
 Pillow>=11.3.0
 psutil>=5.9.5
 requests>=2.31.0

setup.py

@@ -41,7 +41,7 @@ class BuildBinaryCommand(setuptools.Command):
             os.system('pyinstaller --hidden-import=_cffi_backend -y -D -i icons/comic2ebook.icns -n "Kindle Comic Converter" -w -s kcc.py')
             # TODO /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime dist/Applications/Kindle\ Comic\ Converter.app -v
             min_os = os.getenv('MACOSX_DEPLOYMENT_TARGET')
-            if min_os:
+            if min_os.startswith('10.1'):
                 os.system(f'appdmg kcc.json dist/kcc_osx_{min_os.replace(".", "_")}_legacy_{VERSION}.dmg')
             else:
                 os.system(f'appdmg kcc.json dist/kcc_macos_{platform.processor()}_{VERSION}.dmg')