Adding a switch on GUI interface in order to control cropping options

gui/KCC.ui

@@ -22,7 +22,7 @@
     <property name="bottomMargin">
      <number>5</number>
     </property>
-    <item row="4" column="0" colspan="2">
+    <item row="5" column="0" colspan="2">
      <widget class="QWidget" name="optionWidget" native="true">
       <layout class="QGridLayout" name="gridLayout_2">
        <property name="leftMargin">
@@ -139,16 +139,6 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="2">
-        <widget class="QCheckBox" name="disableProcessingBox">
-         <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Do not process any image, ignore profil and processing options&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="text">
-          <string>Disable processing</string>
-         </property>
-        </widget>
-       </item>
        <item row="3" column="0">
         <widget class="QCheckBox" name="mozJpegBox">
          <property name="toolTip">
@@ -172,6 +162,29 @@
          </property>
         </widget>
        </item>
+       <item row="3" column="2">
+        <widget class="QCheckBox" name="croppingBox">
+         <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 - Disabled&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Disabled&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - Margins&lt;br/&gt;&lt;/span&gt;Margins&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Margins + page numbers&lt;br/&gt;&lt;/span&gt;Margins +page numbers&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string>Cropping mode</string>
+         </property>
+         <property name="tristate">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="2">
+        <widget class="QCheckBox" name="disableProcessingBox">
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Do not process any image, ignore profil and processing options&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string>Disable processing</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
     </item>
@@ -216,6 +229,47 @@
       </layout>
      </widget>
     </item>
+    <item row="8" column="0" colspan="2">
+     <widget class="QWidget" name="croppingWidget" native="true">
+      <property name="visible">
+       <bool>false</bool>
+      </property>
+      <layout class="QHBoxLayout" name="horizontalLayout_3">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="croppingPowerLabel">
+         <property name="text">
+          <string>Cropping power:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSlider" name="croppingPowerSlider">
+         <property name="maximum">
+          <number>10</number>
+         </property>
+         <property name="singleStep">
+          <number>1</number>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
     <item row="3" column="0" colspan="2">
      <widget class="QWidget" name="buttonWidget" native="true">
       <property name="sizePolicy">
@@ -288,9 +342,6 @@
          <property name="toolTip">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Target device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
-         <property name="sizeAdjustPolicy">
-          <enum>QComboBox::AdjustToMinimumContentsLength</enum>
-         </property>
         </widget>
        </item>
        <item row="1" column="3">
@@ -304,9 +355,6 @@
          <property name="toolTip">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Output format.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
-         <property name="sizeAdjustPolicy">
-          <enum>QComboBox::AdjustToMinimumContentsLength</enum>
-         </property>
         </widget>
        </item>
        <item row="1" column="2">
@@ -319,7 +367,6 @@
          </property>
          <property name="font">
           <font>
-           <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
@@ -442,7 +489,6 @@
       </property>
       <property name="font">
        <font>
-        <weight>75</weight>
         <bold>true</bold>
        </font>
       </property>
@@ -551,12 +597,17 @@
   <tabstop>borderBox</tabstop>
   <tabstop>outputSplit</tabstop>
   <tabstop>colorBox</tabstop>
+  <tabstop>croppingBox</tabstop>
+  <tabstop>mozJpegBox</tabstop>
+  <tabstop>maximizeStrips</tabstop>
+  <tabstop>disableProcessingBox</tabstop>
   <tabstop>editorButton</tabstop>
   <tabstop>wikiButton</tabstop>
   <tabstop>jobList</tabstop>
   <tabstop>gammaSlider</tabstop>
   <tabstop>widthBox</tabstop>
   <tabstop>heightBox</tabstop>
+  <tabstop>croppingPowerSlider</tabstop>
  </tabstops>
  <resources>
   <include location="KCC.qrc"/>

kindlecomicconverter/KCC_gui.py

@@ -278,6 +278,9 @@ class WorkerThread(QtCore.QThread):
             options.upscale = True
         if GUI.gammaBox.isChecked() and float(GUI.gammaValue) > 0.09:
             options.gamma = float(GUI.gammaValue)
