diff --git a/README.md b/README.md index a337ea3..2c5ef90 100644 --- a/README.md +++ b/README.md @@ -146,6 +146,9 @@ Options: -q, --hq Try to increase the quality of magnification -2, --two-panel Display two not four panels in Panel View mode -w, --webtoon Webtoon processing mode + --targetsize=TARGETSIZE + the maximal size of output file in MB. [Default=100MB + for webtoon and 400MB for others] OUTPUT SETTINGS: -o OUTPUT, --output=OUTPUT diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py index 14b459c..a48af16 100644 --- a/kindlecomicconverter/KCC_gui.py +++ b/kindlecomicconverter/KCC_gui.py @@ -120,6 +120,8 @@ class Icons: self.MOBIEPUBFormat.addPixmap(QtGui.QPixmap(":/Formats/icons/MOBI.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.KFXEPUBFormat = QtGui.QIcon() self.KFXEPUBFormat.addPixmap(QtGui.QPixmap(":/Formats/icons/KFX.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.EPUB200MBFormat = QtGui.QIcon() + self.EPUB200MBFormat.addPixmap(QtGui.QPixmap(":/Formats/icons/EPUB.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.info = QtGui.QIcon() self.info.addPixmap(QtGui.QPixmap(":/Status/icons/info.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) @@ -1112,8 +1114,9 @@ class KCCGUI(KCC_ui.Ui_mainWindow): GUI.deviceBox.addItem(self.icons.deviceKobo, profile) else: GUI.deviceBox.addItem(self.icons.deviceKindle, profile) - for f in ['MOBI/AZW3', 'EPUB', 'CBZ', 'KFX', 'MOBI+EPUB', 'KFX+EPUB']: - GUI.formatBox.addItem(eval('self.icons.' + f.replace('/AZW3', '').replace('+', '') + 'Format'), f) + for f in ['MOBI/AZW3', 'EPUB', 'CBZ', 'KFX', 'MOBI+EPUB', 'KFX+EPUB', 'EPUB-200MB']: + format_prefix = f.replace('/AZW3', '').replace('+', '').replace('-', '') + GUI.formatBox.addItem(eval('self.icons.' + format_prefix + 'Format'), f) if self.lastDevice > GUI.deviceBox.count(): self.lastDevice = 0 if profilesGUI[self.lastDevice] == "Separator": diff --git a/kindlecomicconverter/comic2ebook.py b/kindlecomicconverter/comic2ebook.py index 9af07cf..1a5d20a 100755 --- a/kindlecomicconverter/comic2ebook.py +++ b/kindlecomicconverter/comic2ebook.py @@ -984,6 +984,9 @@ def checkOptions(options): options.iskindle = False options.bordersColor = None options.keep_epub = False + if options.format == 'EPUB-200MB': + options.targetsize = 200 + options.format = 'EPUB' if options.format == 'MOBI+EPUB': options.keep_epub = True options.format = 'MOBI' @@ -1006,7 +1009,7 @@ def checkOptions(options): if options.black_borders: options.bordersColor = 'black' # Splitting MOBI is not optional - if (options.format == 'MOBI' or options.format == 'KFX') and options.batchsplit != 2: + if (options.format == 'MOBI' or options.format == 'KFX' or options.format == 'EPUB') and options.batchsplit != 2: options.batchsplit = 1 # Older Kindle models don't support Panel View. if options.profile == 'K1' or options.profile == 'K2' or options.profile == 'K34' or options.profile == 'KDX':