Merge from trunk

Changelog.yaml

@@ -19,6 +19,65 @@
 #  new recipes:
 #    - title: 
 
+
+- version: 0.7.54
+  date: 2011-04-08
+
+  new features:
+    - title: "New output format, HTMLZ which is a single HTML file with its associated images/stylesheets in a zipped up file"
+      description: "Useful when you want to convert your ebook into a single HTML file for easy editing. Note that this output plugin is still new and needs testing"
+
+    - title: "When dealing with ZIP/RAR archives, use the file header rather than the file extension to detrmine the file type, when possible. This fixes the common case of CBZ files being actually cbr files and vice versa"
+
+    - title: "Support for the Motorola Atrix"
+
+    - title: "Allow the icons in the toolbar to be turned off completely via Preferences->Look & Feel"
+
+    - title: "When downloading metadata use the gzip transfer encoding when possible for a speedup."
+      tickets: [749304]
+  
+  bug fixes:
+    - title: "Conversion pipeline: Workaround for bug in lxml that causes a massive mem leak on windows and OS X when the input document contains non ASCII CSS selectors."
+      tickets: [754555]
+
+    - title: "Conversion pipeline: Handle inline <style> tags that put all the actual CSS inside an XML comment."
+      tickets: [750063]
+
+    - title: "The 'Choose Library' button now shows its popup menu when you already have more than one library instead of the dialog to create a new library"
+      tickets: [754154]
+
+    - title: "Apply all content server setting when clicking the Start Server button in Preferences->Sharing over the net"
+      tickets: [753122]
+
+    - title: "Fix content server breaking if its restriction is set to a saved search that was deleted"
+      tickets: [751950]
+
+    - title: "Fix detection of PocketBook with 2.0.6 firmware on windows"
+      tickets: [750336]
+
+    - title: "ODT Input: Fix handling of the <text:s> element."
+      tickets: [749655]
+
+    - title: "MOBI Output: Don't use self closed tags"
+
+    - title: "Fix book details popup becoming too tall if there is a lot of metadata"
+
+    - title: "Fix new PDF engine crashing on PDF files with embedded fonts with null names"
+
+  improved recipes:
+    - Kommersant
+    - Perfil
+    - Times of India
+    - IHT
+    - Guardian
+
+  new recipes:
+    - title: "Al Ahram"
+      authors: Hassan Williamson
+
+    - title: "F-Secure and developpez.com"
+      authors: louhike
+
 - version: 0.7.53
   date: 2011-04-01
 

src/calibre/constants.py

@@ -2,7 +2,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = 'calibre'
-__version__   = '0.7.53'
+__version__   = '0.7.54'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 
 import re, importlib

src/calibre/ebooks/pdf/pdftohtml.py

@@ -13,7 +13,7 @@ from functools import partial
 
 from calibre.ebooks import ConversionError, DRMError
 from calibre.ptempfile import PersistentTemporaryFile
-from calibre import isosx, iswindows, islinux, isfreebsd
+from calibre.constants import isosx, iswindows, islinux, isfreebsd
 from calibre import CurrentDir
 
 PDFTOHTML = 'pdftohtml'
@@ -43,6 +43,8 @@ def pdftohtml(output_dir, pdf_path, no_images):
         # This is neccessary as pdftohtml doesn't always (linux) respect absolute paths
         pdf_path = os.path.abspath(pdf_path)
         cmd = [PDFTOHTML, '-enc', 'UTF-8', '-noframes', '-p', '-nomerge', '-nodrm', '-q', pdf_path, os.path.basename(index)]
+        if isfreebsd:
+            cmd.remove('-nodrm')
         if no_images:
             cmd.append('-i')
 

src/calibre/gui2/__init__.py

@@ -13,7 +13,7 @@ from PyQt4.Qt import QVariant, QFileInfo, QObject, SIGNAL, QBuffer, Qt, \
 
 ORG_NAME = 'KovidsBrain'
 APP_UID  = 'libprs500'
-from calibre.constants import islinux, iswindows, isfreebsd, isfrozen
+from calibre.constants import islinux, iswindows, isfreebsd, isfrozen, isosx
 from calibre.utils.config import Config, ConfigProxy, dynamic, JSONConfig
 from calibre.utils.localization import set_qt_translator
 from calibre.ebooks.metadata.meta import get_metadata, metadata_from_formats
