From 145fe173b89025dad72f7ede806640bb28fc0f5f Mon Sep 17 00:00:00 2001
From: Thomas Sullivan <thomas@tsullivan.me>
Date: Wed, 10 Aug 2016 17:34:05 -0400
Subject: [PATCH 1/4] Add common OS X files to ignore

---
 .gitignore | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/.gitignore b/.gitignore
index ae3a8a2..233c58f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,30 @@ dist
 *.mngl
 *.cbz
 *.bat
+
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
\ No newline at end of file

From 3d385ef41f697ce3179078440b27b28427ee7af3 Mon Sep 17 00:00:00 2001
From: Thomas Sullivan <thomas@tsullivan.me>
Date: Wed, 10 Aug 2016 17:44:24 -0400
Subject: [PATCH 2/4] Ignore .idea folders

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 233c58f..68b179e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ dist
 *.mngl
 *.cbz
 *.bat
+.idea/
 
 *.DS_Store
 .AppleDouble

From 0336f38cbc0f23bdb0718702142247087d93ecac Mon Sep 17 00:00:00 2001
From: Thomas Sullivan <thomas@tsullivan.me>
Date: Sat, 13 Aug 2016 19:27:03 -0400
Subject: [PATCH 3/4] Add support for popular e-readers, consolidate existing
 formats

---
 mangle/image.py      | 21 +++++++++++----------
 mangle/ui/options.ui | 25 +++++++++++++++----------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/mangle/image.py b/mangle/image.py
index dcd6563..d1069d2 100644
--- a/mangle/image.py
+++ b/mangle/image.py
@@ -78,16 +78,17 @@ class KindleData:
 
     Profiles = {
         'Kindle 1': ((600, 800), Palette4),
-        'Kindle 2': ((600, 800), Palette15a),
-        'Kindle 3': ((600, 800), Palette15a),
-        'Kindle 4': ((600, 800), Palette15b),
-        'Kindle 5': ((600, 800), Palette15b),
-        'Kindle DX': ((824, 1200), Palette15a),
-        'Kindle DXG': ((824, 1200), Palette15a),
-        'Kindle Touch': ((600, 800), Palette15a),
-        'Kindle Paperwhite': ((758, 1024), Palette15b), # resolution given in manual, see http://kindle.s3.amazonaws.com/Kindle_Paperwhite_Users_Guide.pdf
-        'Kindle Paperwhite 3': ((1072, 1448), Palette15b),
-        'KoBo Aura H2o': ((1080, 1430), Palette15a), # resolution from http://www.fnac.com/Liseuse-Numerique-Kobo-by-Fnac-Kobo-Aura-H2O-Noir/a7745120/w-4
+        'Kindle 2/3/Touch': ((600, 800), Palette15a),
+        'Kindle 4 & 5': ((600, 800), Palette15b),
+        'Kindle DX/DXG': ((824, 1200), Palette15a),
+        'Kindle Paperwhite 1 & 2': ((758, 1024), Palette15b),
+        'Kindle Paperwhite 3/Voyage/Oasis': ((1072, 1448), Palette15b),
+        'Kobo Mini/Touch': ((600, 800), Palette15b),
+        'Kobo Glo': ((768, 1024), Palette15b),
+        'Kobo Glo HD': ((1072, 1448), Palette15b),
+        'Kobo Aura': ((758, 1024), Palette15b),
+        'Kobo Aura HD': ((1080, 1440), Palette15b),
+        'Kobo Aura H2O': ((1080, 1430), Palette15a),
     }
 
 
diff --git a/mangle/ui/options.ui b/mangle/ui/options.ui
index 3619bbb..dded245 100644
--- a/mangle/ui/options.ui
+++ b/mangle/ui/options.ui
@@ -63,52 +63,57 @@
           </item>
           <item>
            <property name="text">
-            <string>Kindle 2</string>
+            <string>Kindle 2/3/Touch</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>Kindle 3</string>
+            <string>Kindle 4 &amp; 5</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>Kindle 4</string>
+            <string>Kindle DX/DXG</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>Kindle 5</string>
+            <string>Kindle Paperwhite 1 &amp; 2</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>Kindle DX</string>
+            <string>Kindle Paperwhite 3/Voyage/Oasis</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>Kindle DXG</string>
+            <string>Kobo Mini/Touch</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>Kindle Touch</string>
+            <string>Kobo Glo</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>Kindle Paperwhite</string>
+            <string>Kobo Glo HD</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>Kindle Paperwhite 3</string>
+            <string>Kobo Aura</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>KoBo Aura H2o</string>
+            <string>Kobo Aura HD</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Kobo Aura H2O</string>
            </property>
           </item>
          </widget>

From 03a46c6c80b2ee34ebd2ccc68e487d63b6091771 Mon Sep 17 00:00:00 2001
From: Thomas Sullivan <thomas@tsullivan.me>
Date: Sat, 13 Aug 2016 19:28:19 -0400
Subject: [PATCH 4/4] Change default format to newest kindles

---
 mangle/book.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mangle/book.py b/mangle/book.py
index fe8edfa..e4d545a 100644
--- a/mangle/book.py
+++ b/mangle/book.py
@@ -45,7 +45,7 @@ def natural_key(string_):
 
 
 class Book(object):
-    DefaultDevice       = 'Kindle Paperwhite'
+    DefaultDevice       = 'Kindle Paperwhite 3/Voyage/Oasis'
     DefaultOutputFormat = 'CBZ only'
     DefaultOverwrite    = True
     DefaultImageFlags   = ImageFlags.Orient | ImageFlags.Resize | ImageFlags.Quantize