From 3ac5709e730903b2b8817ca3c446c76530b4ffc4 Mon Sep 17 00:00:00 2001 From: Alex Xu Date: Sat, 7 Jun 2025 21:59:06 -0700 Subject: [PATCH] Add Kindle PW 7/10, Kindle 8/10 to PDOC list for easier covers (#955) * add more pdoc * update readme --- README.md | 6 ++++-- kindlecomicconverter/KCC_gui.py | 15 +++++++++------ kindlecomicconverter/image.py | 6 ++++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 8302b7e..3760612 100644 --- a/README.md +++ b/README.md @@ -151,10 +151,12 @@ sudo apt-get install python3 p7zip-full python3-pil python3-psutil python3-slugi '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), + 'K57': ("Kindle 5/7", (600, 800), Palette16, 1.8), + 'K810': ("Kindle 8/10", (600, 800), Palette16, 1.8), 'KDX': ("Kindle DX/DXG", (824, 1000), Palette16, 1.8), 'KPW': ("Kindle Paperwhite 1/2", (758, 1024), Palette16, 1.8), - 'KV': ("Kindle Paperwhite 3/4/Voyage/Oasis", (1072, 1448), Palette16, 1.8), + 'KV': ("Kindle Voyage, (1072, 1448), Palette16, 1.8), + 'KPW34': ("Kindle Paperwhite 3/4/Oasis", (1072, 1448), Palette16, 1.8), 'KPW5': ("Kindle Paperwhite 5/Signature Edition", (1236, 1648), Palette16, 1.8), 'KO': ("Kindle Oasis 2/3/Paperwhite 12/Colorsoft 12", (1264, 1680), Palette16, 1.8), 'KS': ("Kindle Scribe", (1860, 2480), Palette16, 1.8), diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py index 8177a1a..af2c41c 100644 --- a/kindlecomicconverter/KCC_gui.py +++ b/kindlecomicconverter/KCC_gui.py @@ -625,7 +625,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): def togglequalityBox(self, value): profile = GUI.profiles[str(GUI.deviceBox.currentText())] if value == 2: - if profile['Label'] == 'KV' or profile['Label'] in image.ProfileData.ProfilesKindlePDOC.keys(): + if profile['Label'] not in ('K57', 'KPW', 'K810') : self.addMessage('This option is intended for older Kindle models.', 'warning') self.addMessage('On this device, there will be conversion speed and quality issues.', 'warning') self.addMessage('Use the Kindle Scribe profile if you want higher resolution when zooming.', 'warning') @@ -957,8 +957,10 @@ class KCCGUI(KCC_ui.Ui_mainWindow): self.profiles = { "Kindle Oasis 9/10": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KO'}, + "Kindle 8/10": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, + 'DefaultUpscale': False, 'ForceColor': False, 'Label': 'K810'}, "Kindle Oasis 8": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, - 'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KV'}, + 'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KPW34'}, "Kindle Voyage": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KV'}, "Kindle Scribe": { @@ -977,11 +979,11 @@ class KCCGUI(KCC_ui.Ui_mainWindow): 'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'ForceColor': True, 'Label': 'KO', }, "Kindle Paperwhite 7/10": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, - 'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KV'}, + 'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KPW34'}, "Kindle Paperwhite 5/6": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'ForceColor': False, 'Label': 'KPW'}, - "Kindle 4/5/7/8/10": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, - 'DefaultUpscale': False, 'ForceColor': False, 'Label': 'K578'}, + "Kindle 4/5/7": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, + 'DefaultUpscale': False, 'ForceColor': False, 'Label': 'K57'}, "Kindle DX": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 2, 'DefaultUpscale': False, 'ForceColor': False, 'Label': 'KDX'}, "Kobo Mini/Touch": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 1, @@ -1057,11 +1059,12 @@ class KCCGUI(KCC_ui.Ui_mainWindow): "Separator", "Other", "Separator", + "Kindle 8/10", "Kindle Oasis 8", "Kindle Paperwhite 7/10", "Kindle Voyage", "Kindle Paperwhite 5/6", - "Kindle 4/5/7/8/10", + "Kindle 4/5/7", "Kindle Touch", "Kindle Keyboard", "Kindle DX", diff --git a/kindlecomicconverter/image.py b/kindlecomicconverter/image.py index 773cabb..f30fd00 100755 --- a/kindlecomicconverter/image.py +++ b/kindlecomicconverter/image.py @@ -85,12 +85,14 @@ class ProfileData: 'K2': ("Kindle 2", (600, 670), Palette15, 1.8), 'KDX': ("Kindle DX/DXG", (824, 1000), Palette16, 1.8), 'K34': ("Kindle Keyboard/Touch", (600, 800), Palette16, 1.8), - 'K578': ("Kindle", (600, 800), Palette16, 1.8), + 'K57': ("Kindle 5/7", (600, 800), Palette16, 1.8), 'KPW': ("Kindle Paperwhite 1/2", (758, 1024), Palette16, 1.8), - 'KV': ("Kindle Paperwhite 3/4/Voyage/Oasis", (1072, 1448), Palette16, 1.8), + 'KV': ("Kindle Voyage", (1072, 1448), Palette16, 1.8), } ProfilesKindlePDOC = { + 'KPW34': ("Kindle Paperwhite 3/4/Oasis", (1072, 1448), Palette16, 1.8), + 'K810': ("Kindle 8/10", (600, 800), Palette16, 1.8), 'KO': ("Kindle Oasis 2/3/Paperwhite 12/Colorsoft 12", (1264, 1680), Palette16, 1.8), 'K11': ("Kindle 11", (1072, 1448), Palette16, 1.8), 'KPW5': ("Kindle Paperwhite 5/Signature Edition", (1236, 1648), Palette16, 1.8),