diff --git a/README.md b/README.md index 512b88f..d98da76 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ sudo apt-get install python3 p7zip-full python3-pil python3-psutil python3-slugi ``` 'K1': ("Kindle 1", (600, 670), Palette4, 1.8), - 'K11': ("Kindle 11", (1072, 1448), Palette16, 1.8), + 'K11': ("Kindle 11/12", (1072, 1448), Palette16, 1.8), 'K2': ("Kindle 2", (600, 670), Palette15, 1.8), 'K34': ("Kindle Keyboard/Touch", (600, 800), Palette16, 1.8), 'K578': ("Kindle", (600, 800), Palette16, 1.8), @@ -107,6 +107,8 @@ sudo apt-get install python3 p7zip-full python3-pil python3-psutil python3-slugi 'KPW': ("Kindle Paperwhite 1/2", (758, 1024), Palette16, 1.8), 'KV': ("Kindle Paperwhite 3/4/Voyage/Oasis", (1072, 1448), Palette16, 1.8), 'KPW5': ("Kindle Paperwhite 5/Signature Edition", (1236, 1648), Palette16, 1.8), + 'KPW6': ("Kindle Paperwhite 6", (1264, 1680), Palette16, 1.8), + 'KCS12': ("Kindle Colorsoft", (1264, 1680), Palette16, 1.8), 'KO': ("Kindle Oasis 2/3", (1264, 1680), Palette16, 1.8), 'KS': ("Kindle Scribe", (1860, 2480), Palette16, 1.8), 'KoMT': ("Kobo Mini/Touch", (600, 800), Palette16, 1.8), diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py index ade3a6e..64f7337 100644 --- a/kindlecomicconverter/KCC_gui.py +++ b/kindlecomicconverter/KCC_gui.py @@ -928,12 +928,18 @@ class KCCGUI(KCC_ui.Ui_mainWindow): "Kindle Scribe": { 'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'ForceColor': False, 'Label': 'KS', }, - "Kindle 11": { + "Kindle 11/12": { 'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'ForceColor': False, 'Label': 'K11', }, "Kindle PW 11": { 'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KPW5', }, + "Kindle PW 12": { + 'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KPW6', + }, + "Kindle CS 12": { + 'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'ForceColor': True, 'Label': 'KCS12', + }, "Kindle PW 7/10": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KV'}, "Kindle PW 5/6": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, @@ -989,8 +995,9 @@ class KCCGUI(KCC_ui.Ui_mainWindow): } profilesGUI = [ "Kindle Scribe", - "Kindle 11", - "Kindle PW 11", + "Kindle 11/12", + "Kindle PW 12", + "Kindle CS 12", "Kindle Oasis 9/10", "Separator", "Kobo Clara 2E", @@ -1003,6 +1010,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): "Separator", "Other", "Separator", + "Kindle PW 11", "Kindle Oasis 8", "Kindle PW 7/10", "Kindle Voyage", diff --git a/kindlecomicconverter/comic2ebook.py b/kindlecomicconverter/comic2ebook.py index 5198b5f..e5bb4b4 100755 --- a/kindlecomicconverter/comic2ebook.py +++ b/kindlecomicconverter/comic2ebook.py @@ -957,7 +957,7 @@ def makeParser(): help="Full path to comic folder or file(s) to be processed.") main_options.add_argument("-p", "--profile", action="store", dest="profile", default="KV", - help="Device profile (Available options: K1, K2, K34, K578, KDX, KPW, KPW5, KV, KO, " + help="Device profile (Available options: K1, K2, K34, K578, KDX, KPW, KPW5, KPW6, KCS12, KV, KO, " "K11, KS, KoMT, KoG, KoGHD, KoA, KoAHD, KoAH2O, KoAO, KoN, KoC, KoCC, KoL, KoLC, KoF, KoS, KoE)" " [Default=KV]") main_options.add_argument("-m", "--manga-style", action="store_true", dest="righttoleft", default=False, @@ -1046,14 +1046,14 @@ def checkOptions(options): options.kfx = False options.supportSyntheticSpread = False if options.format == 'Auto': - if options.profile in ['K1', 'K2', 'K34', 'K578', 'KPW', 'KPW5', 'KV', 'KO', 'K11', 'KS']: + if options.profile in ['K1', 'K2', 'K34', 'K578', 'KPW', 'KPW5', 'KPW6', 'KCS12', 'KV', 'KO', 'K11', 'KS']: options.format = 'MOBI' elif options.profile in ['OTHER', 'KoMT', 'KoG', 'KoGHD', 'KoA', 'KoAHD', 'KoAH2O', 'KoAO', 'KoN', 'KoC', 'KoCC', 'KoL', 'KoLC', 'KoF', 'KoS', 'KoE']: options.format = 'EPUB' elif options.profile in ['KDX']: options.format = 'CBZ' - if options.profile in ['K1', 'K2', 'K34', 'K578', 'KPW', 'KPW5', 'KV', 'KO', 'K11', 'KS']: + if options.profile in ['K1', 'K2', 'K34', 'K578', 'KPW', 'KPW5', 'KPW6', 'KCS12', 'KV', 'KO', 'K11', 'KS']: options.iskindle = True elif options.profile in ['OTHER', 'KoMT', 'KoG', 'KoGHD', 'KoA', 'KoAHD', 'KoAH2O', 'KoAO', 'KoN', 'KoC', 'KoCC', 'KoL', 'KoLC', 'KoF', 'KoS', 'KoE']: options.isKobo = True diff --git a/kindlecomicconverter/image.py b/kindlecomicconverter/image.py index ce82635..c867280 100755 --- a/kindlecomicconverter/image.py +++ b/kindlecomicconverter/image.py @@ -80,7 +80,7 @@ class ProfileData: Profiles = { 'K1': ("Kindle 1", (600, 670), Palette4, 1.8), - 'K11': ("Kindle 11", (1072, 1448), Palette16, 1.8), + 'K11': ("Kindle 11/12", (1072, 1448), Palette16, 1.8), 'K2': ("Kindle 2", (600, 670), Palette15, 1.8), 'K34': ("Kindle Keyboard/Touch", (600, 800), Palette16, 1.8), 'K578': ("Kindle", (600, 800), Palette16, 1.8), @@ -88,6 +88,8 @@ class ProfileData: 'KPW': ("Kindle Paperwhite 1/2", (758, 1024), Palette16, 1.8), 'KV': ("Kindle Paperwhite 3/4/Voyage/Oasis", (1072, 1448), Palette16, 1.8), 'KPW5': ("Kindle Paperwhite 5/Signature Edition", (1236, 1648), Palette16, 1.8), + 'KPW6': ("Kindle Paperwhite 6", (1264, 1680), Palette16, 1.8), + 'KCS12': ("Kindle Colorsoft", (1264, 1680), Palette16, 1.8), 'KO': ("Kindle Oasis 2/3", (1264, 1680), Palette16, 1.8), 'KS': ("Kindle Scribe", (1860, 2480), Palette16, 1.8), 'KoMT': ("Kobo Mini/Touch", (600, 800), Palette16, 1.8),