diff options
| author | Paweł Jastrzębski <pawelj@iosphe.re> | 2017-08-17 10:11:24 +0200 |
|---|---|---|
| committer | Paweł Jastrzębski <pawelj@iosphe.re> | 2017-08-17 10:11:24 +0200 |
| commit | 066d1401bd712263ddcbf6182f49f77e04fc71e6 (patch) | |
| tree | 6b0309e18aa4df72b9b1a733fd0680c133a27ecc /kindlecomicconverter | |
| parent | Start using Travis CI as OS X binary builder (diff) | |
| download | kcc-066d1401bd712263ddcbf6182f49f77e04fc71e6.tar.gz kcc-066d1401bd712263ddcbf6182f49f77e04fc71e6.tar.bz2 kcc-066d1401bd712263ddcbf6182f49f77e04fc71e6.zip | |
Cleaned profile list
Diffstat (limited to 'kindlecomicconverter')
| -rw-r--r-- | kindlecomicconverter/KCC_gui.py | 18 | ||||
| -rwxr-xr-x | kindlecomicconverter/comic2ebook.py | 8 | ||||
| -rwxr-xr-x | kindlecomicconverter/image.py | 4 |
3 files changed, 17 insertions, 13 deletions
diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py index bd47eb0..f1cdd5a 100644 --- a/kindlecomicconverter/KCC_gui.py +++ b/kindlecomicconverter/KCC_gui.py @@ -927,7 +927,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): "Kindle PW 1/2": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'Label': 'KPW'}, "Kindle": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, - 'DefaultUpscale': False, 'Label': 'K45'}, + 'DefaultUpscale': False, 'Label': 'K578'}, "Kindle DX/DXG": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 2, 'DefaultUpscale': False, 'Label': 'KDX'}, "Kobo Mini/Touch": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 1, @@ -950,8 +950,10 @@ class KCCGUI(KCC_ui.Ui_mainWindow): 'DefaultUpscale': False, 'Label': 'K1'}, "Kindle 2": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'Label': 'K2'}, - "Kindle 3": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0, - 'DefaultUpscale': False, 'Label': 'K3'}, + "Kindle Keyboard": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0, + 'DefaultUpscale': False, 'Label': 'K34'}, + "Kindle Touch": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0, + 'DefaultUpscale': False, 'Label': 'K34'}, } profilesGUI = [ "Kindle Oasis", @@ -964,16 +966,18 @@ class KCCGUI(KCC_ui.Ui_mainWindow): "Kobo Aura H2O", "Kobo Aura HD", "Kobo Aura", - "Kobo Glo HD", - "Kobo Glo", - "Kobo Mini/Touch", "Separator", "Other", "Separator", + "Kindle Touch", + "Kindle Keyboard", "Kindle DX/DXG", - "Kindle 3", "Kindle 2", "Kindle 1", + "Separator", + "Kobo Glo HD", + "Kobo Glo", + "Kobo Mini/Touch", ] statusBarLabel = QtWidgets.QLabel('<b><a href="https://kcc.iosphe.re/">HOMEPAGE</a> - <a href="https://github.' diff --git a/kindlecomicconverter/comic2ebook.py b/kindlecomicconverter/comic2ebook.py index b7487b8..57a6258 100755 --- a/kindlecomicconverter/comic2ebook.py +++ b/kindlecomicconverter/comic2ebook.py @@ -887,7 +887,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, K3, K45, KDX, KPW, KV, KoMT, KoG, KoGHD," + help="Device profile (Available options: K1, K2, K34, K578, KDX, KPW, KV, KoMT, KoG, KoGHD," " KoA, KoAHD, KoAH2O, KoAO) [Default=KV]") mainOptions.add_option("-m", "--manga-style", action="store_true", dest="righttoleft", default=False, help="Manga style (right-to-left reading and splitting)") @@ -951,13 +951,13 @@ def checkOptions(): options.iskindle = False options.bordersColor = None if options.format == 'Auto': - if options.profile in ['K1', 'K2', 'K3', 'K45', 'KPW', 'KV']: + if options.profile in ['K1', 'K2', 'K34', 'K578', 'KPW', 'KV']: options.format = 'MOBI' elif options.profile in ['OTHER', 'KoMT', 'KoG', 'KoGHD', 'KoA', 'KoAHD', 'KoAH2O', 'KoAO']: options.format = 'EPUB' elif options.profile in ['KDX']: options.format = 'CBZ' - if options.profile in ['K1', 'K2', 'K3', 'K45', 'KPW', 'KV']: + if options.profile in ['K1', 'K2', 'K34', 'K578', 'KPW', 'KV']: options.iskindle = True if options.white_borders: options.bordersColor = 'white' @@ -967,7 +967,7 @@ def checkOptions(): if options.format == 'MOBI' and options.batchsplit != 2: options.batchsplit = 1 # Older Kindle models don't support Panel View. - if options.profile == 'K1' or options.profile == 'K2' or options.profile == 'K3' or options.profile == 'KDX': + if options.profile == 'K1' or options.profile == 'K2' or options.profile == 'K34' or options.profile == 'KDX': options.panelview = False options.hq = False # Webtoon mode mandatory options diff --git a/kindlecomicconverter/image.py b/kindlecomicconverter/image.py index a380648..c95817e 100755 --- a/kindlecomicconverter/image.py +++ b/kindlecomicconverter/image.py @@ -80,8 +80,8 @@ class ProfileData: Profiles = { 'K1': ("Kindle 1", (600, 670), Palette4, 1.8), 'K2': ("Kindle 2", (600, 670), Palette15, 1.8), - 'K3': ("Kindle", (600, 800), Palette16, 1.8), - 'K45': ("Kindle", (600, 800), Palette16, 1.8), + 'K34': ("Kindle Keyboard/Touch", (600, 800), Palette16, 1.8), + 'K578': ("Kindle", (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/Voyage/Oasis", (1072, 1448), Palette16, 1.8), |