From f036a7168461f4fdc56e742c6f2e43fb3e5740c6 Mon Sep 17 00:00:00 2001 From: Jonathan Leaders Date: Wed, 24 Jul 2013 02:00:43 -0700 Subject: [PATCH 1/9] Added Kindle Paperwhite & Touch --- mangle/image.py | 4 +++- mangle/ui/options.ui | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/mangle/image.py b/mangle/image.py index 9f430da..4aae135 100644 --- a/mangle/image.py +++ b/mangle/image.py @@ -74,7 +74,9 @@ class KindleData: 'Kindle 3': ((600, 800), Palette15a), 'Kindle 4': ((600, 800), Palette15b), 'Kindle DX': ((824, 1200), Palette15a), - 'Kindle DXG': ((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 } diff --git a/mangle/ui/options.ui b/mangle/ui/options.ui index 47f0099..a8e8564 100644 --- a/mangle/ui/options.ui +++ b/mangle/ui/options.ui @@ -86,6 +86,16 @@ Kindle DXG + + + Kindle Touch + + + + + Kindle Paperwhite + + From c973fc9ff8a92d8656061fc40ccaa62a6a10a7f8 Mon Sep 17 00:00:00 2001 From: Jonathan Leaders Date: Wed, 24 Jul 2013 02:05:39 -0700 Subject: [PATCH 2/9] Update README --- README | 1 + 1 file changed, 1 insertion(+) diff --git a/README b/README index e69de29..e7c2e19 100644 --- a/README +++ b/README @@ -0,0 +1 @@ +Use http://kcc.vulturis.eu/ + kindlegen (in same directory) instead. Nice with calibre From c38a3eb291ac88d4b27cb669b83e057e24577138 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sun, 17 Nov 2013 06:14:41 -0800 Subject: [PATCH 3/9] Removing blank file --- README | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 README diff --git a/README b/README deleted file mode 100644 index a5e113a..0000000 --- a/README +++ /dev/null @@ -1,8 +0,0 @@ -REQUIREMENTS -============ - -Python Image Library (PIL) -PyQT4 -Reportlab - -Mangle 2.4 Unofficial version From 7c73411839e3c2a212bfeaf998f42fca0ea51dca Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Fri, 22 Nov 2013 09:26:14 -0800 Subject: [PATCH 4/9] Prefer to keep control over mangle distribution --- mangle/book.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mangle/book.py b/mangle/book.py index 38a8ba1..1bc8c28 100644 --- a/mangle/book.py +++ b/mangle/book.py @@ -266,7 +266,7 @@ class MainWindowBook(QtGui.QMainWindow): def onHelpHomepage(self): services = QtGui.QDesktopServices() - services.openUrl(QtCore.QUrl('https://github.com/catmanjan/mangle')) + services.openUrl(QtCore.QUrl('http://foosoft.net/mangle')) def onHelpAbout(self): From e03c4bc2e62e848f36a6aabaf8e0f17051bc4e33 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Fri, 22 Nov 2013 10:24:18 -0800 Subject: [PATCH 5/9] Updating paths for Mangle --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9bd7426..e375c58 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ ## Downloads -- [Mangle Version 3.0.0](https://github.com/catmanjan/mangle/releases/download/3/mangle_3.zip) (2013-10-11) +- [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/) From 24ffbca91a59fb7b91b8796798349a2b5ac110bc Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Fri, 22 Nov 2013 10:49:16 -0800 Subject: [PATCH 6/9] Fixing a couple of missed URLs in about dialog --- mangle/ui/about.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mangle/ui/about.ui b/mangle/ui/about.ui index f89c313..104b3de 100644 --- a/mangle/ui/about.ui +++ b/mangle/ui/about.ui @@ -51,7 +51,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:14pt;">Mangle</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans';">Version 3</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans';"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans';">Manga processor for the Kindle e-book reader. Please see </span><span style=" font-family:'Sans'; font-style:italic;">license.txt</span><span style=" font-family:'Sans';"> for licensing information. Visit the homepage at </span><a href="https://github.com/catmanjan/mangle"><span style=" font-family:'Sans'; text-decoration: underline; color:#0000ff;">https://github.com/catmanjan/mangle</span></a><span style=" font-family:'Sans';">.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans';">Manga processor for the Kindle e-book reader. Please see </span><span style=" font-family:'Sans'; font-style:italic;">license.txt</span><span style=" font-family:'Sans';"> for licensing information. Visit the homepage at </span><a href="http://foosoft.net/mangle"><span style=" font-family:'Sans'; text-decoration: underline; color:#0000ff;">http://foosoft.net/mangle/</span></a><span style=" font-family:'Sans';">.</span></p></body></html> true From 6d699c6a4f8d3bee0a2359a6fd0c2aa6759da9ee Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Fri, 22 Nov 2013 11:02:29 -0800 Subject: [PATCH 7/9] Fixing setup script --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 7d42ed4..701ca74 100644 --- a/setup.py +++ b/setup.py @@ -17,6 +17,7 @@ from distutils.core import setup +import py2exe import sys From a291f9fc98c4d37cb47a8e75c5e7a01d6e29ca9e Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Fri, 22 Nov 2013 11:27:22 -0800 Subject: [PATCH 8/9] Updating credits --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index e375c58..aa42cbb 100644 --- a/README.md +++ b/README.md @@ -9,3 +9,9 @@ - [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: +- [catmanjan](https://github.com/catmanjan/) +- [Marek Kubica](https://github.com/Leonidas-from-XIV/) From 2f337741493c3bbb43c0cbe01fd8a5039e9be1b6 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Fri, 22 Nov 2013 21:18:21 -0800 Subject: [PATCH 9/9] Updating credits --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index aa42cbb..339f534 100644 --- a/README.md +++ b/README.md @@ -13,5 +13,6 @@ ## Notice I'm no longer actively maintaining this project; many of the recent changes have been contributed by other developers. Significant contributors are: -- [catmanjan](https://github.com/catmanjan/) +- [Jan](https://github.com/catmanjan/) +- [Jonathan Leaders](https://github.com/jleaders/) - [Marek Kubica](https://github.com/Leonidas-from-XIV/)