about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaweł Jastrzębski <pawelj@iosphe.re>2016-04-25 17:48:57 +0200
committerPaweł Jastrzębski <pawelj@iosphe.re>2016-04-25 17:48:57 +0200
commit73c2e4b136debaae7d5645c2115da07cc31f3f5f (patch)
tree59ce2ae096561692eedf07d6fa061f13fdef95af
parentGUI tweaks (diff)
downloadkcc-73c2e4b136debaae7d5645c2115da07cc31f3f5f.tar.gz
kcc-73c2e4b136debaae7d5645c2115da07cc31f3f5f.tar.bz2
kcc-73c2e4b136debaae7d5645c2115da07cc31f3f5f.zip
Added Kindle Oasis profile
-rw-r--r--README.md2
-rw-r--r--kcc/KCC_gui.py18
-rwxr-xr-xkcc/image.py2
3 files changed, 14 insertions, 8 deletions
diff --git a/README.md b/README.md
index 50176c0..b3aa05c 100644
--- a/README.md
+++ b/README.md
@@ -144,7 +144,7 @@ The app relies and includes the following scripts:
  - 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 Paperwhite 3 / Voyage](http://kcc.iosphe.re/Samples/Ubunchu!-KV.mobi)
+* [Kindle Paperwhite 3 / Voyage / Oasis](http://kcc.iosphe.re/Samples/Ubunchu!-KV.mobi)
 * [Kindle Paperwhite 1 / 2](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.cbz)
diff --git a/kcc/KCC_gui.py b/kcc/KCC_gui.py
index 692f463..3c3419c 100644
--- a/kcc/KCC_gui.py
+++ b/kcc/KCC_gui.py
@@ -879,8 +879,12 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             self.p.ionice(1)
 
         self.profiles = {
-            "K. PW 3/Voyage": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
-                               'DefaultUpscale': True, 'Label': 'KV'},
+            "Kindle Oasis": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
+                             'DefaultUpscale': True, 'Label': 'KV'},
+            "Kindle Voyage": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
+                              'DefaultUpscale': True, 'Label': 'KV'},
+            "Kindle PW 3": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
+                            'DefaultUpscale': True, 'Label': 'KV'},
             "Kindle PW 1/2": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
                               'DefaultUpscale': False, 'Label': 'KPW'},
             "Kindle": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
@@ -909,7 +913,9 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                          'DefaultUpscale': False, 'Label': 'K3'},
         }
         profilesGUI = [
-            "K. PW 3/Voyage",
+            "Kindle Oasis",
+            "Kindle Voyage",
+            "Kindle PW 3",
             "Kindle PW 1/2",
             "Kindle",
             "Separator",
@@ -922,10 +928,10 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             "Separator",
             "Other",
             "Separator",
-            "Kindle 1",
-            "Kindle 2",
-            "Kindle 3",
             "Kindle DX/DXG",
+            "Kindle 3",
+            "Kindle 2",
+            "Kindle 1",
         ]
 
         statusBarLabel = QtWidgets.QLabel('<b><a href="https://kcc.iosphe.re/">HOMEPAGE</a> - <a href="https://github.'
diff --git a/kcc/image.py b/kcc/image.py
index 67d7b7a..f43d24c 100755
--- a/kcc/image.py
+++ b/kcc/image.py
@@ -83,7 +83,7 @@ class ProfileData:
         '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)),
+        'KV': ("Kindle Paperwhite 3/Voyage/Oasis", (1072, 1448), Palette16, 1.8, (1608, 2172)),
         'KoMT': ("Kobo Mini/Touch", (600, 800), Palette16, 1.8, (900, 1200)),
         'KoG': ("Kobo Glo", (768, 1024), Palette16, 1.8, (1152, 1536)),
         'KoGHD': ("Kobo Glo HD", (1072, 1448), Palette16, 1.8, (1608, 2172)),