Bump version to 9.4.1

kindlecomicconverter/KCC_gui.py

@@ -1189,6 +1189,12 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                              'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KPW34'},
             "Kindle Voyage": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0,
                               'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KV'},
+            "Kindle 1860x1920": {
+                'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'ForceColor': False, 'Label': 'KS1860',
+            },
+            "Kindle 1920x1920": {
+                'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'ForceColor': False, 'Label': 'KS1920',
+            },
             "Kindle Scribe 1/2": {
                 'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'ForceColor': False, 'Label': 'KS',
             },
@@ -1274,9 +1280,11 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
         profilesGUI = [
             "Kindle Scribe Colorsoft",
             "Kindle Scribe 3",
+            "Kindle 1920x1920",
             "Kindle Colorsoft",
             "Kindle Paperwhite 12",
             "Kindle Scribe 1/2",
+            "Kindle 1860x1920",
             "Kindle Paperwhite 11",
             "Kindle 11",
             "Kindle Oasis 9/10",

kindlecomicconverter/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '9.4.0'
+__version__ = '9.4.1'
 __license__ = 'ISC'
 __copyright__ = '2012-2022, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>, darodi'
 __docformat__ = 'restructuredtext en'

kindlecomicconverter/comic2ebook.py

@@ -1486,6 +1486,12 @@ def checkOptions(options):
             options.jpegquality = 90
         else:
             options.jpegquality = 85
+    options.kindle_azw3 = options.iskindle and ('MOBI' in options.format or 'EPUB' in options.format)
+    options.kindle_scribe_azw3 = options.profile.startswith('KS') and options.kindle_azw3
+    if options.kindle_scribe_azw3:
+        options.profileData = list(image.ProfileData.Profiles[options.profile])
+        options.profileData[1] = list(options.profileData[1])
+        options.profileData[1][0] = min(1920, options.profileData[1][0])
     return options
 
 
@@ -1562,8 +1568,6 @@ def makeBook(source, qtgui=None, job_progress=''):
         GUI.progressBarTick.emit('1')
     else:
         checkTools(source)
-    options.kindle_azw3 = options.iskindle and ('MOBI' in options.format or 'EPUB' in options.format)
-    options.kindle_scribe_azw3 = options.profile.startswith('KS') and options.kindle_azw3
     checkPre(source)
     print(f"{job_progress}Preparing source images...")
     path = getWorkFolder(source)

kindlecomicconverter/image.py

@@ -101,10 +101,12 @@ class ProfileData:
         'KO': ("Kindle Oasis 2/3/Paperwhite 12", (1264, 1680), Palette16, 1.0),
         'K11': ("Kindle 11", (1072, 1448), Palette16, 1.0),
         'KPW5': ("Kindle Paperwhite 5/Signature Edition", (1236, 1648), Palette16, 1.0),
+        'KS1860': ("Kindle 1920", (1860, 1920), Palette16, 1.0),
+        'KS1920': ("Kindle 1920", (1920, 1920), Palette16, 1.0),
         'KS': ("Kindle Scribe 1/2", (1860, 2480), Palette16, 1.0),
         'KCS': ("Kindle Colorsoft", (1264, 1680), Palette16, 1.0),
-        'KS3': ("Kindle Scribe 3", (1920, 2640), Palette16, 1.0),
+        'KS3': ("Kindle Scribe 3", (1980, 2640), Palette16, 1.0),
-        'KSCS': ("Kindle Scribe Colorsoft", (1920, 2640), Palette16, 1.0),
+        'KSCS': ("Kindle Scribe Colorsoft", (1980, 2640), Palette16, 1.0),
     }
 
     ProfilesKindle = {