diff options
| author | Paweł Jastrzębski <pawelj@iosphe.re> | 2017-10-13 09:12:17 +0200 |
|---|---|---|
| committer | Paweł Jastrzębski <pawelj@iosphe.re> | 2017-10-13 09:12:17 +0200 |
| commit | 458c28281f79ca8c9c446167672972628d5286bf (patch) | |
| tree | dd3eadf6769225b00214aadfd4b1cbc8f4e3d1c8 /kindlecomicconverter | |
| parent | Updated build enviroment (diff) | |
| download | kcc-458c28281f79ca8c9c446167672972628d5286bf.tar.gz kcc-458c28281f79ca8c9c446167672972628d5286bf.tar.bz2 kcc-458c28281f79ca8c9c446167672972628d5286bf.zip | |
Added Oasis 2 profile (close #249)
Diffstat (limited to 'kindlecomicconverter')
| -rw-r--r-- | kindlecomicconverter/KCC_gui.py | 5 | ||||
| -rwxr-xr-x | kindlecomicconverter/comic2ebook.py | 8 | ||||
| -rwxr-xr-x | kindlecomicconverter/image.py | 1 |
3 files changed, 9 insertions, 5 deletions
diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py index c2749ff..a97ac7b 100644 --- a/kindlecomicconverter/KCC_gui.py +++ b/kindlecomicconverter/KCC_gui.py @@ -618,7 +618,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): def togglequalityBox(self, value): profile = GUI.profiles[str(GUI.deviceBox.currentText())] if value == 2: - if profile['Label'] in ['KV']: + if profile['Label'] in ['KV', 'KO']: self.addMessage('This option is intended for older Kindle models.', 'warning') self.addMessage('It will not increase quality on a device with 300 ppi screen.', 'warning') GUI.upscaleBox.setEnabled(False) @@ -918,6 +918,8 @@ class KCCGUI(KCC_ui.Ui_mainWindow): MW.resize(500, 500) self.profiles = { + "Kindle Oasis 2": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, + 'DefaultUpscale': True, 'Label': 'KO'}, "Kindle Oasis": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'Label': 'KV'}, "Kindle Voyage": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, @@ -956,6 +958,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): 'DefaultUpscale': False, 'Label': 'K34'}, } profilesGUI = [ + "Kindle Oasis 2", "Kindle Oasis", "Kindle Voyage", "Kindle PW 3", diff --git a/kindlecomicconverter/comic2ebook.py b/kindlecomicconverter/comic2ebook.py index 4d5f574..3cf38f4 100755 --- a/kindlecomicconverter/comic2ebook.py +++ b/kindlecomicconverter/comic2ebook.py @@ -887,8 +887,8 @@ def makeParser(): otherOptions = OptionGroup(psr, "OTHER") mainOptions.add_option("-p", "--profile", action="store", dest="profile", default="KV", - help="Device profile (Available options: K1, K2, K34, K578, KDX, KPW, KV, KoMT, KoG, KoGHD," - " KoA, KoAHD, KoAH2O, KoAO) [Default=KV]") + help="Device profile (Available options: K1, K2, K34, K578, KDX, KPW, KV, KO, 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)") mainOptions.add_option("-q", "--hq", action="store_true", dest="hq", default=False, @@ -951,13 +951,13 @@ def checkOptions(): options.iskindle = False options.bordersColor = None if options.format == 'Auto': - if options.profile in ['K1', 'K2', 'K34', 'K578', 'KPW', 'KV']: + if options.profile in ['K1', 'K2', 'K34', 'K578', 'KPW', 'KV', 'KO']: 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', 'K34', 'K578', 'KPW', 'KV']: + if options.profile in ['K1', 'K2', 'K34', 'K578', 'KPW', 'KV', 'KO']: options.iskindle = True if options.white_borders: options.bordersColor = 'white' diff --git a/kindlecomicconverter/image.py b/kindlecomicconverter/image.py index c95817e..e7f29a4 100755 --- a/kindlecomicconverter/image.py +++ b/kindlecomicconverter/image.py @@ -85,6 +85,7 @@ class ProfileData: '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), + 'KO': ("Kindle Oasis 2", (1264, 1680), Palette16, 1.8), 'KoMT': ("Kobo Mini/Touch", (600, 800), Palette16, 1.8), 'KoG': ("Kobo Glo", (768, 1024), Palette16, 1.8), 'KoGHD': ("Kobo Glo HD", (1072, 1448), Palette16, 1.8), |