diff --git a/README.md b/README.md index a33dba0..d1fe1e3 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ Usage: kcc-c2e [options] comic_file|comic_folder Options: MAIN: -p PROFILE, --profile=PROFILE - Device profile (Choose one among K1, K2, K345, KDX, KHD, KF, KFHD, KFHD8, KFHDX, KFHDX8, KFA, KoMT, KoG, KoA, KoAHD, KoAH2O) [Default=KHD] + Device profile (Choose one among K1, K2, K345, KDX, KPW, KV, KFHD, KFHDX, KFHDX8, KFA, KoMT, KoG, KoA, KoAHD, KoAH2O) [Default=KV] -q QUALITY, --quality=QUALITY Quality of Panel View. 0 - Normal 1 - High 2 - Ultra [Default=0] -m, --manga-style Manga style (Right-to-left reading and splitting) @@ -142,18 +142,18 @@ The app relies and includes the following scripts/binaries: - Icon is by **Nikolay Verin** ([http://ncrow.deviantart.com/](http://ncrow.deviantart.com/)) and released under [CC BY-NC-SA 3.0](http://creativecommons.org/licenses/by-nc-sa/3.0/) License. ## SAMPLE FILES CREATED BY KCC +* [Kindle Voyage](http://kcc.iosphe.re/Samples/Ubunchu!-KV.mobi) * [Kindle Paperwhite](http://kcc.iosphe.re/Samples/Ubunchu!-KPW.mobi) * [Kindle](http://kcc.iosphe.re/Samples/Ubunchu!-K345.mobi) * [Kindle DX/DXG](http://kcc.iosphe.re/Samples/Ubunchu!-KDX.mobi) * [Kindle Fire HD](http://kcc.iosphe.re/Samples/Ubunchu!-KFHD.mobi) -* [Kindle Fire HD 8.9"](http://kcc.iosphe.re/Samples/Ubunchu!-KFHD8.mobi) * [Kindle Fire HDX](http://kcc.iosphe.re/Samples/Ubunchu!-KFHDX.mobi) -* [Kindle Fire HDX 8.9"](http://kcc.iosphe.re/Samples/Ubunchu!-KFHDX8.mobi) +* [Kindle Fire HDX 8.9](http://kcc.iosphe.re/Samples/Ubunchu!-KFHDX8.mobi) * [Kobo Mini/Touch](http://kcc.iosphe.re/Samples/Ubunchu!-KoMT.cbz) * [Kobo Glow](http://kcc.iosphe.re/Samples/Ubunchu!-KoG.cbz) * [Kobo Aura](http://kcc.iosphe.re/Samples/Ubunchu!-KoA.cbz) * [Kobo Aura HD](http://kcc.iosphe.re/Samples/Ubunchu!-KoAHD.cbz) -* [Kobo Aura H20](http://kcc.iosphe.re/Samples/Ubunchu!-KoAH2O.cbz) +* [Kobo Aura H2O](http://kcc.iosphe.re/Samples/Ubunchu!-KoAH2O.cbz) ## CHANGELOG ####1.0 diff --git a/kcc/KCC_gui.py b/kcc/KCC_gui.py index 56ef4fd..13a0978 100644 --- a/kcc/KCC_gui.py +++ b/kcc/KCC_gui.py @@ -394,7 +394,7 @@ class WorkerThread(QtCore.QThread): if str(GUI.FormatBox.currentText()) == 'CBZ': options.cbzoutput = True if GUI.currentMode == 1: - if profile in ['KFHD', 'KFHD8', 'KFHDX', 'KFHDX8']: + if 'KFH' in profile: options.upscale = True # Advanced mode settings @@ -1127,22 +1127,20 @@ class KCCGUI(KCC_ui.Ui_KCC): self.p.ionice(1) self.profiles = { + "Kindle Voyage": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0, + 'DefaultUpscale': False, 'Label': 'KV'}, "Kindle Paperwhite": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0, - 'DefaultUpscale': False, 'Label': 'KHD'}, + 'DefaultUpscale': False, 'Label': 'KPW'}, "Kindle": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'Label': 'K345'}, "Kindle DX/DXG": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 2, 'DefaultUpscale': False, 'Label': 'KDX'}, - "Kindle Fire": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0, - 'DefaultUpscale': False, 'Label': 'KF'}, - "K. Fire HD 7\"": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0, - 'DefaultUpscale': True, 'Label': 'KFHD'}, - "K. Fire HD 8.9\"": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0, - 'DefaultUpscale': True, 'Label': 'KFHD8'}, - "K. Fire HDX 7\"": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0, - 'DefaultUpscale': True, 'Label': 'KFHDX'}, - "K. Fire HDX 8.9\"": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0, - 'DefaultUpscale': True, 'Label': 'KFHDX8'}, + "K. Fire HD": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0, + 'DefaultUpscale': True, 'Label': 'KFHD'}, + "K. Fire HDX": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0, + 'DefaultUpscale': True, 'Label': 'KFHDX'}, + "K. Fire HDX 8.9": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0, + 'DefaultUpscale': True, 'Label': 'KFHDX8'}, "Kobo Mini/Touch": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 2, 'DefaultUpscale': False, 'Label': 'KoMT'}, "Kobo Glow": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 2, @@ -1163,15 +1161,13 @@ class KCCGUI(KCC_ui.Ui_KCC): 'DefaultUpscale': False, 'Label': 'K2'} } profilesGUI = [ + "Kindle Voyage", "Kindle Paperwhite", "Kindle", - "Kindle DX/DXG", "Separator", - "Kindle Fire", - "K. Fire HD 7\"", - "K. Fire HD 8.9\"", - "K. Fire HDX 7\"", - "K. Fire HDX 8.9\"", + "K. Fire HD", + "K. Fire HDX", + "K. Fire HDX 8.9", "Separator", "Kobo Mini/Touch", "Kobo Glow", @@ -1184,6 +1180,7 @@ class KCCGUI(KCC_ui.Ui_KCC): "Kindle for Android", "Kindle 1", "Kindle 2", + "Kindle DX/DXG", ] statusBarLabel = QtWidgets.QLabel('HOMEPAGE -