diff options
| -rw-r--r-- | gui/KCC.ui | 4 | ||||
| -rw-r--r-- | kcc/KCC_gui.py | 46 | ||||
| -rw-r--r-- | kcc/KCC_ui.py | 4 |
3 files changed, 27 insertions, 27 deletions
diff --git a/gui/KCC.ui b/gui/KCC.ui index eb8b84e..3bdd917 100644 --- a/gui/KCC.ui +++ b/gui/KCC.ui @@ -174,10 +174,10 @@ <item row="0" column="2"> <widget class="QCheckBox" name="qualityBox"> <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>High quality Panel View.<br/>Require source files with bigger resolution than target device.<br/><span style=" font-weight:600;">Highly impact size of output file!</span></p></body></html></string> + <string><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;\">Checked - 2 panels<br/></span>Zoom only the top and bottom of the page.</p></body></html></string> </property> <property name="text"> - <string>HQ zoom</string> + <string>Panel View 4/2</string> </property> </widget> </item> diff --git a/kcc/KCC_gui.py b/kcc/KCC_gui.py index 22052bb..3ebcca5 100644 --- a/kcc/KCC_gui.py +++ b/kcc/KCC_gui.py @@ -257,7 +257,7 @@ class WorkerThread(QtCore.QThread): elif GUI.rotateBox.checkState() == 2: options.splitter = 1 if GUI.qualityBox.isChecked(): - options.hqmode = True + options.autoscale = True if GUI.webtoonBox.isChecked(): options.webtoon = True if GUI.upscaleBox.checkState() == 1: @@ -393,7 +393,7 @@ class WorkerThread(QtCore.QThread): for item in outputPath: comic2ebook.options.covers[outputPath.index(item)][0].saveToKindle( k, comic2ebook.options.covers[outputPath.index(item)][1]) - MW.addMessage.emit('Kindle detected. Uploading covers...', 'info', False) + MW.addMessage.emit('Kindle detected. Uploading covers... <b>Done!</b>', 'info', False) else: GUI.progress.content = '' for item in outputPath: @@ -604,7 +604,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): GUI.upscaleBox.setChecked(True) else: profile = GUI.profiles[str(GUI.deviceBox.currentText())] - if profile['Quality']: + if profile['PVOptions']: GUI.qualityBox.setEnabled(True) GUI.mangaBox.setEnabled(True) GUI.rotateBox.setEnabled(True) @@ -631,9 +631,9 @@ class KCCGUI(KCC_ui.Ui_mainWindow): self.changeFormat() GUI.gammaSlider.setValue(0) self.changeGamma(0) - GUI.qualityBox.setEnabled(profile['Quality']) + GUI.qualityBox.setEnabled(profile['PVOptions']) GUI.upscaleBox.setChecked(profile['DefaultUpscale']) - if not profile['Quality']: + if not profile['PVOptions']: GUI.qualityBox.setChecked(False) if str(GUI.deviceBox.currentText()) == 'Other': self.addMessage('<a href="https://github.com/ciromattia/kcc/wiki/NonKindle-devices">' @@ -645,7 +645,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): GUI.formatBox.setCurrentIndex(outputFormat) else: GUI.formatBox.setCurrentIndex(profile['DefaultFormat']) - GUI.qualityBox.setEnabled(profile['Quality']) + GUI.qualityBox.setEnabled(profile['PVOptions']) def stripTags(self, html): s = HTMLStripper() @@ -896,39 +896,39 @@ class KCCGUI(KCC_ui.Ui_mainWindow): MW.resize(500, 500) self.profiles = { - "Kindle Oasis": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0, + "Kindle Oasis": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'Label': 'KV'}, - "Kindle Voyage": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0, + "Kindle Voyage": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'Label': 'KV'}, - "Kindle PW 3": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0, + "Kindle PW 3": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'Label': 'KV'}, - "Kindle PW 1/2": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0, + "Kindle PW 1/2": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'Label': 'KPW'}, - "Kindle": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0, + "Kindle": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'Label': 'K45'}, - "Kindle DX/DXG": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 2, + "Kindle DX/DXG": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 2, 'DefaultUpscale': False, 'Label': 'KDX'}, - "Kobo Mini/Touch": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 1, + "Kobo Mini/Touch": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 1, 'DefaultUpscale': False, 'Label': 'KoMT'}, - "Kobo Glo": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 1, + "Kobo Glo": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 1, 'DefaultUpscale': False, 'Label': 'KoG'}, - "Kobo Glo HD": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 1, + "Kobo Glo HD": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 1, 'DefaultUpscale': False, 'Label': 'KoGHD'}, - "Kobo Aura": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 1, + "Kobo Aura": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 1, 'DefaultUpscale': False, 'Label': 'KoA'}, - "Kobo Aura HD": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 1, + "Kobo Aura HD": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 1, 'DefaultUpscale': True, 'Label': 'KoAHD'}, - "Kobo Aura H2O": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 1, + "Kobo Aura H2O": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 1, 'DefaultUpscale': True, 'Label': 'KoAH2O'}, - "Kobo Aura ONE": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 1, + "Kobo Aura ONE": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 1, 'DefaultUpscale': True, 'Label': 'KoAO'}, - "Other": {'Quality': False, 'ForceExpert': True, 'DefaultFormat': 1, + "Other": {'PVOptions': False, 'ForceExpert': True, 'DefaultFormat': 1, 'DefaultUpscale': False, 'Label': 'OTHER'}, - "Kindle 1": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 0, + "Kindle 1": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'Label': 'K1'}, - "Kindle 2": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 0, + "Kindle 2": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'Label': 'K2'}, - "Kindle 3": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 0, + "Kindle 3": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'Label': 'K3'}, } profilesGUI = [ diff --git a/kcc/KCC_ui.py b/kcc/KCC_ui.py index 5418e3e..5e718ef 100644 --- a/kcc/KCC_ui.py +++ b/kcc/KCC_ui.py @@ -241,8 +241,8 @@ class Ui_mainWindow(object): self.mangaBox.setText(_translate("mainWindow", "Manga mode")) self.rotateBox.setToolTip(_translate("mainWindow", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Split<br/></span>Double page spreads will be cut into two separate pages.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Rotate and split<br/></span>Double page spreads will be displayed twice. First rotated and then split. </p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Rotate<br/></span>Double page spreads will be rotated.</p></body></html>")) self.rotateBox.setText(_translate("mainWindow", "Spread splitter")) - self.qualityBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>High quality Panel View.<br/>Require source files with bigger resolution than target device.<br/><span style=\" font-weight:600;\">Highly impact size of output file!</span></p></body></html>")) - self.qualityBox.setText(_translate("mainWindow", "HQ zoom")) + 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;\">Checked - 2 panels<br/></span>Zoom only the top and bottom of the page.</p></body></html>")) + self.qualityBox.setText(_translate("mainWindow", "Panel View 4/2")) self.webtoonBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Enable special parsing mode for Korean Webtoons.</p></body></html>")) self.webtoonBox.setText(_translate("mainWindow", "Webtoon mode")) self.upscaleBox.setToolTip(_translate("mainWindow", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Nothing<br/></span>Images smaller than device resolution will not be resized.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Stretching<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be not preserved.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Upscaling<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be preserved.</p></body></html>")) |