diff --git a/gui/KCC.ui b/gui/KCC.ui index bbd698f..aa0eb66 100644 --- a/gui/KCC.ui +++ b/gui/KCC.ui @@ -149,13 +149,16 @@ - + - <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Unchecked - Off<br/></span>Faster</p><p><span style=" font-weight:600; text-decoration: underline;">Checked - On<br/></span>10-20% smaller JPEG file, with the same image quality, but processing time multiplied by 2</p></body></html> + <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> - use mozJpeg + JPEG/PNG/mozJpeg + + + true diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py index 065d64b..cefecb1 100644 --- a/kindlecomicconverter/KCC_gui.py +++ b/kindlecomicconverter/KCC_gui.py @@ -282,7 +282,9 @@ class WorkerThread(QtCore.QThread): options.forcecolor = True if GUI.disableProcessingBox.isChecked(): options.noprocessing = True - if GUI.mozJpegBox.isChecked(): + if GUI.mozJpegBox.checkState() == 1: + options.forcepng = True + elif GUI.mozJpegBox.checkState() == 2: options.mozjpeg = True if GUI.currentMode > 2: options.customwidth = str(GUI.widthBox.value()) diff --git a/kindlecomicconverter/KCC_ui.py b/kindlecomicconverter/KCC_ui.py index 21e310e..188c7b5 100644 --- a/kindlecomicconverter/KCC_ui.py +++ b/kindlecomicconverter/KCC_ui.py @@ -63,6 +63,7 @@ class Ui_mainWindow(object): self.disableProcessingBox.setObjectName("disableProcessingBox") self.gridLayout_2.addWidget(self.disableProcessingBox, 3, 2, 1, 1) self.mozJpegBox = QtWidgets.QCheckBox(self.optionWidget) + self.mozJpegBox.setTristate(True) self.mozJpegBox.setObjectName("mozJpegBox") self.gridLayout_2.addWidget(self.mozJpegBox, 3, 1, 1, 1) self.gridLayout.addWidget(self.optionWidget, 4, 0, 1, 2) @@ -261,8 +262,8 @@ class Ui_mainWindow(object): self.qualityBox.setText(_translate("mainWindow", "Panel View 4/2/HQ")) self.disableProcessingBox.setToolTip(_translate("mainWindow", "

Do not process any image, ignore profil and processing options

")) self.disableProcessingBox.setText(_translate("mainWindow", "Disable processing")) - self.mozJpegBox.setToolTip(_translate("mainWindow", "

Unchecked - Off
Faster

Checked - On
10-20% smaller JPEG file, with the same image quality, but processing time multiplied by 2

")) - self.mozJpegBox.setText(_translate("mainWindow", "use mozJpeg")) + self.mozJpegBox.setToolTip(_translate("mainWindow", "

Unchecked - JPEG
Use JPEG files

Indeterminate - force PNG
Create PNG files instead JPEG

Checked - mozJpeg
10-20% smaller JPEG file, with the same image quality, but processing time multiplied by 2

")) + self.mozJpegBox.setText(_translate("mainWindow", "JPEG/PNG/mozJpeg")) self.gammaLabel.setText(_translate("mainWindow", "Gamma: Auto")) self.directoryButton.setToolTip(_translate("mainWindow", "

Add directory containing JPG, PNG or GIF files to queue.
CBR, CBZ and CB7 files inside will not be processed!

")) self.directoryButton.setText(_translate("mainWindow", "Add directory"))