diff --git a/installer/linux/freeze.py b/installer/linux/freeze.py index 31f645dff1..1fc18d3600 100644 --- a/installer/linux/freeze.py +++ b/installer/linux/freeze.py @@ -93,6 +93,8 @@ def freeze(): 'dateutil', 'dns', 'email'] includes += ['calibre.web.feeds.recipes.'+r for r in recipe_modules] + includes += [x.split('/')[-1].rpartition('.')[0] for x in \ + glob.glob('src/calibre/gui2/convert/*.py')] LOADER = '/tmp/loader.py' open(LOADER, 'wb').write('# This script is never actually used.\nimport sys') diff --git a/installer/osx/freeze.py b/installer/osx/freeze.py index 75621da017..a16dd3aaee 100644 --- a/installer/osx/freeze.py +++ b/installer/osx/freeze.py @@ -347,7 +347,7 @@ def main(): 'PyQt4.QtSvg', 'PyQt4.QtWebKit', 'commands', 'mechanize', 'ClientForm', 'usbobserver', 'genshi', 'calibre.web.feeds.recipes.*', - 'calibre.ebooks.lrf.any.*', 'calibre.ebooks.lrf.feeds.*', + 'calibre.gui2.convert.*', 'keyword', 'codeop', 'pydoc', 'readline', 'BeautifulSoup', 'calibre.ebooks.lrf.fonts.prs500.*', 'dateutil', 'email.iterators', diff --git a/installer/windows/freeze.py b/installer/windows/freeze.py index f545f7e534..ae5b503be7 100644 --- a/installer/windows/freeze.py +++ b/installer/windows/freeze.py @@ -175,6 +175,7 @@ def main(args=sys.argv): 'BeautifulSoup', 'pyreadline', 'pydoc', 'IPython.Extensions.*', 'calibre.web.feeds.recipes.*', + 'calibre.gui2.convert.*', 'calibre.ebooks.lrf.fonts.prs500.*', 'PyQt4.QtWebKit', 'PyQt4.QtNetwork', ], diff --git a/src/calibre/ebooks/mobi/writer.py b/src/calibre/ebooks/mobi/writer.py index f63eaa0940..e65a090b22 100644 --- a/src/calibre/ebooks/mobi/writer.py +++ b/src/calibre/ebooks/mobi/writer.py @@ -642,7 +642,7 @@ class MobiWriter(object): first = True for child in toc.iter(): - add_node(child, 'chapter', title='Title Page' if first else None) + add_node(child, 'chapter')#, title='Title Page' if first else None) first = False return align_block(ctoc.getvalue()) diff --git a/src/calibre/gui2/convert/page_setup.py b/src/calibre/gui2/convert/page_setup.py index 3f59537db0..9faaf04ecc 100644 --- a/src/calibre/gui2/convert/page_setup.py +++ b/src/calibre/gui2/convert/page_setup.py @@ -49,6 +49,12 @@ class PageSetupWidget(Widget, Ui_Form): x.setMouseTracking(True) self.connect(x, SIGNAL('entered(QModelIndex)'), self.show_desc) self.initialize_options(get_option, get_help, db, book_id) + it = unicode(self.opt_input_profile.toolTip()) + self.opt_input_profile.setToolTip('

'+it.replace('t.','t.\n
')) + it = unicode(self.opt_output_profile.toolTip()) + self.opt_output_profile.setToolTip('

'+it.replace('t.','ce.\n
')) + + def show_desc(self, index): desc = index.model().data(index, Qt.StatusTipRole).toString() diff --git a/src/calibre/gui2/images/welcome_wizard.svg b/src/calibre/gui2/images/welcome_wizard.svg index d8ed0e69c9..5d5f4635d6 100644 --- a/src/calibre/gui2/images/welcome_wizard.svg +++ b/src/calibre/gui2/images/welcome_wizard.svg @@ -9,8 +9,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="250" - height="525" + width="150" + height="350" id="svg2347" sodipodi:version="0.32" inkscape:version="0.46" @@ -1149,7 +1149,7 @@ + transform="matrix(1.2103698,0,0,2.7823904,-2.5000367,-12.695448)">