+        options.cropping = GUI.croppingBox.checkState()
+        if GUI.croppingBox.checkState() >= 1:
+            options.croppingp = float(GUI.croppingPowerValue)
         if GUI.borderBox.checkState() == 1:
             options.white_borders = True
         elif GUI.borderBox.checkState() == 2:
@@ -609,6 +612,13 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             if self.currentMode != 3:
                 self.modeChange(1)
 
+    def togglecroppingBox(self, value):
+        if value:
+             GUI.croppingWidget.setVisible(True)
+        else:
+            GUI.croppingWidget.setVisible(False)
+            self.changeCroppingPower(100)  # 1.0
+
     def togglewebtoonBox(self, value):
         if value:
             GUI.qualityBox.setEnabled(False)
@@ -649,6 +659,13 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
         GUI.gammaSlider.setValue(valueRaw)
         self.gammaValue = value
 
+    def changeCroppingPower(self, value):
+        valueRaw = int(5 * round(float(value) / 5))
+        value = '%.2f' % (float(valueRaw) / 100)
+        GUI.croppingPowerLabel.setText('Cropping Power: ' + str(value))
+        GUI.croppingPowerSlider.setValue(valueRaw)
+        self.croppingPowerValue = value
+
     def changeDevice(self):
         profile = GUI.profiles[str(GUI.deviceBox.currentText())]
         if profile['ForceExpert']:
@@ -794,6 +811,8 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                                            'rotateBox': GUI.rotateBox.checkState(),
                                            'qualityBox': GUI.qualityBox.checkState(),
                                            'gammaBox': GUI.gammaBox.checkState(),
+                                           'croppingBox': GUI.croppingBox.checkState(),
+                                           'croppingPowerSlider': float(self.croppingPowerValue) * 100,
                                            'upscaleBox': GUI.upscaleBox.checkState(),
                                            'borderBox': GUI.borderBox.checkState(),
                                            'webtoonBox': GUI.webtoonBox.checkState(),
@@ -896,7 +915,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
         self.currentFormat = self.settings.value('currentFormat', 0, type=int)
         self.startNumber = self.settings.value('startNumber', 0, type=int)
         self.windowSize = self.settings.value('windowSize', '0x0', type=str)
-        self.options = self.settings.value('options', {'gammaSlider': 0})
+        self.options = self.settings.value('options', {'gammaSlider': 0, 'croppingBox': 2, 'croppingPowerSlider': 100})
         self.worker = WorkerThread()
         self.versionCheck = VersionThread()
         self.progress = ProgressThread()
@@ -905,6 +924,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
         self.needClean = True
         self.kindleGen = False
         self.gammaValue = 1.0
+        self.croppingPowerValue = 1.0
         self.currentMode = 1
         self.targetDirectory = ''
         self.sentry = Client(release=__version__)
@@ -1063,6 +1083,8 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
         GUI.convertButton.clicked.connect(self.convertStart)
         GUI.gammaSlider.valueChanged.connect(self.changeGamma)
         GUI.gammaBox.stateChanged.connect(self.togglegammaBox)
+        GUI.croppingBox.stateChanged.connect(self.togglecroppingBox)
+        GUI.croppingPowerSlider.valueChanged.connect(self.changeCroppingPower)
         GUI.webtoonBox.stateChanged.connect(self.togglewebtoonBox)
         GUI.qualityBox.stateChanged.connect(self.togglequalityBox)
         GUI.deviceBox.activated.connect(self.changeDevice)
@@ -1111,6 +1133,10 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                 if GUI.gammaSlider.isEnabled():
                     GUI.gammaSlider.setValue(int(self.options[option]))
                     self.changeGamma(int(self.options[option]))
+            elif str(option) == "croppingPowerSlider":
+                if GUI.croppingPowerSlider.isEnabled():
+                    GUI.croppingPowerSlider.setValue(int(self.options[option]))
+                    self.changeCroppingPower(int(self.options[option]))
             else:
                 try:
                     if eval('GUI.' + str(option)).isEnabled():

kindlecomicconverter/KCC_ui.py