@@ -23,21 +23,45 @@ from calibre.utils.date import UNDEFINED_DATE
 # Setup gprefs {{{
 gprefs = JSONConfig('gui')
 
-gprefs.defaults['action-layout-toolbar'] = (
+if isosx:
+    gprefs.defaults['action-layout-menubar'] = (
+        'Add Books', 'Edit Metadata', 'Convert Books',
+        'Choose Library', 'Save To Disk', 'Preferences',
+        'Help',
+        )
+    gprefs.defaults['action-layout-menubar-device'] = (
+        'Add Books', 'Edit Metadata', 'Convert Books',
+        'Location Manager', 'Send To Device',
+        'Save To Disk', 'Preferences', 'Help',
+        )
+    gprefs.defaults['action-layout-toolbar'] = (
+        'Add Books', 'Edit Metadata', None, 'Convert Books', 'View', None,
+        'Choose Library', 'Donate', None, 'Fetch News', 'Save To Disk',
+        'Connect Share', None, 'Remove Books',
+        )
+    gprefs.defaults['action-layout-toolbar-device'] = (
+        'Add Books', 'Edit Metadata', None, 'Convert Books', 'View',
+        'Send To Device', None, None, 'Location Manager', None, None,
+        'Fetch News', 'Save To Disk', 'Connect Share', None,
+        'Remove Books',
+        )
+else:
+    gprefs.defaults['action-layout-menubar'] = ()
+    gprefs.defaults['action-layout-menubar-device'] = ()
+    gprefs.defaults['action-layout-toolbar'] = (
         'Add Books', 'Edit Metadata', None, 'Convert Books', 'View', None,
         'Choose Library', 'Donate', None, 'Fetch News', 'Save To Disk',
         'Connect Share', None, 'Remove Books', None, 'Help', 'Preferences',
         )
-
-gprefs.defaults['action-layout-toolbar-child'] = ()
-
-gprefs.defaults['action-layout-toolbar-device'] = (
+    gprefs.defaults['action-layout-toolbar-device'] = (
         'Add Books', 'Edit Metadata', None, 'Convert Books', 'View',
         'Send To Device', None, None, 'Location Manager', None, None,
         'Fetch News', 'Save To Disk', 'Connect Share', None,
         'Remove Books', None, 'Help', 'Preferences',
         )
 
+gprefs.defaults['action-layout-toolbar-child'] = ()
+
 gprefs.defaults['action-layout-context-menu'] = (
         'Edit Metadata', 'Send To Device', 'Save To Disk',
         'Connect Share', 'Copy To Library', None,

src/calibre/gui2/actions/__init__.py

@@ -75,7 +75,7 @@ class InterfaceAction(QObject):
     dont_remove_from = frozenset([])
 
     all_locations = frozenset(['toolbar', 'toolbar-device', 'context-menu',
-        'context-menu-device', 'toolbar-child'])
+        'context-menu-device', 'toolbar-child', 'menubar', 'menubar-device'])
 
     #: Type of action
     #: 'current' means acts on the current view

src/calibre/gui2/actions/add_to_library.py

@@ -12,7 +12,7 @@ class AddToLibraryAction(InterfaceAction):
     name = 'Add To Library'
     action_spec = (_('Add books to library'), 'add_book.png',
             _('Add books to your calibre library from the connected device'), None)
-    dont_add_to = frozenset(['toolbar', 'context-menu', 'toolbar-child'])
+    dont_add_to = frozenset(['menubar', 'toolbar', 'context-menu', 'toolbar-child'])
     action_type = 'current'
 
     def genesis(self):

src/calibre/gui2/actions/annotate.py

@@ -18,6 +18,7 @@ class FetchAnnotationsAction(InterfaceAction):
 
     name = 'Fetch Annotations'
     action_spec = (_('Fetch annotations (experimental)'), None, None, None)
+    dont_add_to = frozenset(['menubar', 'toolbar', 'context-menu', 'toolbar-child'])
     action_type = 'current'
 
     def genesis(self):

src/calibre/gui2/actions/catalog.py

@@ -18,7 +18,7 @@ class GenerateCatalogAction(InterfaceAction):
 
     name = 'Generate Catalog'
     action_spec = (_('Create a catalog of the books in your calibre library'), None, None, None)
-    dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+    dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
 
     def generate_catalog(self):
         rows = self.gui.library_view.selectionModel().selectedRows()

src/calibre/gui2/actions/choose_library.py

@@ -80,7 +80,7 @@ class ChooseLibraryAction(InterfaceAction):
     name = 'Choose Library'
     action_spec = (_('%d books'), 'lt.png',
             _('Choose calibre library to work with'), None)
-    dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+    dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
 
     def genesis(self):
         self.count_changed(0)
@@ -210,7 +210,6 @@ class ChooseLibraryAction(InterfaceAction):
                 rename_actions, delete_actions, qs_actions,
                 self.action_choose)
 
