profiles: add Kindle11 and Kindle Scribe

kindlecomicconverter/KCC_gui.py

@@ -935,6 +935,12 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                              'DefaultUpscale': True, 'Label': 'KV'},
             "Kindle Voyage": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0,
                               'DefaultUpscale': True, 'Label': 'KV'},
+            "Kindle Scribe": {
+                'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'Label': 'KS',
+            },
+            "Kindle 11": {
+                'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'Label': 'K11',
+            },
             "Kindle PW 5": {
                 'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'Label': 'KPW5',
             },
@@ -989,35 +995,38 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
         }
         profilesGUI = [
             "Kindle Oasis 2/3",
-            "Kindle Oasis",
-            "Kindle Voyage",
             "Kindle PW 5",
-            "Kindle PW 3/4",
+            "Kindle 11",
-            "Kindle PW 1/2",
+            "Kindle Scribe",
-            "Kindle",
             "Separator",
-            "Kobo Forma",
-            "Kobo Libra H2O",
-            "Kobo Clara HD",
-            "Kobo Aura ONE",
-            "Kobo Aura H2O",
-            "Kobo Aura HD",
-            "Kobo Aura",
             "Kobo Clara 2E",
-            "Kobo Libra 2",
             "Kobo Sage",
+            "Kobo Libra 2",
             "Kobo Elipsa",
+            "Kobo Nia",
             "Separator",
             "Other",
             "Separator",
+            "Kindle Oasis",
             "Kindle Touch",
             "Kindle Keyboard",
             "Kindle DX/DXG",
+            "Kindle PW 3/4",
+            "Kindle PW 1/2",
+            "Kindle Voyage",
             "Kindle 2",
             "Kindle 1",
+            "Kindle",
             "Separator",
+            "Kobo Aura",
+            "Kobo Aura ONE",
+            "Kobo Aura H2O",
+            "Kobo Aura HD",
+            "Kobo Clara HD",
+            "Kobo Forma",
             "Kobo Glo HD",
             "Kobo Glo",
+            "Kobo Libra H2O",
             "Kobo Mini/Touch",
         ]
 

kindlecomicconverter/comic2ebook.py

@@ -909,8 +909,9 @@ def makeParser():
     otherOptions = OptionGroup(psr, "OTHER")
 
     mainOptions.add_option("-p", "--profile", action="store", dest="profile", default="KV",
-                           help="Device profile (Available options: K1, K2, K34, K578, KDX, KPW, KPW5, KV, KO, KoMT"
+                           help="Device profile (Available options: K1, K2, K34, K578, KDX, KPW, KPW5, KV, KO, "
-                                ", KoG, KoGHD, KoA, KoAHD, KoAH2O, KoAO, KoN, KoC, KoL, KoF, KoS, KoE) [Default=KV]")
+                                "K11, KS, KoMT, KoG, KoGHD, KoA, KoAHD, KoAH2O, KoAO, KoN, KoC, KoL, KoF, KoS, KoE)"
+                                " [Default=KV]")
     mainOptions.add_option("-m", "--manga-style", action="store_true", dest="righttoleft", default=False,
                            help="Manga style (right-to-left reading and splitting)")
     mainOptions.add_option("-q", "--hq", action="store_true", dest="hq", default=False,
@@ -986,13 +987,14 @@ def checkOptions(options):
         options.format = 'KFX'
     options.kfx = False
     if options.format == 'Auto':
-        if options.profile in ['K1', 'K2', 'K34', 'K578', 'KPW', 'KPW5', 'KV', 'KO']:
+        if options.profile in ['K1', 'K2', 'K34', 'K578', 'KPW', 'KPW5', 'KV', 'KO', 'K11', 'KS']:
             options.format = 'MOBI'
-        elif options.profile in ['OTHER', 'KoMT', 'KoG', 'KoGHD', 'KoA', 'KoAHD', 'KoAH2O', 'KoAO', 'KoN', 'KoC', 'KoL', 'KoF', 'KoS', 'KoE']:
+        elif options.profile in ['OTHER', 'KoMT', 'KoG', 'KoGHD', 'KoA', 'KoAHD', 'KoAH2O', 'KoAO',
+                                 'KoN', 'KoC', 'KoL', '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']:
+    if options.profile in ['K1', 'K2', 'K34', 'K578', 'KPW', 'KPW5', 'KV', 'KO', 'K11', 'KS']:
         options.iskindle = True
     if options.white_borders:
         options.bordersColor = 'white'

kindlecomicconverter/image.py

@@ -78,6 +78,7 @@ class ProfileData:
 
     Profiles = {
         'K1': ("Kindle 1", (600, 670), Palette4, 1.8),
+        'K11': ("Kindle 11", (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),
@@ -86,6 +87,7 @@ class ProfileData:
         'KV': ("Kindle Paperwhite 3/4/Voyage/Oasis", (1072, 1448), Palette16, 1.8),
         'KPW5': ("Kindle Paperwhite 5/Signature Edition", (1236, 1648), 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),
         'KoG': ("Kobo Glo", (768, 1024), Palette16, 1.8),
         'KoGHD': ("Kobo Glo HD", (1072, 1448), Palette16, 1.8),