diff options
| author | Paweł Jastrzębski <[email protected]> | 2016-11-25 18:57:42 +0100 |
|---|---|---|
| committer | Paweł Jastrzębski <[email protected]> | 2016-11-25 18:57:42 +0100 |
| commit | 2e8555654307f230070be0316c3fe66c35ed67eb (patch) | |
| tree | 2bfa9fd735f1552ee25d19ea19721219e7a72852 | |
| parent | Refactored and improved output splitting (diff) | |
| download | kcc-2e8555654307f230070be0316c3fe66c35ed67eb.tar.gz kcc-2e8555654307f230070be0316c3fe66c35ed67eb.tar.bz2 kcc-2e8555654307f230070be0316c3fe66c35ed67eb.zip | |
GUI update
| -rw-r--r-- | gui/KCC.ui | 8 | ||||
| -rw-r--r-- | kcc/KCC_gui.py | 11 | ||||
| -rw-r--r-- | kcc/KCC_ui.py | 14 |
3 files changed, 19 insertions, 14 deletions
diff --git a/gui/KCC.ui b/gui/KCC.ui index 3bdd917..0b94d42 100644 --- a/gui/KCC.ui +++ b/gui/KCC.ui @@ -228,12 +228,12 @@ </widget> </item> <item row="2" column="1"> - <widget class="QCheckBox" name="noDitheringBox"> + <widget class="QCheckBox" name="outputSplit"> <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Create PNG files instead JPEG.<br/>Quality increase is not noticeable on most of devices.<br/>Output files <span style=" font-weight:600;">might</span> be smaller.<br/><span style=" font-weight:600;">MOBI conversion will be much slower.</span></p></body></html></string> + <string><html><head/><body><p style='white-space:pre'><span style=" font-weight:600; text-decoration: underline;">Unchecked - Automatic mode<br/></span>Output will be splitted automatically.</p><p style='white-space:pre'><span style=" font-weight:600; text-decoration: underline;">Checked - Volume mode<br/></span>Every subdirectory will be considered as separate volume.</p></body></html></string> </property> <property name="text"> - <string>PNG output</string> + <string>Output split</string> </property> </widget> </item> @@ -510,7 +510,7 @@ <tabstop>upscaleBox</tabstop> <tabstop>gammaBox</tabstop> <tabstop>borderBox</tabstop> - <tabstop>noDitheringBox</tabstop> + <tabstop>outputSplit</tabstop> <tabstop>colorBox</tabstop> <tabstop>editorButton</tabstop> <tabstop>wikiButton</tabstop> diff --git a/kcc/KCC_gui.py b/kcc/KCC_gui.py index dcc9e1b..133d31a 100644 --- a/kcc/KCC_gui.py +++ b/kcc/KCC_gui.py @@ -270,8 +270,8 @@ class WorkerThread(QtCore.QThread): options.white_borders = True elif GUI.borderBox.checkState() == 2: options.black_borders = True - if GUI.noDitheringBox.isChecked(): - options.forcepng = True + if GUI.outputSplit.isChecked(): + options.batchsplit = 2 if GUI.colorBox.isChecked(): options.forcecolor = True if GUI.currentMode > 2: @@ -646,6 +646,11 @@ class KCCGUI(KCC_ui.Ui_mainWindow): else: GUI.formatBox.setCurrentIndex(profile['DefaultFormat']) GUI.qualityBox.setEnabled(profile['PVOptions']) + if str(GUI.formatBox.currentText()) == 'MOBI/AZW3': + GUI.outputSplit.setEnabled(True) + else: + GUI.outputSplit.setEnabled(False) + GUI.outputSplit.setChecked(False) def stripTags(self, html): s = HTMLStripper() @@ -762,7 +767,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): 'upscaleBox': GUI.upscaleBox.checkState(), 'borderBox': GUI.borderBox.checkState(), 'webtoonBox': GUI.webtoonBox.checkState(), - 'noDitheringBox': GUI.noDitheringBox.checkState(), + 'outputSplit': GUI.outputSplit.checkState(), 'colorBox': GUI.colorBox.checkState(), 'widthBox': GUI.widthBox.value(), 'heightBox': GUI.heightBox.value(), diff --git a/kcc/KCC_ui.py b/kcc/KCC_ui.py index 5e718ef..6e2ed50 100644 --- a/kcc/KCC_ui.py +++ b/kcc/KCC_ui.py @@ -97,9 +97,9 @@ class Ui_mainWindow(object): self.borderBox.setTristate(True) self.borderBox.setObjectName("borderBox") self.gridLayout_2.addWidget(self.borderBox, 2, 0, 1, 1) - self.noDitheringBox = QtWidgets.QCheckBox(self.optionWidget) - self.noDitheringBox.setObjectName("noDitheringBox") - self.gridLayout_2.addWidget(self.noDitheringBox, 2, 1, 1, 1) + self.outputSplit = QtWidgets.QCheckBox(self.optionWidget) + self.outputSplit.setObjectName("outputSplit") + self.gridLayout_2.addWidget(self.outputSplit, 2, 1, 1, 1) self.colorBox = QtWidgets.QCheckBox(self.optionWidget) self.colorBox.setObjectName("colorBox") self.gridLayout_2.addWidget(self.colorBox, 2, 2, 1, 1) @@ -219,8 +219,8 @@ class Ui_mainWindow(object): mainWindow.setTabOrder(self.webtoonBox, self.upscaleBox) mainWindow.setTabOrder(self.upscaleBox, self.gammaBox) mainWindow.setTabOrder(self.gammaBox, self.borderBox) - mainWindow.setTabOrder(self.borderBox, self.noDitheringBox) - mainWindow.setTabOrder(self.noDitheringBox, self.colorBox) + mainWindow.setTabOrder(self.borderBox, self.outputSplit) + mainWindow.setTabOrder(self.outputSplit, self.colorBox) mainWindow.setTabOrder(self.colorBox, self.editorButton) mainWindow.setTabOrder(self.editorButton, self.wikiButton) mainWindow.setTabOrder(self.wikiButton, self.jobList) @@ -251,8 +251,8 @@ class Ui_mainWindow(object): self.gammaBox.setText(_translate("mainWindow", "Custom gamma")) self.borderBox.setToolTip(_translate("mainWindow", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Autodetection<br/></span>Color of margins fill will be detected automatically.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - White<br/></span>Margins will be filled with white color.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Black<br/></span>Margins will be filled with black color.</p></body></html>")) self.borderBox.setText(_translate("mainWindow", "W/B margins")) - self.noDitheringBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Create PNG files instead JPEG.<br/>Quality increase is not noticeable on most of devices.<br/>Output files <span style=\" font-weight:600;\">might</span> be smaller.<br/><span style=\" font-weight:600;\">MOBI conversion will be much slower.</span></p></body></html>")) - self.noDitheringBox.setText(_translate("mainWindow", "PNG output")) + self.outputSplit.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Automatic mode<br/></span>Output will be splitted automatically.</p><p style=\'white-space:pre\'><span style=\" font-weight:600; text-decoration: underline;\">Checked - Volume mode<br/></span>Every subdirectory will be considered as separate volume.</p></body></html>")) + self.outputSplit.setText(_translate("mainWindow", "Output split")) self.colorBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Disable conversion to grayscale.</p></body></html>")) self.colorBox.setText(_translate("mainWindow", "Color mode")) self.gammaLabel.setText(_translate("mainWindow", "Gamma: Auto")) |