Merge pull request #2 from FooSoft/master

Keeping in line with master
This commit is contained in:
Jan 2013-11-27 18:24:31 -08:00
commit cc5588a607
6 changed files with 19 additions and 4 deletions

View File

@ -1,5 +1,6 @@
## Downloads ## 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 ## For Developers
- [Python 2.7](http://www.python.org/download/releases/2.7/) - [Python 2.7](http://www.python.org/download/releases/2.7/)
@ -8,3 +9,10 @@
- [ReportLab](https://pypi.python.org/pypi/reportlab) - [ReportLab](https://pypi.python.org/pypi/reportlab)
- [natsort](https://pypi.python.org/pypi/natsort/3.0.1) - [natsort](https://pypi.python.org/pypi/natsort/3.0.1)
- [py2exe](http://www.py2exe.org/) (optional, for Windows distribution only) - [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/)

View File

@ -266,7 +266,7 @@ class MainWindowBook(QtGui.QMainWindow):
def onHelpHomepage(self): def onHelpHomepage(self):
services = QtGui.QDesktopServices() services = QtGui.QDesktopServices()
services.openUrl(QtCore.QUrl('https://github.com/catmanjan/mangle')) services.openUrl(QtCore.QUrl('http://foosoft.net/mangle'))
def onHelpAbout(self): def onHelpAbout(self):

View File

@ -81,7 +81,8 @@ class KindleData:
'Kindle 5': ((600, 800), Palette15b), 'Kindle 5': ((600, 800), Palette15b),
'Kindle DX': ((824, 1200), Palette15a), 'Kindle DX': ((824, 1200), Palette15a),
'Kindle DXG': ((824, 1200), Palette15a), 'Kindle DXG': ((824, 1200), Palette15a),
'Kindle Paperwhite': ((758, 1024), Palette15b) '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
} }

View File

@ -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'; 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=" 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="-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>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans';&quot;&gt;Manga processor for the Kindle e-book reader. Please see &lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-style:italic;&quot;&gt;license.txt&lt;/span&gt;&lt;span style=&quot; font-family:'Sans';&quot;&gt; for licensing information. Visit the homepage at &lt;/span&gt;&lt;a href=&quot;https://github.com/catmanjan/mangle&quot;&gt;&lt;span style=&quot; font-family:'Sans'; text-decoration: underline; color:#0000ff;&quot;&gt;https://github.com/catmanjan/mangle&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Sans';&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans';&quot;&gt;Manga processor for the Kindle e-book reader. Please see &lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-style:italic;&quot;&gt;license.txt&lt;/span&gt;&lt;span style=&quot; font-family:'Sans';&quot;&gt; for licensing information. Visit the homepage at &lt;/span&gt;&lt;a href=&quot;http://foosoft.net/mangle&quot;&gt;&lt;span style=&quot; font-family:'Sans'; text-decoration: underline; color:#0000ff;&quot;&gt;http://foosoft.net/mangle/&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Sans';&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>

View File

@ -91,6 +91,11 @@
<string>Kindle DXG</string> <string>Kindle DXG</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>Kindle Touch</string>
</property>
</item>
<item> <item>
<property name="text"> <property name="text">
<string>Kindle Paperwhite</string> <string>Kindle Paperwhite</string>

View File

@ -17,6 +17,7 @@
from distutils.core import setup from distutils.core import setup
import py2exe
import sys import sys