From 17206ddf8bb70dc0ec21b344ab24735c28ab9347 Mon Sep 17 00:00:00 2001 From: Constantin Hong <61624808+Constantin1489@users.noreply.github.com> Date: Fri, 3 Mar 2023 07:38:27 +0900 Subject: [PATCH] GUI delete option checkBox (closes #458) (#488) * gui/func: add delete button (closes ciromattia#458) * Update KCC_ui.py fix typo * GUI delete option checkBox --------- Co-authored-by: darodi <4682830+darodi@users.noreply.github.com> --- gui/KCC.ui | 15 +++++++++++++-- kindlecomicconverter/KCC_gui.py | 3 +++ kindlecomicconverter/KCC_ui.py | 12 +++++++++--- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/gui/KCC.ui b/gui/KCC.ui index afc934d..bcc1d20 100644 --- a/gui/KCC.ui +++ b/gui/KCC.ui @@ -175,10 +175,20 @@ + + + + Delete input file(s) or directory. It's not recoverable! + + + Delete input + + + - <html><head/><body><p style='white-space:pre'>Do not process any image, ignore profil and processing options</p></body></html> + <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> Disable processing @@ -257,7 +267,7 @@ - 10 + 200 1 @@ -600,6 +610,7 @@ croppingBox mozJpegBox maximizeStrips + deleteBox disableProcessingBox editorButton wikiButton diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py index b38b962..92c35a4 100644 --- a/kindlecomicconverter/KCC_gui.py +++ b/kindlecomicconverter/KCC_gui.py @@ -294,6 +294,8 @@ class WorkerThread(QtCore.QThread): options.maximizestrips = True if GUI.disableProcessingBox.isChecked(): options.noprocessing = True + if GUI.deleteBox.isChecked(): + options.delete = True if GUI.mozJpegBox.checkState() == 1: options.forcepng = True elif GUI.mozJpegBox.checkState() == 2: @@ -823,6 +825,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): 'mozJpegBox': GUI.mozJpegBox.checkState(), 'widthBox': GUI.widthBox.value(), 'heightBox': GUI.heightBox.value(), + 'deleteBox': GUI.deleteBox.value(), 'maximizeStrips': GUI.maximizeStrips.checkState(), 'gammaSlider': float(self.gammaValue) * 100}) self.settings.sync() diff --git a/kindlecomicconverter/KCC_ui.py b/kindlecomicconverter/KCC_ui.py index 66b2d17..0db83b0 100644 --- a/kindlecomicconverter/KCC_ui.py +++ b/kindlecomicconverter/KCC_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'gui/KCC.ui' # -# Created by: PyQt5 UI code generator 5.15.6 +# Created by: PyQt5 UI code generator 5.15.7 # # 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. @@ -70,6 +70,9 @@ class Ui_mainWindow(object): 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.gridLayout_2.addWidget(self.deleteBox, 4, 1, 1, 1) self.disableProcessingBox = QtWidgets.QCheckBox(self.optionWidget) self.disableProcessingBox.setObjectName("disableProcessingBox") self.gridLayout_2.addWidget(self.disableProcessingBox, 4, 2, 1, 1) @@ -254,7 +257,8 @@ class Ui_mainWindow(object): mainWindow.setTabOrder(self.colorBox, self.croppingBox) mainWindow.setTabOrder(self.croppingBox, self.mozJpegBox) mainWindow.setTabOrder(self.mozJpegBox, self.maximizeStrips) - mainWindow.setTabOrder(self.maximizeStrips, self.disableProcessingBox) + 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) @@ -290,7 +294,9 @@ class Ui_mainWindow(object): self.maximizeStrips.setText(_translate("mainWindow", "1x4 to 2x2 strips")) self.croppingBox.setToolTip(_translate("mainWindow", "

Unchecked - Disabled

Disabled

Indeterminate - Margins
Margins

Checked - Margins + page numbers
Margins +page numbers

")) self.croppingBox.setText(_translate("mainWindow", "Cropping mode")) - self.disableProcessingBox.setToolTip(_translate("mainWindow", "

Do not process any image, ignore profil and processing options

")) + self.deleteBox.setToolTip(_translate("mainWindow", "Delete input file(s) or directory. It\'s not recoverable!")) + self.deleteBox.setText(_translate("mainWindow", "Delete input")) + self.disableProcessingBox.setToolTip(_translate("mainWindow", "
Do not process any image, ignore profile and processing options
")) self.disableProcessingBox.setText(_translate("mainWindow", "Disable processing")) self.gammaLabel.setText(_translate("mainWindow", "Gamma: Auto")) self.croppingPowerLabel.setText(_translate("mainWindow", "Cropping power:"))