diff --git a/KCC-OSX.ui b/KCC-OSX.ui index d1e7289..f11dc4a 100644 --- a/KCC-OSX.ui +++ b/KCC-OSX.ui @@ -109,7 +109,7 @@ Qt::NoFocus - <html><head/><body><p><span style=" font-weight:600;">EXPERIMENTAL!<br/></span>Enable auto-splitting of webtoons like <span style=" font-style:italic;">Tower of God</span> or <span style=" font-style:italic;">Noblesse</span>.<br/>Pages with a low width, high height and vertical panel flow.</p></body></html> + <html><head/><body><p>Enable auto-splitting of webtoons like <span style=" font-style:italic;">Tower of God</span> or <span style=" font-style:italic;">Noblesse</span>.<br/>Pages with a low width, high height and vertical panel flow.</p></body></html> Webtoon mode diff --git a/KCC.ui b/KCC.ui index 5387341..5960e23 100644 --- a/KCC.ui +++ b/KCC.ui @@ -97,7 +97,7 @@ Qt::NoFocus - <html><head/><body><p><span style=" font-weight:600;">EXPERIMENTAL!<br/></span>Enable auto-splitting of webtoons like <span style=" font-style:italic;">Tower of God</span> or <span style=" font-style:italic;">Noblesse</span>.<br/>Pages with a low width, high height and vertical panel flow.</p></body></html> + <html><head/><body><p>Enable auto-splitting of webtoons like <span style=" font-style:italic;">Tower of God</span> or <span style=" font-style:italic;">Noblesse</span>.<br/>Pages with a low width, high height and vertical panel flow.</p></body></html> Webtoon mode diff --git a/kcc/KCC_ui.py b/kcc/KCC_ui.py index 757b2a8..2589b64 100644 --- a/kcc/KCC_ui.py +++ b/kcc/KCC_ui.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'KCC.ui' # -# Created: Wed Aug 14 08:39:46 2013 -# by: PyQt4 UI code generator 4.10.2 +# Created: Sat Sep 14 10:28:36 2013 +# by: PyQt4 UI code generator 4.10.3 # # WARNING! All changes made in this file will be lost! @@ -266,7 +266,7 @@ class Ui_KCC(object): self.ProcessingBox.setText(_translate("KCC", "No optimisation", None)) self.UpscaleBox.setToolTip(_translate("KCC", "

Unchecked - Nothing
Images smaller than device resolution will not be resized.

Indeterminate - Stretching
Images smaller than device resolution will be resized. Aspect ratio will be not preserved.

Checked - Upscaling
Images smaller than device resolution will be resized. Aspect ratio will be preserved.

", None)) self.UpscaleBox.setText(_translate("KCC", "Stretch/Upscale", None)) - self.WebtoonBox.setToolTip(_translate("KCC", "

EXPERIMENTAL!
Enable auto-splitting of webtoons like Tower of God or Noblesse.
Pages with a low width, high height and vertical panel flow.

", None)) + self.WebtoonBox.setToolTip(_translate("KCC", "

Enable auto-splitting of webtoons like Tower of God or Noblesse.
Pages with a low width, high height and vertical panel flow.

", None)) self.WebtoonBox.setText(_translate("KCC", "Webtoon mode", None)) self.NoDitheringBox.setToolTip(_translate("KCC", "

Create PNG files instead JPEG.
Only for non-Kindle devices!

", None)) self.NoDitheringBox.setText(_translate("KCC", "PNG output", None)) diff --git a/kcc/KCC_ui_osx.py b/kcc/KCC_ui_osx.py index 997a35b..06a940b 100644 --- a/kcc/KCC_ui_osx.py +++ b/kcc/KCC_ui_osx.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'KCC-OSX.ui' # -# Created: Wed Aug 14 08:39:45 2013 -# by: PyQt4 UI code generator 4.10.2 +# Created: Sat Sep 14 10:28:47 2013 +# by: PyQt4 UI code generator 4.10.3 # # WARNING! All changes made in this file will be lost! @@ -324,7 +324,7 @@ class Ui_KCC(object): self.ProcessingBox.setText(_translate("KCC", "No optimisation", None)) self.UpscaleBox.setToolTip(_translate("KCC", "

Unchecked - Nothing
Images smaller than device resolution will not be resized.

Indeterminate - Stretching
Images smaller than device resolution will be resized. Aspect ratio will be not preserved.

Checked - Upscaling
Images smaller than device resolution will be resized. Aspect ratio will be preserved.

", None)) self.UpscaleBox.setText(_translate("KCC", "Stretch/Upscale", None)) - self.WebtoonBox.setToolTip(_translate("KCC", "

EXPERIMENTAL!
Enable auto-splitting of webtoons like Tower of God or Noblesse.
Pages with a low width, high height and vertical panel flow.

", None)) + self.WebtoonBox.setToolTip(_translate("KCC", "

Enable auto-splitting of webtoons like Tower of God or Noblesse.
Pages with a low width, high height and vertical panel flow.

", None)) self.WebtoonBox.setText(_translate("KCC", "Webtoon mode", None)) self.NoDitheringBox.setToolTip(_translate("KCC", "

Create PNG files instead JPEG.
Only for non-Kindle devices!

", None)) self.NoDitheringBox.setText(_translate("KCC", "PNG output", None)) diff --git a/kcc/comic2ebook.py b/kcc/comic2ebook.py index 4f92f64..246b565 100755 --- a/kcc/comic2ebook.py +++ b/kcc/comic2ebook.py @@ -985,11 +985,6 @@ def getOutputFilename(srcpath, wantedname, ext, tomeNumber): def checkOptions(): global options - # Webtoon mode mandatory options - if options.webtoon: - options.nosplitrotate = True - options.black_borders = False - options.quality = 0 # Landscape mode is only supported by Kindle Touch and Paperwhite. if options.profile == 'K4T' or options.profile == 'KHD': options.landscapemode = True @@ -1021,6 +1016,13 @@ def checkOptions(): options.quality = 0 if options.profile == 'K1' or options.profile == 'K2' or options.profile == 'KDX' or options.profile == 'KDXG': options.panelview = False + # Webtoon mode mandatory options + if options.webtoon: + options.nosplitrotate = True + options.black_borders = False + options.quality = 0 + options.landscapemode = False + options.panelview = False # Disable all Kindle features if options.profile == 'OTHER': options.landscapemode = False