From b3681a3ceb29af034d3c95a89bd27936348b6e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Jastrz=C4=99bski?= Date: Thu, 16 May 2013 11:49:49 +0200 Subject: [PATCH] Fixed merge --- README.md | 3 ++- kcc/comic2ebook.py | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 8ca81a7..e067265 100644 --- a/README.md +++ b/README.md @@ -134,7 +134,8 @@ The app relies and includes the following scripts/binaries: Rarfile library updated to 2.6 Added GIF, TIFF and BMP to supported formats (#42) Filenames slugifications (#28, #31, #9, #8) - - 2.10: Kindle Fire support (color ePub/Mobi) + - 2.10: Kindle Fire support (color ePub/Mobi) + Panel View support for horizontal content ## COPYRIGHT diff --git a/kcc/comic2ebook.py b/kcc/comic2ebook.py index d0b6aa4..36be9c0 100755 --- a/kcc/comic2ebook.py +++ b/kcc/comic2ebook.py @@ -365,17 +365,17 @@ def dirImgProcess(path): facing = "left" img0 = image.ComicPage(split[0], options.profile) applyImgOptimization(img0, True, toRight1) - img0.saveToDir(dirpath, options.forcepng) + img0.saveToDir(dirpath, options.forcepng, options.forcecolor) img1 = image.ComicPage(split[1], options.profile) applyImgOptimization(img1, True, toRight2) - img1.saveToDir(dirpath, options.forcepng) + img1.saveToDir(dirpath, options.forcepng, options.forcecolor) else: if facing == "right": facing = "left" else: facing = "right" applyImgOptimization(img) - img.saveToDir(dirpath, options.forcepng) + img.saveToDir(dirpath, options.forcepng, options.forcecolor) def genEpubStruct(path): @@ -609,7 +609,8 @@ def main(argv=None): usage = "Usage: %prog [options] comic_file|comic_folder" parser = OptionParser(usage=usage, version=__version__) parser.add_option("-p", "--profile", action="store", dest="profile", default="KHD", - help="Device profile (Choose one among K1, K2, K3, K4NT, K4T, KDX, KDXG or KHD) [Default=KHD]") + help="Device profile (Choose one among K1, K2, K3, K4NT, K4T, KDX, KDXG, KHD, KF, KFHD, KFHD8) " + "[Default=KHD]") parser.add_option("-t", "--title", action="store", dest="title", default="defaulttitle", help="Comic title [Default=filename]") parser.add_option("-m", "--manga-style", action="store_true", dest="righttoleft", default=False, @@ -703,8 +704,14 @@ def checkOptions(): else: #Virtual Panel View options.panelview = False - if options.profile == 'K1' or options.profile == 'K2' or options.profile == 'KDX' or options.profile == 'KDXG': + if options.profile == 'K1' or options.profile == 'K2' or options.profile == 'KDX' or options.profile == 'KDXG'\ + or options.profile == 'KF' or options.profile == 'KFHD' or options.profile == 'KFHD8': options.nopanelviewhq = True + if options.profile == 'KF' or options.profile == 'KFHD' or options.profile == 'KFHD8': + options.forcecolor = True + options.forcepng = False + else: + options.forcecolor = False if options.panelviewhorizontal: options.panelview = True options.landscapemode = False