diff options
| author | Paweł Jastrzębski <[email protected]> | 2016-03-05 07:27:38 +0100 |
|---|---|---|
| committer | Paweł Jastrzębski <[email protected]> | 2016-03-05 07:27:38 +0100 |
| commit | 91b686963887816e06a56723636c232623895e3d (patch) | |
| tree | 934ef9ad147a17d350dfeafe6bcb357a8f742c77 | |
| parent | Fixed permission issues (close #179) (diff) | |
| download | kcc-91b686963887816e06a56723636c232623895e3d.tar.gz kcc-91b686963887816e06a56723636c232623895e3d.tar.bz2 kcc-91b686963887816e06a56723636c232623895e3d.zip | |
Created separate Kindle Keyboard profile (close #174)
| -rw-r--r-- | kcc/KCC_gui.py | 7 | ||||
| -rwxr-xr-x | kcc/comic2ebook.py | 8 | ||||
| -rwxr-xr-x | kcc/image.py | 3 |
3 files changed, 11 insertions, 7 deletions
diff --git a/kcc/KCC_gui.py b/kcc/KCC_gui.py index 67216e2..efac643 100644 --- a/kcc/KCC_gui.py +++ b/kcc/KCC_gui.py @@ -885,7 +885,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): "Kindle PW 1/2": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'Label': 'KPW'}, "Kindle": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0, - 'DefaultUpscale': False, 'Label': 'K345'}, + 'DefaultUpscale': False, 'Label': 'K45'}, "Kindle DX/DXG": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 2, 'DefaultUpscale': False, 'Label': 'KDX'}, "Kobo Mini/Touch": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 1, @@ -905,7 +905,9 @@ class KCCGUI(KCC_ui.Ui_mainWindow): "Kindle 1": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'Label': 'K1'}, "Kindle 2": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 0, - 'DefaultUpscale': False, 'Label': 'K2'} + 'DefaultUpscale': False, 'Label': 'K2'}, + "Kindle 3": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 0, + 'DefaultUpscale': False, 'Label': 'K3'}, } profilesGUI = [ "K. PW 3/Voyage", @@ -923,6 +925,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): "Separator", "Kindle 1", "Kindle 2", + "Kindle 3", "Kindle DX/DXG", ] diff --git a/kcc/comic2ebook.py b/kcc/comic2ebook.py index 1c7bbb2..38cb968 100755 --- a/kcc/comic2ebook.py +++ b/kcc/comic2ebook.py @@ -956,7 +956,7 @@ def makeParser(): otherOptions = OptionGroup(psr, "OTHER") mainOptions.add_option("-p", "--profile", action="store", dest="profile", default="KV", - help="Device profile (Available options: K1, K2, K345, KDX, KPW, KV, KoMT, KoG, KoGHD," + help="Device profile (Available options: K1, K2, K3, K45, KDX, KPW, KV, KoMT, KoG, KoGHD," " KoA, KoAHD, KoAH2O) [Default=KV]") mainOptions.add_option("-m", "--manga-style", action="store_true", dest="righttoleft", default=False, help="Manga style (right-to-left reading and splitting)") @@ -1019,13 +1019,13 @@ def checkOptions(): options.iskindle = False options.bordersColor = None if options.format == 'Auto': - if options.profile in ['K1', 'K2', 'K345', 'KPW', 'KV']: + if options.profile in ['K1', 'K2', 'K3', 'K45', 'KPW', 'KV']: options.format = 'MOBI' elif options.profile in ['OTHER', 'KoMT', 'KoG', 'KoGHD', 'KoA', 'KoAHD', 'KoAH2O']: options.format = 'EPUB' elif options.profile in ['KDX']: options.format = 'CBZ' - if options.profile in ['K1', 'K2', 'K345', 'KPW', 'KV']: + if options.profile in ['K1', 'K2', 'K3', 'K45', 'KPW', 'KV']: options.iskindle = True if options.white_borders: options.bordersColor = 'white' @@ -1035,7 +1035,7 @@ def checkOptions(): if options.format == 'MOBI': options.batchsplit = True # Older Kindle don't need higher resolution files due lack of Panel View. - if options.profile == 'K1' or options.profile == 'K2' or options.profile == 'KDX': + if options.profile == 'K1' or options.profile == 'K2' or options.profile == 'K3' or options.profile == 'KDX': options.panelview = False options.hqmode = False # Webtoon mode mandatory options diff --git a/kcc/image.py b/kcc/image.py index 7fe03da..67d7b7a 100755 --- a/kcc/image.py +++ b/kcc/image.py @@ -79,7 +79,8 @@ class ProfileData: Profiles = { 'K1': ("Kindle 1", (600, 670), Palette4, 1.8, (900, 1005)), 'K2': ("Kindle 2", (600, 670), Palette15, 1.8, (900, 1005)), - 'K345': ("Kindle", (600, 800), Palette16, 1.8, (900, 1200)), + 'K3': ("Kindle", (600, 800), Palette16, 1.8, (900, 1200)), + 'K45': ("Kindle", (600, 800), Palette16, 1.8, (900, 1200)), 'KDX': ("Kindle DX/DXG", (824, 1000), Palette16, 1.8, (1236, 1500)), 'KPW': ("Kindle Paperwhite 1/2", (758, 1024), Palette16, 1.8, (1137, 1536)), 'KV': ("Kindle Paperwhite 3/Voyage", (1072, 1448), Palette16, 1.8, (1608, 2172)), |