@@ -59,9 +59,6 @@ class Ui_mainWindow(object):
         self.qualityBox.setTristate(True)
         self.qualityBox.setObjectName("qualityBox")
         self.gridLayout_2.addWidget(self.qualityBox, 0, 2, 1, 1)
-        self.disableProcessingBox = QtWidgets.QCheckBox(self.optionWidget)
-        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")
@@ -69,7 +66,14 @@ class Ui_mainWindow(object):
         self.maximizeStrips = QtWidgets.QCheckBox(self.optionWidget)
         self.maximizeStrips.setObjectName("maximizeStrips")
         self.gridLayout_2.addWidget(self.maximizeStrips, 3, 1, 1, 1)
-        self.gridLayout.addWidget(self.optionWidget, 4, 0, 1, 2)
+        self.croppingBox = QtWidgets.QCheckBox(self.optionWidget)
+        self.croppingBox.setTristate(True)
+        self.croppingBox.setObjectName("croppingBox")
+        self.gridLayout_2.addWidget(self.croppingBox, 3, 2, 1, 1)
+        self.disableProcessingBox = QtWidgets.QCheckBox(self.optionWidget)
+        self.disableProcessingBox.setObjectName("disableProcessingBox")
+        self.gridLayout_2.addWidget(self.disableProcessingBox, 4, 2, 1, 1)
+        self.gridLayout.addWidget(self.optionWidget, 5, 0, 1, 2)
         self.gammaWidget = QtWidgets.QWidget(self.centralWidget)
         self.gammaWidget.setVisible(False)
         self.gammaWidget.setObjectName("gammaWidget")
@@ -86,6 +90,22 @@ class Ui_mainWindow(object):
         self.gammaSlider.setObjectName("gammaSlider")
         self.horizontalLayout_2.addWidget(self.gammaSlider)
         self.gridLayout.addWidget(self.gammaWidget, 6, 0, 1, 2)
+        self.croppingWidget = QtWidgets.QWidget(self.centralWidget)
+        self.croppingWidget.setVisible(False)
+        self.croppingWidget.setObjectName("croppingWidget")
+        self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.croppingWidget)
+        self.horizontalLayout_3.setContentsMargins(0, 0, 0, 0)
+        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
+        self.croppingPowerLabel = QtWidgets.QLabel(self.croppingWidget)
+        self.croppingPowerLabel.setObjectName("croppingPowerLabel")
+        self.horizontalLayout_3.addWidget(self.croppingPowerLabel)
+        self.croppingPowerSlider = QtWidgets.QSlider(self.croppingWidget)
+        self.croppingPowerSlider.setMaximum(200)
+        self.croppingPowerSlider.setSingleStep(1)
+        self.croppingPowerSlider.setOrientation(QtCore.Qt.Horizontal)
+        self.croppingPowerSlider.setObjectName("croppingPowerSlider")
+        self.horizontalLayout_3.addWidget(self.croppingPowerSlider)
+        self.gridLayout.addWidget(self.croppingWidget, 8, 0, 1, 2)
         self.buttonWidget = QtWidgets.QWidget(self.centralWidget)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -112,19 +132,16 @@ class Ui_mainWindow(object):
         self.gridLayout_4.addWidget(self.fileButton, 0, 3, 1, 1)
         self.deviceBox = QtWidgets.QComboBox(self.buttonWidget)
         self.deviceBox.setMinimumSize(QtCore.QSize(0, 28))
-        self.deviceBox.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToMinimumContentsLength)
         self.deviceBox.setObjectName("deviceBox")
         self.gridLayout_4.addWidget(self.deviceBox, 1, 0, 1, 1)
         self.formatBox = QtWidgets.QComboBox(self.buttonWidget)
         self.formatBox.setMinimumSize(QtCore.QSize(0, 28))
-        self.formatBox.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToMinimumContentsLength)
         self.formatBox.setObjectName("formatBox")
         self.gridLayout_4.addWidget(self.formatBox, 1, 3, 1, 1)
         self.convertButton = QtWidgets.QPushButton(self.buttonWidget)
         self.convertButton.setMinimumSize(QtCore.QSize(0, 30))
         font = QtGui.QFont()
         font.setBold(True)