-
     def location_selected(self, loc):
         enabled = loc == 'library'
         self.qaction.setEnabled(enabled)

src/calibre/gui2/actions/convert.py

@@ -20,7 +20,7 @@ class ConvertAction(InterfaceAction):
 
     name = 'Convert Books'
     action_spec = (_('Convert books'), 'convert.png', None, _('C'))
-    dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+    dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
     action_type = 'current'
 
     def genesis(self):

src/calibre/gui2/actions/device.py

@@ -24,7 +24,7 @@ class ShareConnMenu(QMenu): # {{{
 
     config_email = pyqtSignal()
     toggle_server = pyqtSignal()
-    dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+    dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
 
     def __init__(self, parent=None):
         QMenu.__init__(self, parent)
@@ -121,8 +121,7 @@ class SendToDeviceAction(InterfaceAction):
 
     name = 'Send To Device'
     action_spec = (_('Send to device'), 'sync.png', None, _('D'))
-    dont_remove_from = frozenset(['toolbar-device'])
-    dont_add_to = frozenset(['toolbar', 'context-menu', 'toolbar-child'])
+    dont_add_to = frozenset(['menubar', 'toolbar', 'context-menu', 'toolbar-child'])
 
     def genesis(self):
         self.qaction.triggered.connect(self.do_sync)

src/calibre/gui2/actions/edit_collections.py

@@ -12,7 +12,7 @@ class EditCollectionsAction(InterfaceAction):
     name = 'Edit Collections'
     action_spec = (_('Manage collections'), None,
             _('Manage the collections on this device'), None)
-    dont_add_to = frozenset(['toolbar', 'context-menu', 'toolbar-child'])
+    dont_add_to = frozenset(['menubar', 'toolbar', 'context-menu', 'toolbar-child'])
     action_type = 'current'
 
     def genesis(self):

src/calibre/gui2/actions/next_match.py

@@ -11,7 +11,7 @@ class NextMatchAction(InterfaceAction):
     name = 'Move to next highlighted book'
     action_spec = (_('Move to next match'), 'arrow-down.png',
             _('Move to next highlighted match'), [_('N'), _('F3')])
-    dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+    dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
     action_type = 'current'
 
     def genesis(self):

src/calibre/gui2/actions/open.py

@@ -13,7 +13,7 @@ class OpenFolderAction(InterfaceAction):
     name = 'Open Folder'
     action_spec = (_('Open containing folder'), 'document_open.png', None,
             _('O'))
-    dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+    dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
     action_type = 'current'
 
     def genesis(self):

src/calibre/gui2/actions/preferences.py

@@ -16,7 +16,6 @@ class PreferencesAction(InterfaceAction):
 
     name = 'Preferences'
     action_spec = (_('Preferences'), 'config.png', None, _('Ctrl+P'))
-    dont_remove_from = frozenset(['toolbar'])
 
     def genesis(self):
         pm = QMenu()

src/calibre/gui2/actions/show_book_details.py

@@ -15,7 +15,7 @@ class ShowBookDetailsAction(InterfaceAction):
     name = 'Show Book Details'
     action_spec = (_('Show book details'), 'dialog_information.png', None,
             _('I'))
-    dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+    dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
     action_type = 'current'
 
     def genesis(self):

src/calibre/gui2/actions/tweak_epub.py

@@ -15,7 +15,7 @@ class TweakEpubAction(InterfaceAction):
     action_spec = (_('Tweak ePub'), 'trim.png',
             _('Make small changes to ePub format books'),
             _('T'))
-    dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
+    dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
     action_type = 'current'
 
     def genesis(self):

src/calibre/gui2/layout.py

