From 8c57fbf318b27863dd7b689c7e2cca5da1235d41 Mon Sep 17 00:00:00 2001
From: Alex Xu
Date: Sun, 14 Dec 2025 18:59:28 -0800
Subject: [PATCH 001/107] fix add folder button sizePolicy
---
gui/KCC.ui | 8 +++++++-
kindlecomicconverter/KCC_ui.py | 21 +++++++++++++--------
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/gui/KCC.ui b/gui/KCC.ui
index 3bc01a5..205a76b 100644
--- a/gui/KCC.ui
+++ b/gui/KCC.ui
@@ -7,7 +7,7 @@
0
0
566
- 573
+ 581
@@ -802,6 +802,12 @@
-
+
+
+ 0
+ 0
+
+
<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>
diff --git a/kindlecomicconverter/KCC_ui.py b/kindlecomicconverter/KCC_ui.py
index 36f09d6..9cdd2d6 100644
--- a/kindlecomicconverter/KCC_ui.py
+++ b/kindlecomicconverter/KCC_ui.py
@@ -26,7 +26,7 @@ class Ui_mainWindow(object):
def setupUi(self, mainWindow):
if not mainWindow.objectName():
mainWindow.setObjectName(u"mainWindow")
- mainWindow.resize(566, 573)
+ mainWindow.resize(566, 581)
icon = QIcon()
icon.addFile(u":/Icon/icons/comic2ebook.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
mainWindow.setWindowIcon(icon)
@@ -420,6 +420,11 @@ class Ui_mainWindow(object):
self.directoryButton = QPushButton(self.buttonWidget)
self.directoryButton.setObjectName(u"directoryButton")
+ sizePolicy4 = QSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Minimum)
+ sizePolicy4.setHorizontalStretch(0)
+ sizePolicy4.setVerticalStretch(0)
+ sizePolicy4.setHeightForWidth(self.directoryButton.sizePolicy().hasHeightForWidth())
+ self.directoryButton.setSizePolicy(sizePolicy4)
self.directoryButton.setIcon(icon1)
self.gridLayout_4.addWidget(self.directoryButton, 0, 4, 1, 1)
@@ -450,11 +455,11 @@ class Ui_mainWindow(object):
self.horizontalLayout_4.setContentsMargins(0, 0, 0, 0)
self.chunkSizeLabel = QLabel(self.chunkSizeWidget)
self.chunkSizeLabel.setObjectName(u"chunkSizeLabel")
- sizePolicy4 = QSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Preferred)
- sizePolicy4.setHorizontalStretch(0)
- sizePolicy4.setVerticalStretch(0)
- sizePolicy4.setHeightForWidth(self.chunkSizeLabel.sizePolicy().hasHeightForWidth())
- self.chunkSizeLabel.setSizePolicy(sizePolicy4)
+ sizePolicy5 = QSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Preferred)
+ sizePolicy5.setHorizontalStretch(0)
+ sizePolicy5.setVerticalStretch(0)
+ sizePolicy5.setHeightForWidth(self.chunkSizeLabel.sizePolicy().hasHeightForWidth())
+ self.chunkSizeLabel.setSizePolicy(sizePolicy5)
self.horizontalLayout_4.addWidget(self.chunkSizeLabel)
@@ -468,8 +473,8 @@ class Ui_mainWindow(object):
self.chunkSizeWarnLabel = QLabel(self.chunkSizeWidget)
self.chunkSizeWarnLabel.setObjectName(u"chunkSizeWarnLabel")
- sizePolicy4.setHeightForWidth(self.chunkSizeWarnLabel.sizePolicy().hasHeightForWidth())
- self.chunkSizeWarnLabel.setSizePolicy(sizePolicy4)
+ sizePolicy5.setHeightForWidth(self.chunkSizeWarnLabel.sizePolicy().hasHeightForWidth())
+ self.chunkSizeWarnLabel.setSizePolicy(sizePolicy5)
self.horizontalLayout_4.addWidget(self.chunkSizeWarnLabel)
From 7228055bca2c0bfc00c2a923ed25124cb366b7d1 Mon Sep 17 00:00:00 2001
From: Alex Xu
Date: Sun, 14 Dec 2025 23:44:30 -0800
Subject: [PATCH 002/107] reduce file operations in webtoon and file fusion
(#1191)
* reduce file operations in webtoon
* reduce file operations of file fusion
* fix file fusion failed to prepare
* close webtoon image before remove
* use temp directory
---
kindlecomicconverter/comic2ebook.py | 28 ++++++++++++----------------
kindlecomicconverter/comic2panel.py | 21 +++++++++------------
2 files changed, 21 insertions(+), 28 deletions(-)
diff --git a/kindlecomicconverter/comic2ebook.py b/kindlecomicconverter/comic2ebook.py
index 8cb784f..357b67e 100755
--- a/kindlecomicconverter/comic2ebook.py
+++ b/kindlecomicconverter/comic2ebook.py
@@ -851,14 +851,16 @@ def mupdf_pdf_process_pages_parallel(filename, output_dir, target_height):
-def getWorkFolder(afile):
+def getWorkFolder(afile, workdir=None):
+ if not workdir:
+ workdir = mkdtemp('', 'KCC-')
+ fullPath = os.path.join(workdir, 'OEBPS', 'Images')
+ else:
+ fullPath = workdir
if os.path.isdir(afile):
if disk_usage(gettempdir())[2] < getDirectorySize(afile) * 2.5:
raise UserWarning("Not enough disk space to perform conversion.")
- workdir = mkdtemp('', 'KCC-', os.path.dirname(afile))
try:
- os.rmdir(workdir)
- fullPath = os.path.join(workdir, 'OEBPS', 'Images')
copytree(afile, fullPath)
sanitizePermissions(fullPath)
return workdir
@@ -869,8 +871,6 @@ def getWorkFolder(afile):
if disk_usage(gettempdir())[2] < os.path.getsize(afile) * 2.5:
raise UserWarning("Not enough disk space to perform conversion.")
if afile.lower().endswith('.pdf'):
- workdir = mkdtemp('', 'KCC-', os.path.dirname(afile))
- fullPath = os.path.join(workdir, 'OEBPS', 'Images')
if not os.path.exists(fullPath):
os.makedirs(fullPath)
path = workdir
@@ -887,8 +887,6 @@ def getWorkFolder(afile):
raise UserWarning(f"Failed to extract images from PDF file. {e}")
return workdir
else:
- workdir = mkdtemp('', 'KCC-', os.path.dirname(afile))
- fullPath = os.path.join(workdir, 'OEBPS', 'Images')
if not os.path.exists(fullPath):
os.makedirs(fullPath)
try:
@@ -1532,17 +1530,15 @@ def makeFusion(sources: List[str]):
print(f"Processing {source}...")
checkPre(source)
print("Checking images...")
- path = getWorkFolder(source)
- pathfinder = os.path.join(path, "OEBPS", "Images")
- sanitizeTree(pathfinder)
- # TODO: remove flattenTree when subchapters are supported
- flattenTree(pathfinder)
source_path = Path(source)
if source_path.is_file():
- os.renames(pathfinder, fusion_path.joinpath(source_path.stem))
+ targetpath = fusion_path.joinpath(source_path.stem)
else:
- os.renames(pathfinder, fusion_path.joinpath(source_path.name))
-
+ targetpath = fusion_path.joinpath(source_path.name)
+ getWorkFolder(source, str(targetpath))
+ sanitizeTree(targetpath)
+ # TODO: remove flattenTree when subchapters are supported
+ flattenTree(targetpath)
end = perf_counter()
print(f"makefusion: {end - start} seconds")
diff --git a/kindlecomicconverter/comic2panel.py b/kindlecomicconverter/comic2panel.py
index ccdbb06..f45cc49 100644
--- a/kindlecomicconverter/comic2panel.py
+++ b/kindlecomicconverter/comic2panel.py
@@ -67,13 +67,14 @@ def mergeDirectory(work):
result = Image.new('RGB', (targetWidth, targetHeight))
y = 0
for i in imagesValid:
- img = Image.open(i).convert('RGB')
- if img.size[0] < targetWidth or img.size[0] > targetWidth:
- widthPercent = (targetWidth / float(img.size[0]))
- heightSize = int((float(img.size[1]) * float(widthPercent)))
- img = ImageOps.fit(img, (targetWidth, heightSize), method=Image.BICUBIC, centering=(0.5, 0.5))
- result.paste(img, (0, y))
- y += img.size[1]
+ with Image.open(i) as img:
+ img = img.convert('RGB')
+ if img.size[0] < targetWidth or img.size[0] > targetWidth:
+ widthPercent = (targetWidth / float(img.size[0]))
+ heightSize = int((float(img.size[1]) * float(widthPercent)))
+ img = ImageOps.fit(img, (targetWidth, heightSize), method=Image.BICUBIC, centering=(0.5, 0.5))
+ result.paste(img, (0, y))
+ y += img.size[1]
os.remove(i)
savePath = os.path.split(imagesValid[0])
result.save(os.path.join(savePath[0], os.path.splitext(savePath[1])[0] + '.png'), 'PNG')
@@ -253,10 +254,8 @@ def main(argv=None, job_progress='', qtgui=None):
return 1
if args.height > 0:
for sourceDir in args.input:
- targetDir = sourceDir + "-Splitted"
+ targetDir = sourceDir
if os.path.isdir(sourceDir):
- rmtree(targetDir, True)
- os.renames(sourceDir, targetDir)
work = []
pagenumber = 1
splitWorkerOutput = []
@@ -313,8 +312,6 @@ def main(argv=None, job_progress='', qtgui=None):
rmtree(targetDir, True)
raise RuntimeError("One of workers crashed. Cause: " + splitWorkerOutput[0][0],
splitWorkerOutput[0][1])
- if args.inPlace:
- os.renames(targetDir, sourceDir)
else:
rmtree(targetDir, True)
raise UserWarning("C2P: Source directory is empty.")
From b767d5dc2cdf442ded8e232ba561c8e3183908af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 14 Dec 2025 17:05:33 -0800
Subject: [PATCH 003/107] Bump actions/upload-artifact from 5 to 6 (#1196)
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 5 to 6.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v5...v6)
---
updated-dependencies:
- dependency-name: actions/upload-artifact
dependency-version: '6'
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/package-linux.yml | 2 +-
.github/workflows/package-macos.yml | 2 +-
.github/workflows/package-osx-legacy.yml | 2 +-
.github/workflows/package-windows.yml | 2 +-
.github/workflows/package-windows7.yml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/package-linux.yml b/.github/workflows/package-linux.yml
index afa1c42..72b95a4 100644
--- a/.github/workflows/package-linux.yml
+++ b/.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*'
diff --git a/.github/workflows/package-macos.yml b/.github/workflows/package-macos.yml
index a132ce0..66187a6 100644
--- a/.github/workflows/package-macos.yml
+++ b/.github/workflows/package-macos.yml
@@ -80,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
diff --git a/.github/workflows/package-osx-legacy.yml b/.github/workflows/package-osx-legacy.yml
index 2422229..086e7f4 100644
--- a/.github/workflows/package-osx-legacy.yml
+++ b/.github/workflows/package-osx-legacy.yml
@@ -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
diff --git a/.github/workflows/package-windows.yml b/.github/workflows/package-windows.yml
index 1d4bf92..34148a9 100644
--- a/.github/workflows/package-windows.yml
+++ b/.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
diff --git a/.github/workflows/package-windows7.yml b/.github/workflows/package-windows7.yml
index cfa2df0..9ea0782 100644
--- a/.github/workflows/package-windows7.yml
+++ b/.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
From 8e5d57364d70239c0d259e1d14431c35f08139f1 Mon Sep 17 00:00:00 2001
From: jaroslawjanas
Date: Mon, 15 Dec 2025 03:55:02 +0100
Subject: [PATCH 004/107] Remove environment.yml
---
environment.yml | 16 ----------------
1 file changed, 16 deletions(-)
delete mode 100644 environment.yml
diff --git a/environment.yml b/environment.yml
deleted file mode 100644
index 0a9ba52..0000000
--- a/environment.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: kcc
-channels:
- - conda-forge
- - defaults
-dependencies:
- - python=3.11
- - Pillow>=11.3.0
- - psutil>=5.9.5
- - python-slugify>=1.2.1
- - raven>=6.0.0
- - distro
- - natsort>=8.4.0
- - pip
- - pip:
- - mozjpeg-lossless-optimization>=1.1.2
- - pyside6>=6.5.1
From f088ad732ed1a67e625f42e42370881a49f167a8 Mon Sep 17 00:00:00 2001
From: Alex Xu
Date: Tue, 23 Dec 2025 13:19:40 -0800
Subject: [PATCH 005/107] default MACOSX_DEPLOYMENT_TARGET
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index bd17012..f791414 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@ class BuildBinaryCommand(setuptools.Command):
if sys.platform == 'darwin':
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')
+ min_os = os.getenv('MACOSX_DEPLOYMENT_TARGET', '')
if min_os.startswith('10.1'):
os.system(f'appdmg kcc.json dist/kcc_osx_{min_os.replace(".", "_")}_legacy_{VERSION}.dmg')
else:
From f74e108a3e2df3b33f9b0d04edaf31625573e686 Mon Sep 17 00:00:00 2001
From: tokyis
Date: Sat, 27 Dec 2025 21:19:20 +0100
Subject: [PATCH 006/107] Fixed resizing bug
caused by misplaced closing parenthesis.
---
kindlecomicconverter/image.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kindlecomicconverter/image.py b/kindlecomicconverter/image.py
index fc7e07b..582b4b7 100755
--- a/kindlecomicconverter/image.py
+++ b/kindlecomicconverter/image.py
@@ -485,7 +485,7 @@ class ComicPage:
if self.opt.kindle_azw3 and any(dim > 1920 for dim in self.image.size):
self.image = ImageOps.contain(self.image, (1920, 1920), Image.Resampling.LANCZOS)
elif self.image.size[0] > self.size[0] * 2 or self.image.size[1] > self.size[1]:
- self.image = ImageOps.contain(self.image, (self.size[0] * 2, self.size[1], Image.Resampling.LANCZOS))
+ self.image = ImageOps.contain(self.image, (self.size[0] * 2, self.size[1]), Image.Resampling.LANCZOS)
return
ratio_device = float(self.size[1]) / float(self.size[0])
From 9b63b7af2cb181907e70cbaa861dea368b64b21e Mon Sep 17 00:00:00 2001
From: Alex Xu
Date: Sat, 27 Dec 2025 12:23:39 -0800
Subject: [PATCH 007/107] Bump version to 9.3.8
---
kindlecomicconverter/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kindlecomicconverter/__init__.py b/kindlecomicconverter/__init__.py
index 749d3e7..1431e2f 100644
--- a/kindlecomicconverter/__init__.py
+++ b/kindlecomicconverter/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '9.3.7'
+__version__ = '9.3.8'
__license__ = 'ISC'
__copyright__ = '2012-2022, Ciro Mattia Gonano , Pawel Jastrzebski , darodi'
__docformat__ = 'restructuredtext en'
From c58387f4f47f1b2c82a82095e0740d749223ea81 Mon Sep 17 00:00:00 2001
From: Alex Xu
Date: Sat, 27 Dec 2025 17:18:05 -0800
Subject: [PATCH 008/107] partial support for Kindle Scribe 2025 models (#1203)
* partial Kindle Scribe 2025 support
* make variables better
* remove quad
---
kindlecomicconverter/KCC_gui.py | 18 +++++++++++++-----
kindlecomicconverter/comic2ebook.py | 4 ++--
kindlecomicconverter/image.py | 5 ++++-
3 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py
index f86b02d..186ed93 100644
--- a/kindlecomicconverter/KCC_gui.py
+++ b/kindlecomicconverter/KCC_gui.py
@@ -772,7 +772,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
GUI.rotateBox.setEnabled(True)
GUI.borderBox.setEnabled(True)
profile = GUI.profiles[str(GUI.deviceBox.currentText())]
- if profile['Label'] != 'KS':
+ if not profile['Label'].startswith('KS'):
GUI.upscaleBox.setEnabled(True)
GUI.croppingBox.setEnabled(True)
GUI.interPanelCropBox.setEnabled(True)
@@ -797,7 +797,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
def toggleImageFormatBox(self, value):
profile = GUI.profiles[str(GUI.deviceBox.currentText())]
if value == 1:
- if profile['Label'] == 'KS':
+ if profile['Label'].startswith('KS'):
current_format = GUI.formats[str(GUI.formatBox.currentText())]['format']
for bad_format in ('MOBI', 'EPUB'):
if bad_format in current_format:
@@ -859,7 +859,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
if not GUI.webtoonBox.isChecked():
GUI.qualityBox.setEnabled(profile['PVOptions'])
GUI.upscaleBox.setChecked(profile['DefaultUpscale'])
- if profile['Label'] == 'KS':
+ if profile['Label'].startswith('KS'):
GUI.upscaleBox.setDisabled(True)
else:
if not GUI.webtoonBox.isChecked():
@@ -1180,9 +1180,15 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KPW34'},
"Kindle Voyage": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0,
'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KV'},
- "Kindle Scribe": {
+ "Kindle Scribe 1/2": {
'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'ForceColor': False, 'Label': 'KS',
},
+ "Kindle Scribe 3": {
+ 'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'ForceColor': False, 'Label': 'KS3',
+ },
+ "Kindle Scribe Colorsoft": {
+ 'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'ForceColor': True, 'Label': 'KSCS',
+ },
"Kindle 11": {
'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'ForceColor': False, 'Label': 'K11',
},
@@ -1257,9 +1263,11 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
'Label': 'OTHER'},
}
profilesGUI = [
+ "Kindle Scribe Colorsoft",
+ "Kindle Scribe 3",
"Kindle Colorsoft",
"Kindle Paperwhite 12",
- "Kindle Scribe",
+ "Kindle Scribe 1/2",
"Kindle Paperwhite 11",
"Kindle 11",
"Kindle Oasis 9/10",
diff --git a/kindlecomicconverter/comic2ebook.py b/kindlecomicconverter/comic2ebook.py
index 357b67e..1f1f35a 100755
--- a/kindlecomicconverter/comic2ebook.py
+++ b/kindlecomicconverter/comic2ebook.py
@@ -1237,7 +1237,7 @@ def detectSuboptimalProcessing(tmppath, orgpath):
GUI.addMessage.emit('Source files are probably created by KCC. The second conversion will decrease quality.'
, 'warning', False)
GUI.addMessage.emit('', '', False)
- if imageSmaller > imageNumber * 0.25 and not options.upscale and not options.stretch and options.profile != 'KS':
+ if imageSmaller > imageNumber * 0.25 and not options.upscale and not options.stretch and not options.profile.startswith('KS'):
print("WARNING: More than 25% of images are smaller than target device resolution. "
"Consider enabling stretching or upscaling to improve readability.")
if GUI:
@@ -1556,7 +1556,7 @@ def makeBook(source, qtgui=None, job_progress=''):
else:
checkTools(source)
options.kindle_azw3 = options.iskindle and ('MOBI' in options.format or 'EPUB' in options.format)
- options.kindle_scribe_azw3 = options.profile == 'KS' and ('MOBI' in options.format or 'EPUB' in options.format)
+ options.kindle_scribe_azw3 = options.profile.startswith('KS') and options.kindle_azw3
checkPre(source)
print(f"{job_progress}Preparing source images...")
path = getWorkFolder(source)
diff --git a/kindlecomicconverter/image.py b/kindlecomicconverter/image.py
index 582b4b7..c4e5ed2 100755
--- a/kindlecomicconverter/image.py
+++ b/kindlecomicconverter/image.py
@@ -101,8 +101,10 @@ class ProfileData:
'KO': ("Kindle Oasis 2/3/Paperwhite 12", (1264, 1680), Palette16, 1.0),
'K11': ("Kindle 11", (1072, 1448), Palette16, 1.0),
'KPW5': ("Kindle Paperwhite 5/Signature Edition", (1236, 1648), Palette16, 1.0),
- 'KS': ("Kindle Scribe", (1860, 2480), Palette16, 1.0),
+ 'KS': ("Kindle Scribe 1/2", (1860, 2480), Palette16, 1.0),
'KCS': ("Kindle Colorsoft", (1264, 1680), Palette16, 1.0),
+ 'KS3': ("Kindle Scribe 3", (1920, 2640), Palette16, 1.0),
+ 'KSCS': ("Kindle Scribe Colorsoft", (1920, 2640), Palette16, 1.0),
}
ProfilesKindle = {
@@ -562,6 +564,7 @@ class Cover:
size = list(self.options.profileData[1])
if self.options.kindle_scribe_azw3:
+ size[0] = min(size[0], 1920)
size[1] = min(size[1], 1920)
self.image.thumbnail(tuple(size), Image.Resampling.LANCZOS)
From e14abe1787a462cfcef3622e61ae5eb4d81ea344 Mon Sep 17 00:00:00 2001
From: Alex Xu
Date: Sun, 28 Dec 2025 14:54:12 -0800
Subject: [PATCH 009/107] default jpg quality of 90 for scribe colorsoft
(#1204)
---
README.md | 1 +
kindlecomicconverter/comic2ebook.py | 7 +++++++
kindlecomicconverter/image.py | 10 +++++-----
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 0055e6c..8e90038 100644
--- a/README.md
+++ b/README.md
@@ -255,6 +255,7 @@ PROCESSING:
--forcecolor Don't convert images to grayscale
--forcepng Create PNG files instead JPEG
--mozjpeg Create JPEG files using mozJpeg
+ --jpeg-quality The JPEG quality, on a scale from 0 (worst) to 95 (best). Default 85 for most devices.
--maximizestrips Turn 1x4 strips to 2x2 strips
-d, --delete Delete source file(s) or a directory. It's not recoverable.
diff --git a/kindlecomicconverter/comic2ebook.py b/kindlecomicconverter/comic2ebook.py
index 1f1f35a..3c79bcb 100755
--- a/kindlecomicconverter/comic2ebook.py
+++ b/kindlecomicconverter/comic2ebook.py
@@ -1380,6 +1380,8 @@ def makeParser():
help="Create PNG files instead JPEG")
processing_options.add_argument("--mozjpeg", action="store_true", dest="mozjpeg", default=False,
help="Create JPEG files using mozJpeg")
+ processing_options.add_argument("--jpeg-quality", type=int, dest="jpegquality",
+ help="The JPEG quality, on a scale from 0 (worst) to 95 (best). Default 85 for most devices.")
processing_options.add_argument("--maximizestrips", action="store_true", dest="maximizestrips", default=False,
help="Turn 1x4 strips to 2x2 strips")
processing_options.add_argument("-d", "--delete", action="store_true", dest="delete", default=False,
@@ -1479,6 +1481,11 @@ def checkOptions(options):
image.ProfileData.Profiles["Custom"] = newProfile
options.profile = "Custom"
options.profileData = image.ProfileData.Profiles[options.profile]
+ if not options.jpegquality:
+ if options.profile.startswith('KS') or options.profile == 'KCS':
+ options.jpegquality = 90
+ else:
+ options.jpegquality = 85
return options
diff --git a/kindlecomicconverter/image.py b/kindlecomicconverter/image.py
index c4e5ed2..3199c23 100755
--- a/kindlecomicconverter/image.py
+++ b/kindlecomicconverter/image.py
@@ -408,13 +408,13 @@ class ComicPage:
targetPath += '.jpg'
if self.opt.mozjpeg:
with io.BytesIO() as output:
- image.save(output, format="JPEG", optimize=1, quality=85)
+ image.save(output, format="JPEG", optimize=1, quality=self.opt.jpegquality)
input_jpeg_bytes = output.getvalue()
output_jpeg_bytes = mozjpeg_lossless_optimization.optimize(input_jpeg_bytes)
with open(targetPath, "wb") as output_jpeg_file:
output_jpeg_file.write(output_jpeg_bytes)
else:
- image.save(targetPath, 'JPEG', optimize=1, quality=85)
+ image.save(targetPath, 'JPEG', optimize=1, quality=self.opt.jpegquality)
return targetPath
def gammaCorrectImage(self):
@@ -584,7 +584,7 @@ class Cover:
def save_to_epub(self, target, tomeid, len_tomes=0):
try:
if tomeid == 0:
- self.image.save(target, "JPEG", optimize=1, quality=85)
+ self.image.save(target, "JPEG", optimize=1, quality=self.options.jpegquality)
else:
copy = self.image.copy()
draw = ImageDraw.Draw(copy)
@@ -598,7 +598,7 @@ class Cover:
stroke_fill=0,
stroke_width=25
)
- copy.save(target, "JPEG", optimize=1, quality=85)
+ copy.save(target, "JPEG", optimize=1, quality=self.options.jpegquality)
except IOError:
raise RuntimeError('Failed to save cover.')
@@ -606,6 +606,6 @@ class Cover:
self.image = ImageOps.contain(self.image, (300, 470), Image.Resampling.LANCZOS)
try:
self.image.save(os.path.join(kindle.path.split('documents')[0], 'system', 'thumbnails',
- 'thumbnail_' + asin + '_EBOK_portrait.jpg'), 'JPEG', optimize=1, quality=85)
+ 'thumbnail_' + asin + '_EBOK_portrait.jpg'), 'JPEG', optimize=1, quality=self.options.jpegquality)
except IOError:
raise RuntimeError('Failed to upload cover.')
From f9064ef0e419219a7f1e3ad548406221721d3bdb Mon Sep 17 00:00:00 2001
From: jaroslawjanas
Date: Mon, 29 Dec 2025 10:37:52 -0800
Subject: [PATCH 010/107] configurable jpg quality (#1205)
---
gui/KCC.ui | 945 +++++++++++++++++---------------
kindlecomicconverter/KCC_gui.py | 10 +
kindlecomicconverter/KCC_ui.py | 636 +++++++++++----------
3 files changed, 850 insertions(+), 741 deletions(-)
diff --git a/gui/KCC.ui b/gui/KCC.ui
index 205a76b..431873f 100644
--- a/gui/KCC.ui
+++ b/gui/KCC.ui
@@ -7,7 +7,7 @@
0
0
566
- 581
+ 658
@@ -22,6 +22,483 @@
5
+ -
+
+
+
+ 0
+ 30
+
+
+
+
+ true
+
+
+
+ false
+
+
+ Qt::AlignmentFlag::AlignJustify|Qt::AlignmentFlag::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+
+ 0
+ 30
+
+
+
+ <html><head/><body><p style='white-space:pre'>Shift+Click to edit directory.</p></body></html>
+
+
+ Metadata Editor
+
+
+
+ :/Other/icons/editor.png:/Other/icons/editor.png
+
+
+
+ -
+
+
+
+ 0
+ 30
+
+
+
+ Support me on Ko-fi
+
+
+
+ :/Brand/icons/kofi_symbol.png:/Brand/icons/kofi_symbol.png
+
+
+
+ 19
+ 16
+
+
+
+
+ -
+
+
+
+ 0
+ 30
+
+
+
+ Wiki
+
+
+
+ :/Other/icons/wiki.png:/Other/icons/wiki.png
+
+
+
+
+
+
+ -
+
+
+ false
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ 300
+
+
+ 1
+
+
+ Qt::Orientation::Horizontal
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 99
+
+
+ 5
+
+
+ 0
+
+
+
+ -
+
+
+ <html><head/><body><p>After calculating the cropping boundaries, "back up" a specified percentage amount.</p></body></html>
+
+
+ Preserve Margin %
+
+
+
+ -
+
+
+ Cropping power:
+
+
+
+
+
+
+ -
+
+
+ false
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ <html><head/><body><p style='white-space:pre'>Resolution of the target device.</p></body></html>
+
+
+ Custom height:
+
+
+
+ -
+
+
+ <html><head/><body><p style='white-space:pre'>Resolution of the target device.</p></body></html>
+
+
+ 6000
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ <html><head/><body><p style='white-space:pre'>Resolution of the target device.</p></body></html>
+
+
+ Custom width:
+
+
+
+ -
+
+
+ <html><head/><body><p style='white-space:pre'>Resolution of the target device.</p></body></html>
+
+
+ 8000
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+
+ 0
+ 30
+
+
+
+
+ true
+
+
+
+ <html><head/><body><p style='white-space:pre'>Shift+Click to select the output directory for this list.</p></body></html>
+
+
+ Convert
+
+
+
+ :/Other/icons/convert.png:/Other/icons/convert.png
+
+
+
+ -
+
+
+
+ 0
+ 30
+
+
+
+ Clear list
+
+
+
+ :/Other/icons/clear.png:/Other/icons/clear.png
+
+
+
+ -
+
+
+
+ 0
+ 28
+
+
+
+ <html><head/><body><p style='white-space:pre'>Target device.</p></body></html>
+
+
+
+ -
+
+
+
+ 0
+ 30
+
+
+
+ <html><head/><body><p style='white-space:pre'>Add CBR, CBZ, CB7 or PDF file to queue.</p></body></html>
+
+
+ Add input file(s)
+
+
+
+ :/Other/icons/document_new.png:/Other/icons/document_new.png
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ <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>
+
+
+ Add input folder(s)
+
+
+
+ :/Other/icons/folder_new.png:/Other/icons/folder_new.png
+
+
+
+ -
+
+
+
+ 0
+ 28
+
+
+
+ <html><head/><body><p style='white-space:pre'>Output format.</p></body></html>
+
+
+
+
+ clearButton
+ deviceBox
+ convertButton
+ fileButton
+ directoryButton
+ formatBox
+
+
+ -
+
+
+
+ 0
+ 150
+
+
+
+ <html><head/><body><p>Double click on source to open it in metadata editor.</p></body></html>
+
+
+
+
+
+ QAbstractItemView::SelectionMode::NoSelection
+
+
+ QAbstractItemView::ScrollMode::ScrollPerPixel
+
+
+ QAbstractItemView::ScrollMode::ScrollPerPixel
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ <html><head/><body><p>Warning: chunk size greater than default may cause<br/>performance/battery issues, especially on older devices.</p></body></html>
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Chunk size MB:
+
+
+
+ -
+
+
+ 100
+
+
+ 600
+
+
+ 400
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Greater than default may cause performance issues on older ereaders.
+
+
+
+
+
+
-
@@ -393,101 +870,17 @@
-
-
-
- -
-
-
-
- 0
- 150
-
-
-
- <html><head/><body><p>Double click on source to open it in metadata editor.</p></body></html>
-
-
-
-
-
- QAbstractItemView::SelectionMode::NoSelection
-
-
- QAbstractItemView::ScrollMode::ScrollPerPixel
-
-
- QAbstractItemView::ScrollMode::ScrollPerPixel
-
-
-
- -
-
-
- false
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
-
- 0
- 0
-
-
+
-
+
- <html><head/><body><p style='white-space:pre'>Resolution of the target device.</p></body></html>
+ The JPEG quality, on a scale from 0 (worst) to 95 (best).
+
+Default is 85 for most devices besides Kindle Scribe and Colorsoft, which are 90.
+
+Higher values are larger and higher quality, and may resolve blank page issues.
- Custom height:
-
-
-
- -
-
-
- <html><head/><body><p style='white-space:pre'>Resolution of the target device.</p></body></html>
-
-
- 6000
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- <html><head/><body><p style='white-space:pre'>Resolution of the target device.</p></body></html>
-
-
- Custom width:
-
-
-
- -
-
-
- <html><head/><body><p style='white-space:pre'>Resolution of the target device.</p></body></html>
-
-
- 8000
+ Custom JPEG Quality
@@ -535,9 +928,18 @@
- -
-
-
+
-
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
0
@@ -551,363 +953,22 @@
0
-
-
-
-
- 0
- 30
-
-
-
- <html><head/><body><p style='white-space:pre'>Shift+Click to edit directory.</p></body></html>
-
+
- Metadata Editor
-
-
-
- :/Other/icons/editor.png:/Other/icons/editor.png
+ JPEG Quality:
-
-
-
-
- 0
- 30
-
-
-
- Support me on Ko-fi
-
-
-
- :/Brand/icons/kofi_symbol.png:/Brand/icons/kofi_symbol.png
-
-
-
- 19
- 16
-
-
-
-
- -
-
-
-
- 0
- 30
-
-
-
- Wiki
-
-
-
- :/Other/icons/wiki.png:/Other/icons/wiki.png
-
-
-
-
-
-
- -
-
-
-
- 0
- 30
-
-
-
-
- true
-
-
-
- false
-
-
- Qt::AlignmentFlag::AlignJustify|Qt::AlignmentFlag::AlignVCenter
-
-
-
- -
-
-
- false
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- <html><head/><body><p>After calculating the cropping boundaries, "back up" a specified percentage amount.</p></body></html>
-
-
- Preserve Margin %
-
-
-
- -
-
-
- Cropping power:
-
-
-
- -
-
+
- 300
-
-
- 1
-
-
- Qt::Orientation::Horizontal
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- 99
+ 95
5
- 0
-
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
-
- 0
- 30
-
-
-
-
- true
-
-
-
- <html><head/><body><p style='white-space:pre'>Shift+Click to select the output directory for this list.</p></body></html>
-
-
- Convert
-
-
-
- :/Other/icons/convert.png:/Other/icons/convert.png
-
-
-
- -
-
-
-
- 0
- 30
-
-
-
- Clear list
-
-
-
- :/Other/icons/clear.png:/Other/icons/clear.png
-
-
-
- -
-
-
-
- 0
- 28
-
-
-
- <html><head/><body><p style='white-space:pre'>Target device.</p></body></html>
-
-
-
- -
-
-
-
- 0
- 30
-
-
-
- <html><head/><body><p style='white-space:pre'>Add CBR, CBZ, CB7 or PDF file to queue.</p></body></html>
-
-
- Add input file(s)
-
-
-
- :/Other/icons/document_new.png:/Other/icons/document_new.png
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- <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>
-
-
- Add input folder(s)
-
-
-
- :/Other/icons/folder_new.png:/Other/icons/folder_new.png
-
-
-
- -
-
-
-
- 0
- 28
-
-
-
- <html><head/><body><p style='white-space:pre'>Output format.</p></body></html>
-
-
-
-
- clearButton
- deviceBox
- convertButton
- fileButton
- directoryButton
- formatBox
-
-
- -
-
-
-
- 0
- 0
-
-
-
- false
-
-
- <html><head/><body><p>Warning: chunk size greater than default may cause<br/>performance/battery issues, especially on older devices.</p></body></html>
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
-
- 0
- 0
-
-
-
- Chunk size MB:
-
-
-
- -
-
-
- 100
-
-
- 600
-
-
- 400
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Greater than default may cause performance issues on older ereaders.
+ 85
diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py
index 186ed93..f17d13a 100644
--- a/kindlecomicconverter/KCC_gui.py
+++ b/kindlecomicconverter/KCC_gui.py
@@ -347,6 +347,8 @@ class WorkerThread(QThread):
options.forcepng = True
elif GUI.mozJpegBox.checkState() == Qt.CheckState.Checked:
options.mozjpeg = True
+ if GUI.jpegQualityBox.isChecked():
+ options.jpegquality = GUI.jpegQualitySpinBox.value()
if GUI.currentMode > 2:
options.customwidth = str(GUI.widthBox.value())
options.customheight = str(GUI.heightBox.value())
@@ -742,6 +744,12 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
GUI.croppingWidget.setVisible(False)
self.changeCroppingPower(100) # 1.0
+ def togglejpegqualityBox(self, value):
+ if value:
+ GUI.jpegQualityWidget.setVisible(True)
+ else:
+ GUI.jpegQualityWidget.setVisible(False)
+
def togglewebtoonBox(self, value):
if value:
self.addMessage('You can choose a taller device profile to get taller cuts in webtoon mode.', 'info')
@@ -1026,6 +1034,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
'disableProcessingBox': GUI.disableProcessingBox.checkState(),
'metadataTitleBox': GUI.metadataTitleBox.checkState(),
'mozJpegBox': GUI.mozJpegBox.checkState(),
+ 'jpegQualityBox': GUI.jpegQualityBox.checkState(),
'widthBox': GUI.widthBox.value(),
'heightBox': GUI.heightBox.value(),
'deleteBox': GUI.deleteBox.checkState(),
@@ -1354,6 +1363,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
GUI.gammaBox.stateChanged.connect(self.togglegammaBox)
GUI.croppingBox.stateChanged.connect(self.togglecroppingBox)
GUI.croppingPowerSlider.valueChanged.connect(self.changeCroppingPower)
+ GUI.jpegQualityBox.stateChanged.connect(self.togglejpegqualityBox)
GUI.webtoonBox.stateChanged.connect(self.togglewebtoonBox)
GUI.qualityBox.stateChanged.connect(self.togglequalityBox)
GUI.mozJpegBox.stateChanged.connect(self.toggleImageFormatBox)
diff --git a/kindlecomicconverter/KCC_ui.py b/kindlecomicconverter/KCC_ui.py
index 9cdd2d6..daa5092 100644
--- a/kindlecomicconverter/KCC_ui.py
+++ b/kindlecomicconverter/KCC_ui.py
@@ -26,7 +26,7 @@ class Ui_mainWindow(object):
def setupUi(self, mainWindow):
if not mainWindow.objectName():
mainWindow.setObjectName(u"mainWindow")
- mainWindow.resize(566, 581)
+ mainWindow.resize(566, 658)
icon = QIcon()
icon.addFile(u":/Icon/icons/comic2ebook.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
mainWindow.setWindowIcon(icon)
@@ -35,6 +35,253 @@ class Ui_mainWindow(object):
self.gridLayout = QGridLayout(self.centralWidget)
self.gridLayout.setObjectName(u"gridLayout")
self.gridLayout.setContentsMargins(-1, -1, -1, 5)
+ self.progressBar = QProgressBar(self.centralWidget)
+ self.progressBar.setObjectName(u"progressBar")
+ self.progressBar.setMinimumSize(QSize(0, 30))
+ font = QFont()
+ font.setBold(True)
+ self.progressBar.setFont(font)
+ self.progressBar.setVisible(False)
+ self.progressBar.setAlignment(Qt.AlignmentFlag.AlignJustify|Qt.AlignmentFlag.AlignVCenter)
+
+ self.gridLayout.addWidget(self.progressBar, 1, 0, 1, 2)
+
+ self.toolWidget = QWidget(self.centralWidget)
+ self.toolWidget.setObjectName(u"toolWidget")
+ self.horizontalLayout = QHBoxLayout(self.toolWidget)
+ self.horizontalLayout.setObjectName(u"horizontalLayout")
+ self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
+ self.editorButton = QPushButton(self.toolWidget)
+ self.editorButton.setObjectName(u"editorButton")
+ self.editorButton.setMinimumSize(QSize(0, 30))
+ icon1 = QIcon()
+ icon1.addFile(u":/Other/icons/editor.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+ self.editorButton.setIcon(icon1)
+
+ self.horizontalLayout.addWidget(self.editorButton)
+
+ self.kofiButton = QPushButton(self.toolWidget)
+ self.kofiButton.setObjectName(u"kofiButton")
+ self.kofiButton.setMinimumSize(QSize(0, 30))
+ icon2 = QIcon()
+ icon2.addFile(u":/Brand/icons/kofi_symbol.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+ self.kofiButton.setIcon(icon2)
+ self.kofiButton.setIconSize(QSize(19, 16))
+
+ self.horizontalLayout.addWidget(self.kofiButton)
+
+ self.wikiButton = QPushButton(self.toolWidget)
+ self.wikiButton.setObjectName(u"wikiButton")
+ self.wikiButton.setMinimumSize(QSize(0, 30))
+ icon3 = QIcon()
+ icon3.addFile(u":/Other/icons/wiki.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+ self.wikiButton.setIcon(icon3)
+
+ self.horizontalLayout.addWidget(self.wikiButton)
+
+
+ self.gridLayout.addWidget(self.toolWidget, 0, 0, 1, 2)
+
+ self.croppingWidget = QWidget(self.centralWidget)
+ self.croppingWidget.setObjectName(u"croppingWidget")
+ self.croppingWidget.setVisible(False)
+ self.gridLayout_5 = QGridLayout(self.croppingWidget)
+ self.gridLayout_5.setObjectName(u"gridLayout_5")
+ self.gridLayout_5.setContentsMargins(0, 0, 0, 0)
+ self.croppingPowerSlider = QSlider(self.croppingWidget)
+ self.croppingPowerSlider.setObjectName(u"croppingPowerSlider")
+ self.croppingPowerSlider.setMaximum(300)
+ self.croppingPowerSlider.setSingleStep(1)
+ self.croppingPowerSlider.setOrientation(Qt.Orientation.Horizontal)
+
+ self.gridLayout_5.addWidget(self.croppingPowerSlider, 0, 1, 1, 1)
+
+ self.preserveMarginBox = QSpinBox(self.croppingWidget)
+ self.preserveMarginBox.setObjectName(u"preserveMarginBox")
+ sizePolicy = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ sizePolicy.setHeightForWidth(self.preserveMarginBox.sizePolicy().hasHeightForWidth())
+ self.preserveMarginBox.setSizePolicy(sizePolicy)
+ self.preserveMarginBox.setMaximum(99)
+ self.preserveMarginBox.setSingleStep(5)
+ self.preserveMarginBox.setValue(0)
+
+ self.gridLayout_5.addWidget(self.preserveMarginBox, 1, 1, 1, 1)
+
+ self.preserveMarginLabel = QLabel(self.croppingWidget)
+ self.preserveMarginLabel.setObjectName(u"preserveMarginLabel")
+
+ self.gridLayout_5.addWidget(self.preserveMarginLabel, 1, 0, 1, 1)
+
+ self.croppingPowerLabel = QLabel(self.croppingWidget)
+ self.croppingPowerLabel.setObjectName(u"croppingPowerLabel")
+
+ self.gridLayout_5.addWidget(self.croppingPowerLabel, 0, 0, 1, 1)
+
+
+ self.gridLayout.addWidget(self.croppingWidget, 9, 0, 1, 2)
+
+ self.customWidget = QWidget(self.centralWidget)
+ self.customWidget.setObjectName(u"customWidget")
+ self.customWidget.setVisible(False)
+ self.gridLayout_3 = QGridLayout(self.customWidget)
+ self.gridLayout_3.setObjectName(u"gridLayout_3")
+ 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)
+ sizePolicy1.setHorizontalStretch(0)
+ sizePolicy1.setVerticalStretch(0)
+ sizePolicy1.setHeightForWidth(self.hLabel.sizePolicy().hasHeightForWidth())
+ self.hLabel.setSizePolicy(sizePolicy1)
+
+ self.gridLayout_3.addWidget(self.hLabel, 0, 2, 1, 1)
+
+ self.widthBox = QSpinBox(self.customWidget)
+ self.widthBox.setObjectName(u"widthBox")
+ self.widthBox.setMaximum(6000)
+
+ self.gridLayout_3.addWidget(self.widthBox, 0, 1, 1, 1)
+
+ self.wLabel = QLabel(self.customWidget)
+ self.wLabel.setObjectName(u"wLabel")
+ sizePolicy1.setHeightForWidth(self.wLabel.sizePolicy().hasHeightForWidth())
+ self.wLabel.setSizePolicy(sizePolicy1)
+
+ self.gridLayout_3.addWidget(self.wLabel, 0, 0, 1, 1)
+
+ self.heightBox = QSpinBox(self.customWidget)
+ self.heightBox.setObjectName(u"heightBox")
+ self.heightBox.setMaximum(8000)
+
+ self.gridLayout_3.addWidget(self.heightBox, 0, 3, 1, 1)
+
+
+ self.gridLayout.addWidget(self.customWidget, 8, 0, 1, 2)
+
+ self.buttonWidget = QWidget(self.centralWidget)
+ self.buttonWidget.setObjectName(u"buttonWidget")
+ sizePolicy2 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed)
+ sizePolicy2.setHorizontalStretch(0)
+ sizePolicy2.setVerticalStretch(0)
+ sizePolicy2.setHeightForWidth(self.buttonWidget.sizePolicy().hasHeightForWidth())
+ self.buttonWidget.setSizePolicy(sizePolicy2)
+ self.gridLayout_4 = QGridLayout(self.buttonWidget)
+ self.gridLayout_4.setObjectName(u"gridLayout_4")
+ self.gridLayout_4.setContentsMargins(0, 0, 0, 0)
+ self.convertButton = QPushButton(self.buttonWidget)
+ self.convertButton.setObjectName(u"convertButton")
+ self.convertButton.setMinimumSize(QSize(0, 30))
+ self.convertButton.setFont(font)
+ icon4 = QIcon()
+ icon4.addFile(u":/Other/icons/convert.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+ self.convertButton.setIcon(icon4)
+
+ 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()
+ icon5.addFile(u":/Other/icons/clear.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+ self.clearButton.setIcon(icon5)
+
+ self.gridLayout_4.addWidget(self.clearButton, 0, 3, 1, 1)
+
+ self.deviceBox = QComboBox(self.buttonWidget)
+ self.deviceBox.setObjectName(u"deviceBox")
+ self.deviceBox.setMinimumSize(QSize(0, 28))
+
+ self.gridLayout_4.addWidget(self.deviceBox, 1, 1, 1, 1)
+
+ self.fileButton = QPushButton(self.buttonWidget)
+ self.fileButton.setObjectName(u"fileButton")
+ self.fileButton.setMinimumSize(QSize(0, 30))
+ icon6 = QIcon()
+ icon6.addFile(u":/Other/icons/document_new.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+ self.fileButton.setIcon(icon6)
+
+ self.gridLayout_4.addWidget(self.fileButton, 0, 1, 1, 1)
+
+ self.directoryButton = QPushButton(self.buttonWidget)
+ self.directoryButton.setObjectName(u"directoryButton")
+ sizePolicy3 = QSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Minimum)
+ sizePolicy3.setHorizontalStretch(0)
+ sizePolicy3.setVerticalStretch(0)
+ sizePolicy3.setHeightForWidth(self.directoryButton.sizePolicy().hasHeightForWidth())
+ self.directoryButton.setSizePolicy(sizePolicy3)
+ icon7 = QIcon()
+ icon7.addFile(u":/Other/icons/folder_new.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+ self.directoryButton.setIcon(icon7)
+
+ self.gridLayout_4.addWidget(self.directoryButton, 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, 1)
+
+ self.clearButton.raise_()
+ self.deviceBox.raise_()
+ self.convertButton.raise_()
+ self.fileButton.raise_()
+ self.directoryButton.raise_()
+ self.formatBox.raise_()
+
+ self.gridLayout.addWidget(self.buttonWidget, 3, 0, 1, 2)
+
+ self.jobList = QListWidget(self.centralWidget)
+ self.jobList.setObjectName(u"jobList")
+ self.jobList.setMinimumSize(QSize(0, 150))
+ self.jobList.setStyleSheet(u"")
+ self.jobList.setSelectionMode(QAbstractItemView.SelectionMode.NoSelection)
+ self.jobList.setVerticalScrollMode(QAbstractItemView.ScrollMode.ScrollPerPixel)
+ self.jobList.setHorizontalScrollMode(QAbstractItemView.ScrollMode.ScrollPerPixel)
+
+ self.gridLayout.addWidget(self.jobList, 2, 0, 1, 2)
+
+ self.chunkSizeWidget = QWidget(self.centralWidget)
+ self.chunkSizeWidget.setObjectName(u"chunkSizeWidget")
+ sizePolicy4 = QSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Fixed)
+ sizePolicy4.setHorizontalStretch(0)
+ sizePolicy4.setVerticalStretch(0)
+ sizePolicy4.setHeightForWidth(self.chunkSizeWidget.sizePolicy().hasHeightForWidth())
+ self.chunkSizeWidget.setSizePolicy(sizePolicy4)
+ self.chunkSizeWidget.setVisible(False)
+ self.horizontalLayout_4 = QHBoxLayout(self.chunkSizeWidget)
+ self.horizontalLayout_4.setSpacing(0)
+ self.horizontalLayout_4.setObjectName(u"horizontalLayout_4")
+ self.horizontalLayout_4.setContentsMargins(0, 0, 0, 0)
+ self.chunkSizeLabel = QLabel(self.chunkSizeWidget)
+ self.chunkSizeLabel.setObjectName(u"chunkSizeLabel")
+ sizePolicy5 = QSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Preferred)
+ sizePolicy5.setHorizontalStretch(0)
+ sizePolicy5.setVerticalStretch(0)
+ sizePolicy5.setHeightForWidth(self.chunkSizeLabel.sizePolicy().hasHeightForWidth())
+ self.chunkSizeLabel.setSizePolicy(sizePolicy5)
+
+ self.horizontalLayout_4.addWidget(self.chunkSizeLabel)
+
+ self.chunkSizeBox = QSpinBox(self.chunkSizeWidget)
+ self.chunkSizeBox.setObjectName(u"chunkSizeBox")
+ self.chunkSizeBox.setMinimum(100)
+ self.chunkSizeBox.setMaximum(600)
+ self.chunkSizeBox.setValue(400)
+
+ self.horizontalLayout_4.addWidget(self.chunkSizeBox)
+
+ self.chunkSizeWarnLabel = QLabel(self.chunkSizeWidget)
+ self.chunkSizeWarnLabel.setObjectName(u"chunkSizeWarnLabel")
+ sizePolicy5.setHeightForWidth(self.chunkSizeWarnLabel.sizePolicy().hasHeightForWidth())
+ self.chunkSizeWarnLabel.setSizePolicy(sizePolicy5)
+
+ self.horizontalLayout_4.addWidget(self.chunkSizeWarnLabel)
+
+
+ self.gridLayout.addWidget(self.chunkSizeWidget, 6, 0, 1, 1)
+
self.optionWidget = QWidget(self.centralWidget)
self.optionWidget.setObjectName(u"optionWidget")
self.gridLayout_2 = QGridLayout(self.optionWidget)
@@ -42,11 +289,8 @@ class Ui_mainWindow(object):
self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
self.titleEdit = QLineEdit(self.optionWidget)
self.titleEdit.setObjectName(u"titleEdit")
- sizePolicy = QSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Fixed)
- sizePolicy.setHorizontalStretch(0)
- sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.titleEdit.sizePolicy().hasHeightForWidth())
- self.titleEdit.setSizePolicy(sizePolicy)
+ sizePolicy4.setHeightForWidth(self.titleEdit.sizePolicy().hasHeightForWidth())
+ self.titleEdit.setSizePolicy(sizePolicy4)
self.titleEdit.setFocusPolicy(Qt.FocusPolicy.ClickFocus)
self.titleEdit.setClearButtonEnabled(False)
@@ -148,8 +392,8 @@ class Ui_mainWindow(object):
self.authorEdit = QLineEdit(self.optionWidget)
self.authorEdit.setObjectName(u"authorEdit")
- sizePolicy.setHeightForWidth(self.authorEdit.sizePolicy().hasHeightForWidth())
- self.authorEdit.setSizePolicy(sizePolicy)
+ sizePolicy4.setHeightForWidth(self.authorEdit.sizePolicy().hasHeightForWidth())
+ self.authorEdit.setSizePolicy(sizePolicy4)
self.authorEdit.setFocusPolicy(Qt.FocusPolicy.ClickFocus)
self.authorEdit.setClearButtonEnabled(False)
@@ -196,11 +440,8 @@ class Ui_mainWindow(object):
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)
+ sizePolicy.setHeightForWidth(self.defaultOutputFolderBox.sizePolicy().hasHeightForWidth())
+ self.defaultOutputFolderBox.setSizePolicy(sizePolicy)
self.defaultOutputFolderBox.setTristate(True)
self.horizontalLayout_3.addWidget(self.defaultOutputFolderBox)
@@ -208,66 +449,21 @@ class Ui_mainWindow(object):
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.defaultOutputFolderButton.setIcon(icon7)
self.horizontalLayout_3.addWidget(self.defaultOutputFolderButton)
self.gridLayout_2.addWidget(self.outputFolderWidget, 0, 2, 1, 1)
+ self.jpegQualityBox = QCheckBox(self.optionWidget)
+ self.jpegQualityBox.setObjectName(u"jpegQualityBox")
+
+ self.gridLayout_2.addWidget(self.jpegQualityBox, 8, 0, 1, 1)
+
self.gridLayout.addWidget(self.optionWidget, 5, 0, 1, 2)
- self.jobList = QListWidget(self.centralWidget)
- self.jobList.setObjectName(u"jobList")
- self.jobList.setMinimumSize(QSize(0, 150))
- self.jobList.setStyleSheet(u"")
- self.jobList.setSelectionMode(QAbstractItemView.SelectionMode.NoSelection)
- self.jobList.setVerticalScrollMode(QAbstractItemView.ScrollMode.ScrollPerPixel)
- self.jobList.setHorizontalScrollMode(QAbstractItemView.ScrollMode.ScrollPerPixel)
-
- self.gridLayout.addWidget(self.jobList, 2, 0, 1, 2)
-
- self.customWidget = QWidget(self.centralWidget)
- self.customWidget.setObjectName(u"customWidget")
- self.customWidget.setVisible(False)
- self.gridLayout_3 = QGridLayout(self.customWidget)
- self.gridLayout_3.setObjectName(u"gridLayout_3")
- self.gridLayout_3.setContentsMargins(0, 0, 0, 0)
- self.hLabel = QLabel(self.customWidget)
- self.hLabel.setObjectName(u"hLabel")
- sizePolicy2 = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred)
- sizePolicy2.setHorizontalStretch(0)
- sizePolicy2.setVerticalStretch(0)
- sizePolicy2.setHeightForWidth(self.hLabel.sizePolicy().hasHeightForWidth())
- self.hLabel.setSizePolicy(sizePolicy2)
-
- self.gridLayout_3.addWidget(self.hLabel, 0, 2, 1, 1)
-
- self.widthBox = QSpinBox(self.customWidget)
- self.widthBox.setObjectName(u"widthBox")
- self.widthBox.setMaximum(6000)
-
- self.gridLayout_3.addWidget(self.widthBox, 0, 1, 1, 1)
-
- self.wLabel = QLabel(self.customWidget)
- self.wLabel.setObjectName(u"wLabel")
- sizePolicy2.setHeightForWidth(self.wLabel.sizePolicy().hasHeightForWidth())
- self.wLabel.setSizePolicy(sizePolicy2)
-
- self.gridLayout_3.addWidget(self.wLabel, 0, 0, 1, 1)
-
- self.heightBox = QSpinBox(self.customWidget)
- self.heightBox.setObjectName(u"heightBox")
- self.heightBox.setMaximum(8000)
-
- self.gridLayout_3.addWidget(self.heightBox, 0, 3, 1, 1)
-
-
- self.gridLayout.addWidget(self.customWidget, 8, 0, 1, 2)
-
self.gammaWidget = QWidget(self.centralWidget)
self.gammaWidget.setObjectName(u"gammaWidget")
self.gammaWidget.setVisible(False)
@@ -290,196 +486,29 @@ class Ui_mainWindow(object):
self.gridLayout.addWidget(self.gammaWidget, 7, 0, 1, 2)
- self.toolWidget = QWidget(self.centralWidget)
- self.toolWidget.setObjectName(u"toolWidget")
- self.horizontalLayout = QHBoxLayout(self.toolWidget)
- self.horizontalLayout.setObjectName(u"horizontalLayout")
- self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
- self.editorButton = QPushButton(self.toolWidget)
- self.editorButton.setObjectName(u"editorButton")
- self.editorButton.setMinimumSize(QSize(0, 30))
- icon2 = QIcon()
- icon2.addFile(u":/Other/icons/editor.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
- self.editorButton.setIcon(icon2)
+ self.jpegQualityWidget = QWidget(self.centralWidget)
+ self.jpegQualityWidget.setObjectName(u"jpegQualityWidget")
+ sizePolicy1.setHeightForWidth(self.jpegQualityWidget.sizePolicy().hasHeightForWidth())
+ self.jpegQualityWidget.setSizePolicy(sizePolicy1)
+ self.jpegQualityWidget.setVisible(False)
+ self.horizontalLayout_12 = QHBoxLayout(self.jpegQualityWidget)
+ self.horizontalLayout_12.setObjectName(u"horizontalLayout_12")
+ self.horizontalLayout_12.setContentsMargins(0, 0, 0, 0)
+ self.jpegQualityLabel = QLabel(self.jpegQualityWidget)
+ self.jpegQualityLabel.setObjectName(u"jpegQualityLabel")
- self.horizontalLayout.addWidget(self.editorButton)
+ self.horizontalLayout_12.addWidget(self.jpegQualityLabel)
- self.kofiButton = QPushButton(self.toolWidget)
- self.kofiButton.setObjectName(u"kofiButton")
- self.kofiButton.setMinimumSize(QSize(0, 30))
- icon3 = QIcon()
- icon3.addFile(u":/Brand/icons/kofi_symbol.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
- self.kofiButton.setIcon(icon3)
- self.kofiButton.setIconSize(QSize(19, 16))
+ self.jpegQualitySpinBox = QSpinBox(self.jpegQualityWidget)
+ self.jpegQualitySpinBox.setObjectName(u"jpegQualitySpinBox")
+ self.jpegQualitySpinBox.setMaximum(95)
+ self.jpegQualitySpinBox.setSingleStep(5)
+ self.jpegQualitySpinBox.setValue(85)
- self.horizontalLayout.addWidget(self.kofiButton)
-
- self.wikiButton = QPushButton(self.toolWidget)
- self.wikiButton.setObjectName(u"wikiButton")
- self.wikiButton.setMinimumSize(QSize(0, 30))
- icon4 = QIcon()
- icon4.addFile(u":/Other/icons/wiki.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
- self.wikiButton.setIcon(icon4)
-
- self.horizontalLayout.addWidget(self.wikiButton)
+ self.horizontalLayout_12.addWidget(self.jpegQualitySpinBox)
- self.gridLayout.addWidget(self.toolWidget, 0, 0, 1, 2)
-
- self.progressBar = QProgressBar(self.centralWidget)
- self.progressBar.setObjectName(u"progressBar")
- self.progressBar.setMinimumSize(QSize(0, 30))
- font = QFont()
- font.setBold(True)
- self.progressBar.setFont(font)
- self.progressBar.setVisible(False)
- self.progressBar.setAlignment(Qt.AlignmentFlag.AlignJustify|Qt.AlignmentFlag.AlignVCenter)
-
- self.gridLayout.addWidget(self.progressBar, 1, 0, 1, 2)
-
- self.croppingWidget = QWidget(self.centralWidget)
- self.croppingWidget.setObjectName(u"croppingWidget")
- self.croppingWidget.setVisible(False)
- self.gridLayout_5 = QGridLayout(self.croppingWidget)
- self.gridLayout_5.setObjectName(u"gridLayout_5")
- self.gridLayout_5.setContentsMargins(0, 0, 0, 0)
- self.preserveMarginLabel = QLabel(self.croppingWidget)
- self.preserveMarginLabel.setObjectName(u"preserveMarginLabel")
-
- self.gridLayout_5.addWidget(self.preserveMarginLabel, 1, 0, 1, 1)
-
- self.croppingPowerLabel = QLabel(self.croppingWidget)
- self.croppingPowerLabel.setObjectName(u"croppingPowerLabel")
-
- self.gridLayout_5.addWidget(self.croppingPowerLabel, 0, 0, 1, 1)
-
- self.croppingPowerSlider = QSlider(self.croppingWidget)
- self.croppingPowerSlider.setObjectName(u"croppingPowerSlider")
- self.croppingPowerSlider.setMaximum(300)
- self.croppingPowerSlider.setSingleStep(1)
- self.croppingPowerSlider.setOrientation(Qt.Orientation.Horizontal)
-
- self.gridLayout_5.addWidget(self.croppingPowerSlider, 0, 1, 1, 1)
-
- self.preserveMarginBox = QSpinBox(self.croppingWidget)
- self.preserveMarginBox.setObjectName(u"preserveMarginBox")
- sizePolicy1.setHeightForWidth(self.preserveMarginBox.sizePolicy().hasHeightForWidth())
- self.preserveMarginBox.setSizePolicy(sizePolicy1)
- self.preserveMarginBox.setMaximum(99)
- self.preserveMarginBox.setSingleStep(5)
- self.preserveMarginBox.setValue(0)
-
- self.gridLayout_5.addWidget(self.preserveMarginBox, 1, 1, 1, 1)
-
-
- self.gridLayout.addWidget(self.croppingWidget, 9, 0, 1, 2)
-
- self.buttonWidget = QWidget(self.centralWidget)
- self.buttonWidget.setObjectName(u"buttonWidget")
- sizePolicy3 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed)
- sizePolicy3.setHorizontalStretch(0)
- sizePolicy3.setVerticalStretch(0)
- sizePolicy3.setHeightForWidth(self.buttonWidget.sizePolicy().hasHeightForWidth())
- self.buttonWidget.setSizePolicy(sizePolicy3)
- self.gridLayout_4 = QGridLayout(self.buttonWidget)
- self.gridLayout_4.setObjectName(u"gridLayout_4")
- self.gridLayout_4.setContentsMargins(0, 0, 0, 0)
- self.convertButton = QPushButton(self.buttonWidget)
- self.convertButton.setObjectName(u"convertButton")
- self.convertButton.setMinimumSize(QSize(0, 30))
- self.convertButton.setFont(font)
- icon5 = QIcon()
- icon5.addFile(u":/Other/icons/convert.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
- 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))
- icon6 = QIcon()
- icon6.addFile(u":/Other/icons/clear.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
- self.clearButton.setIcon(icon6)
-
- self.gridLayout_4.addWidget(self.clearButton, 0, 3, 1, 1)
-
- self.deviceBox = QComboBox(self.buttonWidget)
- self.deviceBox.setObjectName(u"deviceBox")
- self.deviceBox.setMinimumSize(QSize(0, 28))
-
- self.gridLayout_4.addWidget(self.deviceBox, 1, 1, 1, 1)
-
- self.fileButton = QPushButton(self.buttonWidget)
- self.fileButton.setObjectName(u"fileButton")
- self.fileButton.setMinimumSize(QSize(0, 30))
- icon7 = QIcon()
- icon7.addFile(u":/Other/icons/document_new.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
- self.fileButton.setIcon(icon7)
-
- self.gridLayout_4.addWidget(self.fileButton, 0, 1, 1, 1)
-
- self.directoryButton = QPushButton(self.buttonWidget)
- self.directoryButton.setObjectName(u"directoryButton")
- sizePolicy4 = QSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Minimum)
- sizePolicy4.setHorizontalStretch(0)
- sizePolicy4.setVerticalStretch(0)
- sizePolicy4.setHeightForWidth(self.directoryButton.sizePolicy().hasHeightForWidth())
- self.directoryButton.setSizePolicy(sizePolicy4)
- self.directoryButton.setIcon(icon1)
-
- self.gridLayout_4.addWidget(self.directoryButton, 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, 1)
-
- self.clearButton.raise_()
- self.deviceBox.raise_()
- self.convertButton.raise_()
- self.fileButton.raise_()
- self.directoryButton.raise_()
- self.formatBox.raise_()
-
- self.gridLayout.addWidget(self.buttonWidget, 3, 0, 1, 2)
-
- self.chunkSizeWidget = QWidget(self.centralWidget)
- self.chunkSizeWidget.setObjectName(u"chunkSizeWidget")
- sizePolicy.setHeightForWidth(self.chunkSizeWidget.sizePolicy().hasHeightForWidth())
- self.chunkSizeWidget.setSizePolicy(sizePolicy)
- self.chunkSizeWidget.setVisible(False)
- self.horizontalLayout_4 = QHBoxLayout(self.chunkSizeWidget)
- self.horizontalLayout_4.setSpacing(0)
- self.horizontalLayout_4.setObjectName(u"horizontalLayout_4")
- self.horizontalLayout_4.setContentsMargins(0, 0, 0, 0)
- self.chunkSizeLabel = QLabel(self.chunkSizeWidget)
- self.chunkSizeLabel.setObjectName(u"chunkSizeLabel")
- sizePolicy5 = QSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Preferred)
- sizePolicy5.setHorizontalStretch(0)
- sizePolicy5.setVerticalStretch(0)
- sizePolicy5.setHeightForWidth(self.chunkSizeLabel.sizePolicy().hasHeightForWidth())
- self.chunkSizeLabel.setSizePolicy(sizePolicy5)
-
- self.horizontalLayout_4.addWidget(self.chunkSizeLabel)
-
- self.chunkSizeBox = QSpinBox(self.chunkSizeWidget)
- self.chunkSizeBox.setObjectName(u"chunkSizeBox")
- self.chunkSizeBox.setMinimum(100)
- self.chunkSizeBox.setMaximum(600)
- self.chunkSizeBox.setValue(400)
-
- self.horizontalLayout_4.addWidget(self.chunkSizeBox)
-
- self.chunkSizeWarnLabel = QLabel(self.chunkSizeWidget)
- self.chunkSizeWarnLabel.setObjectName(u"chunkSizeWarnLabel")
- sizePolicy5.setHeightForWidth(self.chunkSizeWarnLabel.sizePolicy().hasHeightForWidth())
- self.chunkSizeWarnLabel.setSizePolicy(sizePolicy5)
-
- self.horizontalLayout_4.addWidget(self.chunkSizeWarnLabel)
-
-
- self.gridLayout.addWidget(self.chunkSizeWidget, 6, 0, 1, 1)
+ self.gridLayout.addWidget(self.jpegQualityWidget, 10, 0, 1, 1)
mainWindow.setCentralWidget(self.centralWidget)
self.statusBar = QStatusBar(mainWindow)
@@ -531,6 +560,58 @@ class Ui_mainWindow(object):
def retranslateUi(self, mainWindow):
mainWindow.setWindowTitle(QCoreApplication.translate("mainWindow", u"Kindle Comic Converter", None))
+#if QT_CONFIG(tooltip)
+ self.editorButton.setToolTip(QCoreApplication.translate("mainWindow", u"Shift+Click to edit directory.
", None))
+#endif // QT_CONFIG(tooltip)
+ self.editorButton.setText(QCoreApplication.translate("mainWindow", u"Metadata Editor", None))
+ self.kofiButton.setText(QCoreApplication.translate("mainWindow", u"Support me on Ko-fi", None))
+ self.wikiButton.setText(QCoreApplication.translate("mainWindow", u"Wiki", None))
+#if QT_CONFIG(tooltip)
+ self.preserveMarginLabel.setToolTip(QCoreApplication.translate("mainWindow", u"After calculating the cropping boundaries, "back up" a specified percentage amount.
", None))
+#endif // QT_CONFIG(tooltip)
+ self.preserveMarginLabel.setText(QCoreApplication.translate("mainWindow", u"Preserve Margin %", None))
+ self.croppingPowerLabel.setText(QCoreApplication.translate("mainWindow", u"Cropping power:", None))
+#if QT_CONFIG(tooltip)
+ self.hLabel.setToolTip(QCoreApplication.translate("mainWindow", u" Resolution of the target device.
", 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"Resolution of the target device.
", None))
+#endif // QT_CONFIG(tooltip)
+#if QT_CONFIG(tooltip)
+ self.wLabel.setToolTip(QCoreApplication.translate("mainWindow", u"