-        font.setWeight(75)
         self.convertButton.setFont(font)
         icon3 = QtGui.QIcon()
         icon3.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -176,7 +193,6 @@ class Ui_mainWindow(object):
         self.progressBar.setMinimumSize(QtCore.QSize(0, 30))
         font = QtGui.QFont()
         font.setBold(True)
-        font.setWeight(75)
         self.progressBar.setFont(font)
         self.progressBar.setVisible(False)
         self.progressBar.setAlignment(QtCore.Qt.AlignJustify|QtCore.Qt.AlignVCenter)
@@ -235,12 +251,17 @@ class Ui_mainWindow(object):
         mainWindow.setTabOrder(self.gammaBox, self.borderBox)
         mainWindow.setTabOrder(self.borderBox, self.outputSplit)
         mainWindow.setTabOrder(self.outputSplit, self.colorBox)
-        mainWindow.setTabOrder(self.colorBox, self.editorButton)
+        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.disableProcessingBox, self.editorButton)
         mainWindow.setTabOrder(self.editorButton, self.wikiButton)
         mainWindow.setTabOrder(self.wikiButton, self.jobList)
         mainWindow.setTabOrder(self.jobList, self.gammaSlider)
         mainWindow.setTabOrder(self.gammaSlider, self.widthBox)
         mainWindow.setTabOrder(self.widthBox, self.heightBox)
+        mainWindow.setTabOrder(self.heightBox, self.croppingPowerSlider)
 
     def retranslateUi(self, mainWindow):
         _translate = QtCore.QCoreApplication.translate
@@ -263,13 +284,16 @@ class Ui_mainWindow(object):
         self.mangaBox.setText(_translate("mainWindow", "Manga mode"))
         self.qualityBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - 4 panels<br/></span>Zoom each corner separately.</p><p style=\'white-space:pre\'><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - 2 panels<br/></span>Zoom only the top and bottom of the page.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - 4 high-quality panels<br/></span>Zoom each corner separately. Try to increase the quality of magnification. Check wiki for more details.</p></body></html>"))
         self.qualityBox.setText(_translate("mainWindow", "Panel View 4/2/HQ"))
-        self.disableProcessingBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Do not process any image, ignore profil and processing options</p></body></html>"))
-        self.disableProcessingBox.setText(_translate("mainWindow", "Disable processing"))
         self.mozJpegBox.setToolTip(_translate("mainWindow", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - JPEG<br/></span>Use JPEG files</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - force PNG<br/></span>Create PNG files instead JPEG</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - mozJpeg<br/></span>10-20% smaller JPEG file, with the same image quality, but processing time multiplied by 2</p></body></html>"))
         self.mozJpegBox.setText(_translate("mainWindow", "JPEG/PNG/mozJpeg"))
         self.maximizeStrips.setToolTip(_translate("mainWindow", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - 1x4<br/></span>Keep format 1x4 panels strips.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - 2x2<br/></span>Turn 1x4 strips to 2x2 to maximize screen usage.</p></body></html>"))
         self.maximizeStrips.setText(_translate("mainWindow", "1x4 to 2x2 strips"))
+        self.croppingBox.setToolTip(_translate("mainWindow", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Disabled</span></p><p>Disabled</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Margins<br/></span>Margins</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Margins + page numbers<br/></span>Margins +page numbers</p></body></html>"))
+        self.croppingBox.setText(_translate("mainWindow", "Cropping mode"))
+        self.disableProcessingBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Do not process any image, ignore profil and processing options</p></body></html>"))
+        self.disableProcessingBox.setText(_translate("mainWindow", "Disable processing"))
         self.gammaLabel.setText(_translate("mainWindow", "Gamma: Auto"))
+        self.croppingPowerLabel.setText(_translate("mainWindow", "Cropping power:"))
         self.directoryButton.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Add directory containing JPG, PNG or GIF files to queue.<br/><span style=\" font-weight:600;\">CBR, CBZ and CB7 files inside will not be processed!</span></p></body></html>"))
         self.directoryButton.setText(_translate("mainWindow", "Add directory"))
         self.fileButton.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Add CBR, CBZ, CB7 or PDF file to queue.</p></body></html>"))