@@ -8,11 +8,11 @@ __docformat__ = 'restructuredtext en'
 from functools import partial
 
 from PyQt4.Qt import (QIcon, Qt, QWidget, QToolBar, QSize,
-    pyqtSignal, QToolButton, QMenu,
+    pyqtSignal, QToolButton, QMenu, QMenuBar, QAction,
     QObject, QVBoxLayout, QSizePolicy, QLabel, QHBoxLayout, QActionGroup)
 
 
-from calibre.constants import __appname__
+from calibre.constants import __appname__, isosx
 from calibre.gui2.search_box import SearchBox2, SavedSearchBox
 from calibre.gui2.throbber import ThrobbingButton
 from calibre.gui2 import gprefs
@@ -238,6 +238,80 @@ class Spacer(QWidget): # {{{
         self.l.addStretch(10)
 # }}}
 
+class MenuAction(QAction): # {{{
+
+    def __init__(self, clone, parent):
+        QAction.__init__(self, clone.text(), parent)
+        self.clone = clone
+        clone.changed.connect(self.clone_changed)
+
+    def clone_changed(self):
+        self.setText(self.clone.text())
+# }}}
+
+class MenuBar(QMenuBar): # {{{
+
+    def __init__(self, location_manager, parent):
+        QMenuBar.__init__(self, parent)
+        self.gui = parent
+        self.setNativeMenuBar(True)
+
+        self.location_manager = location_manager
+        self.location_manager.locations_changed.connect(self.build_bar)
+        self.added_actions = []
+
+        self.donate_action = QAction(_('Donate'), self)
+        self.donate_menu = QMenu()
+        self.donate_menu.addAction(self.gui.donate_action)
+        self.donate_action.setMenu(self.donate_menu)
+        self.build_bar()
+
+    def build_bar(self, changed_action=None):
+        showing_device = self.location_manager.has_device
+        actions = '-device' if showing_device else ''
+        actions = gprefs['action-layout-menubar'+actions]
+
+        show_main = len(actions) > 0
+        self.setVisible(show_main)
+
+        for ac in self.added_actions:
+            m = ac.menu()
+            if m is not None:
+                m.setVisible(False)
+
+        self.clear()
+        self.added_actions = []
+        self.action_map = {}
+
+        for what in actions:
+            if what is None:
+                continue
+            elif what == 'Location Manager':
+                for ac in self.location_manager.available_actions:
+                    ac = self.build_menu(ac)
+                    self.addAction(ac)
+                    self.added_actions.append(ac)
+            elif what == 'Donate':
+                self.addAction(self.donate_action)
+            elif what in self.gui.iactions:
+                action = self.gui.iactions[what]
+                ac = self.build_menu(action.qaction)
+                self.addAction(ac)
+                self.added_actions.append(ac)
+
+    def build_menu(self, action):
+        m = action.menu()
+        ac = MenuAction(action, self)
+        if m is None:
+            m = QMenu()
+            m.addAction(action)
+        ac.setMenu(m)
+        return ac
+
+
+
+# }}}
+
 class ToolBar(QToolBar): # {{{
 
     def __init__(self, donate, location_manager, child_bar, parent):
@@ -284,6 +358,8 @@ class ToolBar(QToolBar): # {{{
         mactions = gprefs['action-layout-toolbar'+mactions]
         cactions = gprefs['action-layout-toolbar-child']
 
+        show_main = len(mactions) > 0
+        self.setVisible(show_main)
         show_child = len(cactions) > 0
         self.child_bar.setVisible(show_child)
 
@@ -309,6 +385,8 @@ class ToolBar(QToolBar): # {{{
                     self.d_widget = QWidget()
                     self.d_widget.setLayout(QVBoxLayout())
                     self.d_widget.layout().addWidget(self.donate_button)
+                    if isosx:
+                        self.d_widget.setStyleSheet('QWidget, QToolButton {background-color: none; border: none; }')
                     bar.addWidget(self.d_widget)
                     self.showing_donate = True
                 elif what in self.gui.iactions:
@@ -325,10 +403,13 @@ class ToolBar(QToolBar): # {{{
         ch.setAutoRaise(True)
         if ac.menu() is not None and menu_mode is not None:
             ch.setPopupMode(menu_mode)
