about summary refs log tree commit diff
path: root/kindlecomicconverter/KCC_ui.py
diff options
context:
space:
mode:
authorBaitinq <you@example.com>2022-02-08 16:37:59 +0000
committerBaitinq <you@example.com>2022-02-08 16:37:59 +0000
commit73cd0dd107901bebe7d72e2b86ecf8b830a19758 (patch)
tree280efd18cebca3fbb6c71364157830c0f722c0ec /kindlecomicconverter/KCC_ui.py
parentMerge pull request #329 from C0rn3j/master (diff)
downloadkcc-73cd0dd107901bebe7d72e2b86ecf8b830a19758.tar.gz
kcc-73cd0dd107901bebe7d72e2b86ecf8b830a19758.tar.bz2
kcc-73cd0dd107901bebe7d72e2b86ecf8b830a19758.zip
Add outputMerge option (removed outputSplit) HEAD master
Diffstat (limited to 'kindlecomicconverter/KCC_ui.py')
-rw-r--r--kindlecomicconverter/KCC_ui.py18
1 files changed, 13 insertions, 5 deletions
diff --git a/kindlecomicconverter/KCC_ui.py b/kindlecomicconverter/KCC_ui.py
index b70f3ef..0a60c17 100644
--- a/kindlecomicconverter/KCC_ui.py
+++ b/kindlecomicconverter/KCC_ui.py
@@ -100,7 +100,11 @@ class Ui_mainWindow(object):
         self.gridLayout_2.addWidget(self.borderBox, 2, 0, 1, 1)
         self.outputSplit = QtWidgets.QCheckBox(self.optionWidget)
         self.outputSplit.setObjectName("outputSplit")
-        self.gridLayout_2.addWidget(self.outputSplit, 2, 1, 1, 1)
+        self.outputSplit.hide()
+        #self.gridLayout_2.addWidget(self.outputSplit, 2, 1, 1, 1)
+        self.outputMerge = QtWidgets.QCheckBox(self.optionWidget)
+        self.outputMerge.setObjectName("outputMerge")
+        self.gridLayout_2.addWidget(self.outputMerge, 2, 1, 1, 1)
         self.colorBox = QtWidgets.QCheckBox(self.optionWidget)
         self.colorBox.setObjectName("colorBox")
         self.gridLayout_2.addWidget(self.colorBox, 2, 2, 1, 1)
@@ -220,8 +224,10 @@ 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.outputSplit)
-        mainWindow.setTabOrder(self.outputSplit, self.colorBox)
+        #mainWindow.setTabOrder(self.borderBox, self.outputSplit)
+        #mainWindow.setTabOrder(self.outputSplit, self.colorBox)
+        mainWindow.setTabOrder(self.borderBox, self.outputMerge)
+        mainWindow.setTabOrder(self.outputMerge, self.colorBox)
         mainWindow.setTabOrder(self.colorBox, self.editorButton)
         mainWindow.setTabOrder(self.editorButton, self.wikiButton)
         mainWindow.setTabOrder(self.wikiButton, self.jobList)
@@ -252,8 +258,10 @@ 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>The 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.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>The output will be split 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 a separate volume.</p></body></html>"))
-        self.outputSplit.setText(_translate("mainWindow", "Output split"))
+        #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>The output will be split 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 a separate volume.</p></body></html>"))
+        #self.outputSplit.setText(_translate("mainWindow", "Output split"))
+        self.outputMerge.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Automatic mode<br/></span>The output will be split 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 a separate volume.</p></body></html>"))
+        self.outputMerge.setText(_translate("mainWindow", "Output Merge"))
         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"))