From b16ba6c3920095796d5abc1d7dfb2eab7f109a96 Mon Sep 17 00:00:00 2001 From: Jan Date: Thu, 28 Nov 2013 13:26:10 +1100 Subject: [PATCH 1/4] Unnecessary readme message This shouldn't be included in the README, it'll either be obvious to GitHub users, or meaningless to endusers --- README.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/README.md b/README.md index 339f534..5068319 100644 --- a/README.md +++ b/README.md @@ -8,11 +8,4 @@ - [PyQT4](http://www.riverbankcomputing.com/software/pyqt/download) - [ReportLab](https://pypi.python.org/pypi/reportlab) - [natsort](https://pypi.python.org/pypi/natsort/3.0.1) -- [py2exe](http://www.py2exe.org/) (optional, for Windows distribution only) - -## Notice -I'm no longer actively maintaining this project; many of the recent changes -have been contributed by other developers. Significant contributors are: -- [Jan](https://github.com/catmanjan/) -- [Jonathan Leaders](https://github.com/jleaders/) -- [Marek Kubica](https://github.com/Leonidas-from-XIV/) +- [py2exe](http://www.py2exe.org/) (optional, for Windows distribution only) \ No newline at end of file From 12f69ca8c4d5c3fae754ad93669ecc49ee1a66aa Mon Sep 17 00:00:00 2001 From: Jan Martin Date: Tue, 29 Sep 2015 22:25:33 +1000 Subject: [PATCH 2/4] revert --- README.md | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/README.md b/README.md index 42cbdda..7a847d5 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,3 @@ -<<<<<<< HEAD -## Downloads -- [Mangle for Windows](ftp://foosoft.net/releases/mangle/mangle_win.zip) -- [Mangle for MacOS (Old)](ftp://foosoft.net/releases/mangle/mangle_osx.zip) - -## For Developers -- [Python 2.7](http://www.python.org/download/releases/2.7/) -- [Python Image Library (PIL)](http://www.pythonware.com/products/pil/) -- [PyQT4](http://www.riverbankcomputing.com/software/pyqt/download) -- [ReportLab](https://pypi.python.org/pypi/reportlab) -- [natsort](https://pypi.python.org/pypi/natsort/3.0.1) -- [py2exe](http://www.py2exe.org/) (optional, for Windows distribution only) ======= # Mangle # @@ -106,4 +94,3 @@ its place. Linux users should execute the Python scripts with the interpreter an * [magnle_win.zip](http://dl.foosoft.net/mangle/mangle_win.zip) * [mangle_osx.zip](http://dl.foosoft.net/mangle/mangle_osx.zip) ->>>>>>> cedfe3fc512a8f58680d8fa0618143d423c3112d From 970472e979e5615cb81bc6e8345dd0c1b8fc7f86 Mon Sep 17 00:00:00 2001 From: Jan Martin Date: Tue, 29 Sep 2015 22:26:40 +1000 Subject: [PATCH 3/4] re-revert --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 7a847d5..8f4dd33 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -======= # Mangle # Many years ago I received an [Amazon Kindle](http://en.wikipedia.org/wiki/Kindle) gift. I immediately began playing From cee954068c0843d3de044e2e247d2962e394212b Mon Sep 17 00:00:00 2001 From: Jan Martin Date: Tue, 29 Sep 2015 22:38:47 +1000 Subject: [PATCH 4/4] kindle paperwhite 3 resolution added --- mangle/image.py | 3 ++- mangle/ui/options.ui | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mangle/image.py b/mangle/image.py index 2ce185d..15d1992 100644 --- a/mangle/image.py +++ b/mangle/image.py @@ -84,8 +84,9 @@ class KindleData: 'Kindle 5': ((600, 800), Palette15b), 'Kindle DX': ((824, 1200), Palette15a), 'Kindle DXG': ((824, 1200), Palette15a), - 'Kindle Touch': ((600, 800), 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 } diff --git a/mangle/ui/options.ui b/mangle/ui/options.ui index e5af54a..65df9bf 100644 --- a/mangle/ui/options.ui +++ b/mangle/ui/options.ui @@ -101,6 +101,11 @@ Kindle Paperwhite + + + Kindle Paperwhite 3 + + KoBo Aura H2o