+        return ch
 
     def resizeEvent(self, ev):
         QToolBar.resizeEvent(self, ev)
         style = Qt.ToolButtonTextUnderIcon
+        s = gprefs['toolbar_icon_size']
+        if s != 'off':
             p = gprefs['toolbar_text']
             if p == 'never':
                 style = Qt.ToolButtonIconOnly
@@ -421,6 +502,9 @@ class MainWindowMixin(object): # {{{
                 self.location_manager, self.child_bar, self)
         self.addToolBar(Qt.TopToolBarArea, self.tool_bar)
         self.addToolBar(Qt.BottomToolBarArea, self.child_bar)
+        self.menu_bar = MenuBar(self.location_manager, self)
+        self.setMenuBar(self.menu_bar)
+        self.setUnifiedTitleAndToolBarOnMac(True)
 
         l = self.centralwidget.layout()
         l.addWidget(self.search_bar)

src/calibre/gui2/metadata/single_download.py

@@ -398,12 +398,24 @@ class IdentifyWidget(QWidget): # {{{
         self.abort.set()
 # }}}
 
-class FullFetch(QDialog): # {{{
+class CoverWidget(QWidget): # {{{
 
     def __init__(self, log, parent=None):
-        QDialog.__init__(self, parent)
+        QWidget.__init__(self, parent)
         self.log = log
 
+    def start(self, book, current_cover, title, authors):
+        self.book, self.current_cover = book, current_cover
+        self.title, self.authors = title, authors
+        self.log('\n\nStarting cover download for:', book.title)
+# }}}
+
+class FullFetch(QDialog): # {{{
+
+    def __init__(self, log, current_cover=None, parent=None):
+        QDialog.__init__(self, parent)
+        self.log, self.current_cover = log, current_cover
+
         self.setWindowTitle(_('Downloading metadata...'))
         self.setWindowIcon(QIcon(I('metadata.png')))
 
@@ -428,12 +440,19 @@ class FullFetch(QDialog): # {{{
         self.identify_widget.results_found.connect(self.identify_results_found)
         self.identify_widget.book_selected.connect(self.book_selected)
         self.stack.addWidget(self.identify_widget)
+
+        self.cover_widget = CoverWidget(self.log, parent=self)
+        self.stack.addWidget(self.cover_widget)
+
         self.resize(850, 500)
 
     def book_selected(self, book):
-        print (book)
         self.next_button.setVisible(False)
         self.ok_button.setVisible(True)
+        self.book = book
+        self.stack.setCurrentIndex(1)
+        self.cover_widget.start(book, self.current_cover,
+                self.title, self.authors)
 
     def accept(self):
         # Prevent the usual dialog accept mechanisms from working
@@ -453,6 +472,7 @@ class FullFetch(QDialog): # {{{
         pass
 
     def start(self, title=None, authors=None, identifiers={}):
+        self.title, self.authors = title, authors
         self.identify_widget.start(title=title, authors=authors,
                 identifiers=identifiers)
         self.exec_()

src/calibre/gui2/preferences/columns.ui

@@ -218,7 +218,7 @@
         <item row="0" column="1">
          <widget class="QComboBox" name="opt_edit_metadata_single_layout">
           <property name="toolTip">
-           <string>Choose varying layouts in the Edit Metadata Single dialog.</string>
+           <string>Choose a different layout for the Edit Metadata dialog. Alternate layouts make it easier to edit custom columns.</string>
           </property>
          </widget>
         </item>

src/calibre/gui2/preferences/main.py

@@ -360,6 +360,7 @@ class Preferences(QMainWindow):
             self.gui.create_device_menu()
             self.gui.set_device_menu_items_state(bool(self.gui.device_connected))
             self.gui.tool_bar.build_bar()
+            self.gui.menu_bar.build_bar()
             self.gui.build_context_menus()
             self.gui.tool_bar.apply_settings()
 

src/calibre/gui2/preferences/toolbar.py

@@ -34,9 +34,12 @@ class BaseModel(QAbstractListModel):
         if name == 'Location Manager':
             return FakeAction(name, None,
                     _('Switch between library and device views'),
-                    dont_remove_from=set(['toolbar-device']))
+                    dont_add_to=frozenset(['menubar', 'toolbar',
+                        'toolbar-child', 'context-menu',
+                        'context-menu-device']))
         if name is None:
-            return FakeAction('--- '+_('Separator')+' ---', None)
+            return FakeAction('--- '+_('Separator')+' ---', None,
+                    dont_add_to=frozenset(['menubar', 'menubar-device']))
         try:
             return gui.iactions[name]
         except:
@@ -77,6 +80,12 @@ class BaseModel(QAbstractListModel):
             ans.append(n)
         return ans
 
+    def has_action(self, name):
+        for a in self._data:
+            if a.name == name:
+                return True
+        return False
+
 
 class AllModel(BaseModel):
 
@@ -89,7 +98,7 @@ class AllModel(BaseModel):
         self._data = self.get_all_actions(current)
 
     def get_all_actions(self, current):
-        all = list(self.gui.iactions.keys()) + ['Donate']
+        all = list(self.gui.iactions.keys()) + ['Donate', 'Location Manager']
         all = [x for x in all if x not in current] + [None]
         all = [self.name_to_action(x, self.gui) for x in all]
         all = [x for x in all if self.key not in x.dont_add_to]
@@ -208,12 +217,14 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
 
     LOCATIONS = [
             ('toolbar', _('The main toolbar')),
-            ('toolbar-child', _('The optional second toolbar')),
             ('toolbar-device', _('The main toolbar when a device is connected')),
+            ('toolbar-child', _('The optional second toolbar')),
+            ('menubar', _('The menubar')),
+            ('menubar-device', _('The menubar when a device is connected')),
             ('context-menu', _('The context menu for the books in the '
                 'calibre library')),
             ('context-menu-device', _('The context menu for the books on '
-                'the device'))
+                'the device')),
             ]
 
     def genesis(self, gui):
@@ -284,6 +295,18 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
                 self.changed_signal.emit()
 
     def commit(self):
+        # Ensure preferences are showing in either the toolbar or
+        # the menubar.
+        pref_in_toolbar = self.models['toolbar'][1].has_action('Preferences')
+        pref_in_menubar = self.models['menubar'][1].has_action('Preferences')
+        lm_in_toolbar = self.models['toolbar-device'][1].has_action('Location Manager')
+        lm_in_menubar = self.models['menubar-device'][1].has_action('Location Manager')
+        if not pref_in_toolbar and not pref_in_menubar:
+            self.models['menubar'][1].add(['Preferences'])
+        if not lm_in_toolbar and not lm_in_menubar:
+            self.models['menubar-device'][1].add(['Location Manager'])
+
+        # Save data.
         for am, cm in self.models.values():
             cm.commit()
         return False

src/calibre/gui2/ui.py

@@ -153,6 +153,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
 
         for ac in self.iactions.values():
             ac.do_genesis()
+        self.donate_action = QAction(QIcon(I('donate.png')), _('&Donate to support calibre'), self)
         MainWindowMixin.__init__(self, db)
 
         # Jobs Button {{{
@@ -186,8 +187,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
         self.system_tray_menu = QMenu(self)
         self.restore_action = self.system_tray_menu.addAction(
                 QIcon(I('page.png')), _('&Restore'))
-        self.donate_action  = self.system_tray_menu.addAction(
-                QIcon(I('donate.png')), _('&Donate to support calibre'))
+        self.system_tray_menu.addAction(self.donate_action)
         self.donate_button.setDefaultAction(self.donate_action)
         self.donate_button.setStatusTip(self.donate_button.toolTip())
         self.eject_action = self.system_tray_menu.addAction(

src/calibre/manual/creating_plugins.rst

@@ -197,7 +197,7 @@ Once you've located the zip file of your plugin you can then directly update it
 
     zip -R /path/to/plugin/zip/file.zip *
 
-This will automatically update all changed files. It relies on the freely available zip command line tool.
+This will update all changed files. It relies on the freely available zip command line tool. Note that you should quit calibre before running this command.
 
 More plugin examples
 ----------------------

src/calibre/utils/config.py

@@ -785,6 +785,9 @@ def write_tweaks(raw):
 
 tweaks = read_tweaks()
 test_eight_code = tweaks.get('test_eight_code', False)
+# test_eight_code notes
+# Change documentation of bool columns are tristate to indicate that it can be
+# overridden on a per library basis via Preferences->Custom columns
 
 def migrate():
     if hasattr(os, 'geteuid') and os.geteuid() == 0: