Sync to trunk.

2025-07-09 03:04:10 -04:00 · 2012-07-15 09:48:50 -04:00 · 2012-07-15 09:48:50 -04:00 · d24d8b8737
commit d24d8b8737
parent 8bf3ede5c1 ea2b35c531
147 changed files with 37794 additions and 34272 deletions
--- a/Changelog.yaml
+++ b/Changelog.yaml
@ -19,6 +19,74 @@
 #   new recipes:
 #     - title: 

+- version: 0.8.60
+  date: 2012-07-13
+
+  new features:
+    - title: "When searching, allow use of un-accented characters to match accented characters in all fields and all languages (not just authors and English as before)"
+      description: "The rules for matching un-accented characters are done in a language dependent way. So if your calibre interface language is set to English, n will match both n and ñ, but if it is set to Spanish, it will match only n, as in Spanish ñ is a separate alphabet in Spanish. This makes searching a little slower, so if you have a very large library you can turn it off via Preferences->Searching."
+      type: major
+      
+    - title: "Content server: Show a best guess for the IP address the content server is currently listening at in the connect/share menu."
+      tickets: [1024128]
+
+    - title: "E-book viewer: Add an option to show a clock in full screen mode."
+      tickets: [1022086]
+
+    - title: "Drivers for Paquito Imaginarium and a few Android phones"
+      tickets: [1024021,1023613,1023461,1022401]
+
+    - title: "HTMLZ Output: Add option to use the book title as the filename for the html file inside the archive"
+
+    - title: "Make the list of displayed fields in the book details panel a per library setting"
+
+    - title: "Have autocomplete on authors/series/tags/etc. ignore accented characters when finding matches (similar to the changes to search above)"
+
+    - title: "Support for retina displays in OS X (I hope)"
+      tickets: [1022191]
+
+    - title: "Remove the dependency on the zip command line tool when developing plugins"
+
+  bug fixes:
+    - title: "Kobo driver: Do not perform write operations on the Kobo database if its version is newer than the latest version the driver supports, for safety"
+
+    - title: "KF8 Input: Ignore encoding declarations inside the html markup, as they are sometimes incorrect."
+      tickets: [1022933]
+
+    - title: "Force refresh of cached composite column values when values in the cache are changed"
+
+    - title: "Fix a regression that broke calibre --shutdown-running-calibre on windows."
+      tickets: [1022504]
+
+    - title: "Possible workaround for Qt 4.8.2 open file dialog failing on some linux distros."
+      tickets: [1022019]
+
+    - title: "Catalogs: Fix some epubcheck errors when generating catalogs in EPUB format"
+
+    - title: "Linux installer: When calling the xdg utilities use system libraries rather than the libraries bundled with calibre"
+
+    - title: "Fix numeric sort for composite custom columns that use custom separators"
+      tickets: [1021814]
+
+    - title: "Tag browser: When grouping by first letter, handle languages that have 'letters' made of more than one character. This can be turned off via Preferences->Tweaks"
+
+  improved recipes:
+    - Hola magazine
+    - Adventure Gamers
+    - Cosmopolitan UK
+    - Onda Rock
+
+  new recipes:
+    - title: Empire Magazine 
+      author: Dave Asbury
+
+    - title: NZZ Folio 
+      author: Bernd Leinfelder
+
+    - title: Warentest 
+      author: asdfdsfksd
+
+
 - version: 0.8.59
  date: 2012-07-06

--- a/manual/creating_plugins.rst
+++ b/manual/creating_plugins.rst
@ -198,7 +198,7 @@ You can insert print statements anywhere in your plugin code, they will be outpu
 You can quickly test changes to your plugin by using the following command
 line::

-    calibre -s; calibre-customize -b /path/to/your/plugin/directory; calibre
+    calibre-debug -s; calibre-customize -b /path/to/your/plugin/directory; calibre

 This will shutdown a running calibre, wait for the shutdown to complete, then update your plugin in |app| and relaunch |app|.

--- a/manual/customize.rst
+++ b/manual/customize.rst
@ -30,6 +30,7 @@ Environment variables
    * ``CALIBRE_OVERRIDE_DATABASE_PATH`` - allows you to specify the full path to metadata.db. Using this variable you can have metadata.db be in a location other than the library folder. Useful if your library folder is on a networked drive that does not support file locking.
    * ``CALIBRE_DEVELOP_FROM`` - Used to run from a calibre development environment. See :ref:`develop`.
    * ``CALIBRE_OVERRIDE_LANG`` - Used to force the language used by the interface (ISO 639 language code)
+    * ``CALIBRE_NO_NATIVE_FILEDIALOGS`` - Causes calibre to not use native file dialogs for selecting files/directories.
    * ``SYSFS_PATH`` - Use if sysfs is mounted somewhere other than /sys
    * ``http_proxy`` - Used on linux to specify an HTTP proxy

--- a/recipes/adventuregamers.recipe
+++ b/recipes/adventuregamers.recipe
@ -1,5 +1,5 @@
 __license__   = 'GPL v3'
-__copyright__ = '2009-2010, Darko Miletic <darko.miletic at gmail.com>'
+__copyright__ = '2009-2012, Darko Miletic <darko.miletic at gmail.com>'
 '''
 www.adventuregamers.com
 '''
@ -14,24 +14,24 @@ class AdventureGamers(BasicNewsRecipe):
    publisher             = 'Adventure Gamers'
    category              = 'news, games, adventure, technology'
    oldest_article        = 10
-    delay                 = 10
+    #delay                 = 10
    max_articles_per_feed = 100
    no_stylesheets        = True
-    encoding              = 'cp1252'
+    encoding              = 'utf8'
    remove_javascript     = True
    use_embedded_content  = False
    INDEX                 = u'http://www.adventuregamers.com'
    extra_css             = """
                                .pageheader_type{font-size: x-large; font-weight: bold; color: #828D74}
-                                .pageheader_title{font-size: xx-large; color: #394128}
+                                .pageheader_title,.page_title{font-size: xx-large; color: #394128}
                                .pageheader_byline{font-size: small; font-weight: bold; color: #394128}
                                .score_bg {display: inline; width: 100%; margin-bottom: 2em}
                                .score_column_1{ padding-left: 10px; font-size: small; width: 50%}
                                .score_column_2{ padding-left: 10px; font-size: small; width: 50%}
                                .score_column_3{ padding-left: 10px; font-size: small; width: 50%}
-                                .score_header{font-size: large; color: #50544A}
-                                .bodytext{display: block}
-                                body{font-family: Helvetica,Arial,sans-serif}
+                                .score_header{font-size: large; color: #50544A}                                
+                                img{margin-bottom: 1em;}
+                                body{font-family: 'Open Sans',Helvetica,Arial,sans-serif}                                
                            """

    conversion_options = {
@ -41,35 +41,38 @@ class AdventureGamers(BasicNewsRecipe):
                        , 'language'  : language
                        }

-    keep_only_tags = [
-                       dict(name='div', attrs={'class':'content_middle'})
-                     ]
-
+    keep_only_tags = [dict(name='div', attrs={'class':'cleft_inn'})]
    remove_tags = [
-                     dict(name=['object','link','embed','form'])
-                    ,dict(name='div', attrs={'class':['related-stories','article_leadout','prev','next','both']})
+                     dict(name=['object','link','embed','form','iframe','meta'])
+                    ,dict(name='a', attrs={'href':'http://www.adventuregamers.com/about/scoring'})
+                    ,dict(name='a', attrs={'href':'http://www.adventuregamers.com/about/policies'})
                  ]
-
-    remove_tags_after = [dict(name='div', attrs={'class':'toolbar_fat'})]
+    remove_tags_after = [dict(name='div', attrs={'class':'bodytext'})]
    remove_attributes = ['width','height']

-    feeds = [(u'Articles', u'http://feeds2.feedburner.com/AdventureGamers')]
+    feeds = [(u'Articles', u'http://www.adventuregamers.com/rss/')]

    def get_article_url(self, article):
-        return article.get('guid',  None)
+        url = BasicNewsRecipe.get_article_url(self, article)
+        if '/videos/' in url or '/hypeometer/' in url:
+           return None
+        return url

    def append_page(self, soup, appendtag, position):
-        pager = soup.find('div',attrs={'class':'toolbar_fat_next'})
+        pager = soup.find('div', attrs={'class':'pagination_big'})
        if pager:
-           nexturl = self.INDEX + pager.a['href']
-           soup2 = self.index_to_soup(nexturl)
-           texttag = soup2.find('div', attrs={'class':'bodytext'})
-           for it in texttag.findAll(style=True):
-               del it['style']
-           newpos = len(texttag.contents)
-           self.append_page(soup2,texttag,newpos)
-           texttag.extract()
-           appendtag.insert(position,texttag)
+           nextpage = soup.find('a', attrs={'class':'next-page'})
+           if nextpage:
+               nexturl = nextpage['href']
+               soup2 = self.index_to_soup(nexturl)
+               texttag = soup2.find('div', attrs={'class':'bodytext'})
+               for it in texttag.findAll(style=True):
+                   del it['style']
+               newpos = len(texttag.contents)
+               self.append_page(soup2,texttag,newpos)
+               texttag.extract()
+               pager.extract()
+               appendtag.insert(position,texttag)


    def preprocess_html(self, soup):
@ -78,7 +81,7 @@ class AdventureGamers(BasicNewsRecipe):
        for item in soup.findAll('div', attrs={'class':'floatright'}):
            item.extract()
        self.append_page(soup, soup.body, 3)
-        pager = soup.find('div',attrs={'class':'toolbar_fat'})
+        pager = soup.find('div',attrs={'class':'pagination_big'})
        if pager:
           pager.extract()
        return self.adeify_images(soup)
--- a/recipes/aprospect.recipe
+++ b/recipes/aprospect.recipe
@ -12,7 +12,11 @@ class AmericanProspect(BasicNewsRecipe):
    no_stylesheets        = True
    remove_javascript     = True

-    keep_only_tags = [dict(name='div', attrs={'class':'pad_10L10R'})]
-    remove_tags    = [dict(name='form'), dict(name='div', attrs={'class':['bkt_caption','sharebox noprint','badgebox']})]
+    #keep_only_tags = [dict(name='div', attrs={'class':'pad_10L10R'})]
+    #remove_tags    = [dict(name='form'), dict(name='div', attrs={'class':['bkt_caption','sharebox noprint','badgebox']})]
+    use_embedded_content = False

+    no_stylesheets = True
+    auto_cleanup = True
    feeds       = [(u'Articles', u'feed://www.prospect.org/articles_rss.jsp')]
+ 
--- a/recipes/faznet.recipe
+++ b/recipes/faznet.recipe
@ -33,6 +33,7 @@ class FazNet(BasicNewsRecipe):
              ('Technik & Motor', 'http://www.faz.net/aktuell/technik-motor/?rssview=1'),
              ('Wissen', 'http://www.faz.net/aktuell/wissen/?rssview=1'),
              ('Reise', 'http://www.faz.net/aktuell/reise/?rssview=1'),
-              ('Beruf & Chance', 'http://www.faz.net/aktuell/beruf-chance/?rssview=1')
+              ('Beruf & Chance', 'http://www.faz.net/aktuell/beruf-chance/?rssview=1'),
+              ('Rhein-Main', 'http://www.faz.net/aktuell/rhein-main/?rssview=1') # AGe add 2012-07-13
            ]

--- a/recipes/hola.recipe
+++ b/recipes/hola.recipe
@ -1,38 +1,73 @@
 #!/usr/bin/env  python
-__license__   = 'GPL v3'
-__copyright__ = '2010, Brendan Sleight <bms.calibre at barwap.com>'
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+__license__     = 'GPL v3'
+__copyright__   = '30 June 2012, desUBIKado'
+__author__      = 'desUBIKado'
+__description__ = 'Diario de actualidad, moda y belleza'
+__version__     = 'v0.01'
+__date__        = '30, June 2012'
 '''
-hola.com
+http://www.hola.com/
 '''

 from calibre.web.feeds.news import BasicNewsRecipe

-class Hackaday(BasicNewsRecipe):
-    title                 = u'Hola'
-    __author__            = 'bmsleight'
-    description           = 'diario de actualidad, moda y belleza.'
-    oldest_article        = 10
+class hola_es(BasicNewsRecipe):
+    __author__     = 'desUBIKado'
+    description    = 'Diario de actualidad, moda y belleza'
+    title          = u'¡Hola!'
+    publisher      = 'Hola S.L.'
+    category       = 'Spanish celebrities, Entertainment News, Royalty, Daily Variety, Hollywood'
+    language       = 'es'
+    masthead_url   = 'http://imagenes.hola.com/comunes/2008/logo-holacom.gif'
+    timefmt        = '[%a, %d %b, %Y]'
+    oldest_article = 7
+    delay          = 1
+    encoding       = 'utf-8'
    max_articles_per_feed = 100
-    no_stylesheets        = True
-    language              = 'es'
-
    use_embedded_content  = False
-
-    keep_only_tags      = [
-                           dict(name='div', attrs={'id':'cuerpo'})
-                          ]
+    remove_empty_feeds    = True
+    remove_javascript = True
+    no_stylesheets = True

    feeds               = [
-                         (u'Famosos'        , u'http://www.hola.com/famosos/rss.xml'           ),
-                         (u'Realeza'        , u'http://www.hola.com/realeza/rss.xml'           ),
-                         (u'Cine'           , u'http://www.hola.com/cine/rss.xml'              ),
-                         (u'Música'         , u'http://www.hola.com/musica/rss.xml'            ),
-                         (u'Moda y modelos' , u'http://www.hola.com/moda/portada/rss.xml'      ),
-                         (u'Belleza y salud', u'http://www.hola.com/belleza/portada/rss.xml'   ),
-                         (u'Niños'          , u'http://www.hola.com/ninos/rss.xml'             ),
-                         (u'Todas las noticias', u'http://int2.hola.com/app/feeds/rss_hola.php'),
+                            (u'Famosos'        , u'http://www.hola.com/famosos/rss.xml'           )
+                           ,(u'Realeza'        , u'http://www.hola.com/realeza/rss.xml'           )
+                           ,(u'Cine'           , u'http://www.hola.com/cine/rss.xml'              )
+                           ,(u'M\xfasica'      , u'http://www.hola.com/musica/rss.xml'            )
+                           ,(u'Moda y modelos' , u'http://www.hola.com/moda/portada/rss.xml'      )
+                           ,(u'Belleza y salud', u'http://www.hola.com/belleza/portada/rss.xml'   )
+                           ,(u'Ni\xf1os'       , u'http://www.hola.com/ninos/rss.xml'             )
+                          ]
+
+
+
+
+    keep_only_tags     = [dict(name='div', attrs={'id':['cuerpo','com']})]
+
+    remove_tags        = [dict(name='div', attrs={'id':['relacionadas','slide-enlaces-patrocinados','comentarios']}),
+                          dict(name='div', attrs={'class':['slide-enlaces-patricinados-tit','compartir']})
                         ]

+    remove_tags_after  = dict(name='div' , attrs={'id':'comentarios'})
+
+
+    # Recuperamos la portada de papel (la imagen 520 tiene mayor resolucion)
+
+    def get_cover_url(self):
+        index = 'http://www.hola.com/abono/ediciondigital/'
+        soup = self.index_to_soup(index)
+        for image in soup.findAll('img',src=True):
+           if image['src'].endswith('portada-revista-hola-520.jpg'):
+              return 'http://www.hola.com/' + image['src']
+        return None
+
+
    def get_article_url(self, article):
        url = article.get('guid', None)
        return url
+
+    extra_css = '''
+                    h1{font-family:Arial,Helvetica,sans-serif; font-weight:bold;font-size:30px;}
+                    h2{font-family:Arial,Helvetica,sans-serif; font-weight:normal; font-style:italic; font-size:18px;}
+                '''
--- a/recipes/national_geographic_mag.recipe
+++ b/recipes/national_geographic_mag.recipe
@ -8,7 +8,7 @@ class NatGeoMag(BasicNewsRecipe):
    oldest_article         = 31
    max_articles_per_feed  = 50
    category               = 'geography, magazine'
-    language               = 'en_US'
+    language               = 'en'
    publication_type       = 'magazine'
    cover_url              = 'http://www.yourlogoresources.com/wp-content/uploads/2011/09/national-geographic-logo.jpg'
    use_embedded_content   = False
--- a/resources/default_tweaks.py
+++ b/resources/default_tweaks.py
@ -98,15 +98,6 @@ authors_split_regex = r'(?i),?\s+(and|with)\s+'
 #   categories_use_field_for_author_name = 'author_sort'
 categories_use_field_for_author_name = 'author'

-#: Completion sort order: choose when to change from lexicographic to ASCII-like
-# Calibre normally uses locale-dependent lexicographic ordering when showing
-# completion values. This means that the sort order is correct for the user's
-# language. However, this can be slow. Performance is improved by switching to
-# ascii ordering. This tweak controls when that switch happens. Set it to zero
-# to always use ascii ordering. Set it to something larger than zero to switch
-# to ascii ordering for performance reasons.
-completion_change_to_ascii_sorting = 2500
-
 #: Control partitioning of Tag Browser
 # When partitioning the tags browser, the format of the subcategory label is
 # controlled by a template: categories_collapsed_name_template if sorting by
@ -522,6 +513,6 @@ default_tweak_format = None
 # consideration when partitioning by first letter.
 # Examples:
 #    enable_multicharacters_in_tag_browser = True
-#    enable_multicharacters_in_tag_browser = True
+#    enable_multicharacters_in_tag_browser = False
 enable_multicharacters_in_tag_browser = True

--- a/setup/installer/linux/freeze2.py
+++ b/setup/installer/linux/freeze2.py
@ -12,7 +12,7 @@ import sys, os, shutil, platform, subprocess, stat, py_compile, glob, \
 from setup import Command, modules, basenames, functions, __version__, \
    __appname__

-SITE_PACKAGES = ['IPython', 'PIL', 'dateutil', 'dns', 'PyQt4', 'mechanize',
+SITE_PACKAGES = ['PIL', 'dateutil', 'dns', 'PyQt4', 'mechanize',
        'sip.so', 'BeautifulSoup.py', 'cssutils', 'encutils', 'lxml',
        'sipconfig.py', 'xdg', 'dbus', '_dbus_bindings.so', 'dbus_bindings.py',
        '_dbus_glib_bindings.so']
@ -23,6 +23,7 @@ MAGICK_PREFIX = '/usr'
 binary_includes = [
                '/usr/bin/pdftohtml',
                '/usr/bin/pdfinfo',
+                '/usr/lib/libglib-2.0.so.0',
                '/usr/bin/pdftoppm',
                '/usr/lib/libwmflite-0.2.so.7',
                '/usr/lib/liblcms.so.1',
--- a/setup/installer/osx/app/main.py
+++ b/setup/installer/osx/app/main.py
@ -364,6 +364,7 @@ class Py2App(object):
                'application. Visit http://calibre-ebook.com for details.'),
                CFBundleIconFile='library.icns',
                LSMultipleInstancesProhibited=True,
+                NSHighResolutionCapable=True,
                LSEnvironment=env
        )
        plistlib.writePlist(pl, join(self.contents_dir, 'Info.plist'))
@ -385,7 +386,7 @@ class Py2App(object):
    @flush
    def add_poppler(self):
        info('\nAdding poppler')
-        for x in ('libpoppler.25.dylib',):
+        for x in ('libpoppler.26.dylib',):
            self.install_dylib(os.path.join(SW, 'lib', x))
        for x in ('pdftohtml', 'pdftoppm', 'pdfinfo'):
            self.install_dylib(os.path.join(SW, 'bin', x), False)
@ -482,10 +483,6 @@ class Py2App(object):
                    shutil.rmtree(tdir)
        shutil.rmtree(os.path.join(self.site_packages, 'calibre', 'plugins'))
        self.remove_bytecode(join(self.resources_dir, 'Python', 'site-packages'))
-        # Create dummy IPython README_STARTUP
-        with open(join(self.site_packages,
-            'IPython/config/profile/README_STARTUP'), 'wb') as f:
-            f.write('\n')

    @flush
    def add_modules_from_dir(self, src):
--- a/setup/installer/windows/freeze.py
+++ b/setup/installer/windows/freeze.py
@ -23,6 +23,7 @@ SW               = r'C:\cygwin\home\kovid\sw'
 IMAGEMAGICK      = os.path.join(SW, 'build', 'ImageMagick-6.7.6',
        'VisualMagick', 'bin')
 CRT = r'C:\Microsoft.VC90.CRT'
+SIGNTOOL = r'C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin\signtool.exe'

 VERSION = re.sub('[a-z]\d+', '', __version__)
 WINVER = VERSION+'.0'
--- a/setup/installer/windows/notes.rst
+++ b/setup/installer/windows/notes.rst
@ -30,7 +30,7 @@ If there are no windows binaries already compiled for the version of python you

 Run the following command to install python dependencies::

-    easy_install --always-unzip -U ipython mechanize pyreadline python-dateutil dnspython cssutils clientform pycrypto
+    easy_install --always-unzip -U mechanize pyreadline python-dateutil dnspython cssutils clientform pycrypto

 Install BeautifulSoup 3.0.x manually into site-packages (3.1.x parses broken HTML very poorly)

@ -146,7 +146,7 @@ Run bash ./runConfigureICU Cygwin/MSVC

 Run make (note that you must have GNU make installed in cygwin)

-Optionally run make test
+Optionally run make check

 Libunrar
 ----------
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (0, 8, 59)
+numeric_version = (0, 8, 60)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"

--- a/src/calibre/db/backend.py
+++ b/src/calibre/db/backend.py
@ -81,6 +81,9 @@ class DBPrefs(dict): # {{{
    def to_raw(self, val):
        return json.dumps(val, indent=2, default=to_json)

+    def has_setting(self, key):
+        return key in self
+
    def __getitem__(self, key):
        try:
            return dict.__getitem__(self, key)
@ -102,6 +105,53 @@ class DBPrefs(dict): # {{{
    def set(self, key, val):
        self.__setitem__(key, val)

+    def get_namespaced(self, namespace, key, default=None):
+        key = u'namespaced:%s:%s'%(namespace, key)
+        try:
+            return dict.__getitem__(self, key)
+        except KeyError:
+            return default
+
+    def set_namespaced(self, namespace, key, val):
+        if u':' in key: raise KeyError('Colons are not allowed in keys')
+        if u':' in namespace: raise KeyError('Colons are not allowed in'
+                ' the namespace')
+        key = u'namespaced:%s:%s'%(namespace, key)
+        self[key] = val
+
+    def write_serialized(self, library_path):
+        try:
+            to_filename = os.path.join(library_path, 'metadata_db_prefs_backup.json')
+            with open(to_filename, "wb") as f:
+                f.write(json.dumps(self, indent=2, default=to_json))
+        except:
+            import traceback
+            traceback.print_exc()
+
+    @classmethod
+    def read_serialized(cls, library_path, recreate_prefs=False):
+        try:
+            from_filename = os.path.join(library_path,
+                    'metadata_db_prefs_backup.json')
+            with open(from_filename, "rb") as f:
+                d = json.load(f, object_hook=from_json)
+                if not recreate_prefs:
+                    return d
+                cls.clear()
+                cls.db.conn.execute('DELETE FROM preferences')
+                for k,v in d.iteritems():
+                    raw = cls.to_raw(v)
+                    cls.db.conn.execute(
+                        'INSERT INTO preferences (key,val) VALUES (?,?)', (k, raw))
+                cls.db.conn.commit()
+                cls.clear()
+                cls.update(d)
+                return d
+        except:
+            import traceback
+            traceback.print_exc()
+            raise
+        return None
 # }}}

 # Extra collators {{{
@ -350,6 +400,23 @@ class DB(object):
        defs['gui_restriction'] = defs['cs_restriction'] = ''
        defs['categories_using_hierarchy'] = []
        defs['column_color_rules'] = []
+        defs['grouped_search_make_user_categories'] = []
+        defs['similar_authors_search_key'] = 'authors'
+        defs['similar_authors_match_kind'] = 'match_any'
+        defs['similar_publisher_search_key'] = 'publisher'
+        defs['similar_publisher_match_kind'] = 'match_any'
+        defs['similar_tags_search_key'] = 'tags'
+        defs['similar_tags_match_kind'] = 'match_all'
+        defs['similar_series_search_key'] = 'series'
+        defs['similar_series_match_kind'] = 'match_any'
+        defs['book_display_fields'] = [
+        ('title', False), ('authors', True), ('formats', True),
+        ('series', True), ('identifiers', True), ('tags', True),
+        ('path', True), ('publisher', False), ('rating', False),
+        ('author_sort', False), ('sort', False), ('timestamp', False),
+        ('uuid', False), ('comments', True), ('id', False), ('pubdate', False),
+        ('last_modified', False), ('size', False), ('languages', False),
+        ]

        # Migrate the bool tristate tweak
        defs['bools_are_tristate'] = \
--- a/src/calibre/debug.py
+++ b/src/calibre/debug.py
@ -60,6 +60,11 @@ Run an embedded python interpreter.
            'editing tools, and then rebuilds the file from the edited HTML. '
            'Makes no additional changes to the HTML, unlike a full calibre '
            'conversion).')
+    parser.add_option('-s', '--shutdown-running-calibre', default=False,
+            action='store_true',
+            help=_('Cause a running calibre instance, if any, to be'
+                ' shutdown. Note that if there are running jobs, they '
+                'will be silently aborted, so use with care.'))

    parser.add_option('--test-build', help='Test binary modules in build',
            action='store_true', default=False)
@ -258,6 +263,9 @@ def main(args=sys.argv):
    elif opts.test_build:
        from calibre.test_build import test
        test()
+    elif opts.shutdown_running_calibre:
+        from calibre.gui2.main import shutdown_other
+        shutdown_other()
    else:
        from calibre import ipython
        ipython()
--- a/src/calibre/devices/android/driver.py
+++ b/src/calibre/devices/android/driver.py
@ -41,6 +41,7 @@ class ANDROID(USBMS):
                       0xca9  : HTC_BCDS,
                       0xcac  : HTC_BCDS,
                       0xccf  : HTC_BCDS,
+                       0xce5  : HTC_BCDS,
                       0x2910 : HTC_BCDS,
                       0xff9  : HTC_BCDS + [0x9999],
            },
@ -59,6 +60,7 @@ class ANDROID(USBMS):
                       0x42d6 : [0x216],
                       0x42d7 : [0x216],
                       0x42f7 : [0x216],
+                       0x4365 : [0x216],
                     },
            # Freescale
            0x15a2 : {
@ -192,7 +194,7 @@ class ANDROID(USBMS):
            'GENERIC-', 'ZTE', 'MID', 'QUALCOMM', 'PANDIGIT', 'HYSTON',
            'VIZIO', 'GOOGLE', 'FREESCAL', 'KOBO_INC', 'LENOVO', 'ROCKCHIP',
            'POCKET', 'ONDA_MID', 'ZENITHIN', 'INGENIC', 'PMID701C', 'PD',
-            'PMP5097C']
+            'PMP5097C', 'MASS', 'NOVO7']
    WINDOWS_MAIN_MEM = ['ANDROID_PHONE', 'A855', 'A853', 'INC.NEXUS_ONE',
            '__UMS_COMPOSITE', '_MB200', 'MASS_STORAGE', '_-_CARD', 'SGH-I897',
            'GT-I9000', 'FILE-STOR_GADGET', 'SGH-T959_CARD', 'SGH-T959', 'SAMSUNG_ANDROID',
@ -209,7 +211,8 @@ class ANDROID(USBMS):
            'XT910', 'BOOK_A10', 'USB_2.0_DRIVER', 'I9100T', 'P999DW',
            'KTABLET_PC', 'INGENIC', 'GT-I9001_CARD', 'USB_2.0_DRIVER',
            'GT-S5830L_CARD', 'UNIVERSE', 'XT875', 'PRO', '.KOBO_VOX',
-            'THINKPAD_TABLET', 'SGH-T989']
+            'THINKPAD_TABLET', 'SGH-T989', 'YP-G70', 'STORAGE_DEVICE',
+            'ADVANCED']
    WINDOWS_CARD_A_MEM = ['ANDROID_PHONE', 'GT-I9000_CARD', 'SGH-I897',
            'FILE-STOR_GADGET', 'SGH-T959_CARD', 'SGH-T959', 'SAMSUNG_ANDROID', 'GT-P1000_CARD',
            'A70S', 'A101IT', '7', 'INCREDIBLE', 'A7EB', 'SGH-T849_CARD',
--- a/src/calibre/devices/kindle/driver.py
+++ b/src/calibre/devices/kindle/driver.py
@ -413,7 +413,8 @@ class KINDLE2(KINDLE):
        if not opts.extra_customization[self.OPT_APNX]:
            return

-        if os.path.splitext(filepath.lower())[1] not in ('.azw', '.mobi', '.prc'):
+        if os.path.splitext(filepath.lower())[1] not in ('.azw', '.mobi',
+                '.prc', '.azw3'):
            return

        # Create the sidecar folder if necessary
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@ -423,7 +423,7 @@ class KOBO(USBMS):

    def delete_books(self, paths, end_session=True):
        if self.modify_database_check("delete_books") == False:
-            return 
+            return

        for i, path in enumerate(paths):
            self.report_progress((i+1) / float(len(paths)), _('Removing books from device...'))
@ -462,7 +462,7 @@ class KOBO(USBMS):

    def remove_books_from_metadata(self, paths, booklists):
        if self.modify_datbase_check("remove_books_from_metatata") == False:
-            return 
+            return

        for i, path in enumerate(paths):
            self.report_progress((i+1) / float(len(paths)), _('Removing books from device metadata listing...'))
@ -598,7 +598,7 @@ class KOBO(USBMS):
        # Checks to see whether the database version is supported
        # and whether the user has chosen to support the firmware version
        if self.dbversion > self.supported_dbversion:
-            # Unsupported database 
+            # Unsupported database
            opts = self.settings()
            if not opts.extra_customization[self.OPT_SUPPORT_NEWER_FIRMWARE]:
                debug_print('The database has been upgraded past supported version')
@ -606,11 +606,11 @@ class KOBO(USBMS):
                self.report_progress(1.0, _('Removing books from device...'))
                from calibre.devices.errors import UserFeedback
                raise UserFeedback(_("Kobo database version unsupported - See details"),
-                    _('Your Kobo is running an updated firmware/database version '
+                    _('Your Kobo is running an updated firmware/database version. '
                     'As Calibre has not been updated, database editing is disabled.  '
                     'You can enable support for your Kobo in plugin preferences.  '
                     'Doing so may require you to perform a factory reset.  '
-                     'before selecting the "Attempt to support newer firmware" option '
+                     'Before selecting the "Attempt to support newer firmware" option '
                     'you should be familiar with restoring your Kobo to factory defaults.'),
                     UserFeedback.WARN)

@ -741,7 +741,7 @@ class KOBO(USBMS):

    def update_device_database_collections(self, booklists, collections_attributes, oncard):
        if self.modify_database_check("update_device_database_collections") == False:
-            return 
+            return

        # Only process categories in this list
        supportedcategories = {
--- a/src/calibre/devices/teclast/driver.py
+++ b/src/calibre/devices/teclast/driver.py
@ -19,9 +19,9 @@ class TECLAST_K3(USBMS):
    PRODUCT_ID  = [0x3203]
    BCD         = [0x0000, 0x0100]

-    VENDOR_NAME      = ['TECLAST', 'IMAGIN']
+    VENDOR_NAME      = ['TECLAST', 'IMAGIN', 'RK28XX']
    WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = ['DIGITAL_PLAYER', 'TL-K5',
-            'EREADER']
+            'EREADER', 'USB-MSC']

    MAIN_MEMORY_VOLUME_LABEL  = 'K3 Main Memory'
    STORAGE_CARD_VOLUME_LABEL = 'K3 Storage Card'
--- a/src/calibre/devices/usbms/device.py
+++ b/src/calibre/devices/usbms/device.py
@ -127,12 +127,13 @@ class Device(DeviceConfig, DevicePlugin):
        if not prefix:
            return 0, 0
        prefix = prefix[:-1]
-        import win32file
+        import win32file, winerror
        try:
            sectors_per_cluster, bytes_per_sector, free_clusters, total_clusters = \
                win32file.GetDiskFreeSpace(prefix)
        except Exception as err:
-            if getattr(err, 'args', [None])[0] == 21: # Disk not ready
+            if getattr(err, 'args', [None])[0] == winerror.ERROR_NOT_READY:
+                # Disk not ready
                time.sleep(3)
                sectors_per_cluster, bytes_per_sector, free_clusters, total_clusters = \
                    win32file.GetDiskFreeSpace(prefix)
--- a/src/calibre/ebooks/chardet.py
+++ b/src/calibre/ebooks/chardet.py
@ -10,10 +10,15 @@ __docformat__ = 'restructuredtext en'
 import re, codecs

 ENCODING_PATS = [
+                # XML declaration
                 re.compile(r'<\?[^<>]+encoding\s*=\s*[\'"](.*?)[\'"][^<>]*>',
                            re.IGNORECASE),
+                 # HTML 4 Pragma directive
                 re.compile(r'''<meta\s+?[^<>]*?content\s*=\s*['"][^'"]*?charset=([-_a-z0-9]+)[^'"]*?['"][^<>]*>''',
                            re.IGNORECASE),
+                 # HTML 5 charset
+                 re.compile(r'''<meta\s+charset=['"]([-_a-z0-9]+)['"][^<>]*>''',
+                     re.IGNORECASE),
                 ]
 ENTITY_PATTERN = re.compile(r'&(\S+?);')

--- a/src/calibre/ebooks/conversion/plugins/htmlz_output.py
+++ b/src/calibre/ebooks/conversion/plugins/htmlz_output.py
@ -37,6 +37,11 @@ class HTMLZOutput(OutputFormatPlugin):
                   'external: Use an external CSS file that is linked in the document.\n'
                   'inline: Place the CSS in the head section of the document.'
            )),
+        OptionRecommendation(name='htmlz_title_filename',
+            recommended_value=False, level=OptionRecommendation.LOW,
+            help=_('If set this option causes the file name of the html file'
+                ' inside the htmlz archive to be based on the book title.')
+            ),
    ])

    def convert(self, oeb_book, output_path, input_plugin, opts, log):
@ -44,6 +49,7 @@ class HTMLZOutput(OutputFormatPlugin):
        from calibre.ebooks.oeb.base import OEB_IMAGES, SVG_MIME
        from calibre.ebooks.metadata.opf2 import OPF, metadata_to_opf
        from calibre.utils.zipfile import ZipFile
+        from calibre.utils.filenames import ascii_filename

        # HTML
        if opts.htmlz_css_type == 'inline':
@ -59,7 +65,10 @@ class HTMLZOutput(OutputFormatPlugin):
            htmlizer = OEB2HTMLizer(log)
            html = htmlizer.oeb2html(oeb_book, opts)

-            with open(os.path.join(tdir, u'index.html'), 'wb') as tf:
+            fname = u'index'
+            if opts.htmlz_title_filename:
+                fname = ascii_filename(unicode(oeb_book.metadata.title[0]))
+            with open(os.path.join(tdir, fname+u'.html'), 'wb') as tf:
                tf.write(html)

            # CSS
--- a/src/calibre/ebooks/mobi/debug/headers.py
+++ b/src/calibre/ebooks/mobi/debug/headers.py
@ -163,6 +163,7 @@ class EXTHRecord(object):
                501 : 'cdetype', # 4 chars (PDOC or EBOK)
                502 : 'lastupdatetime',
                503 : 'updatedtitle',
+                524 : 'language',
        }.get(self.type, repr(self.type))

        if (self.name in {'coveroffset', 'thumboffset', 'hasfakecover',
--- a/src/calibre/ebooks/mobi/reader/headers.py
+++ b/src/calibre/ebooks/mobi/reader/headers.py
@ -13,6 +13,7 @@ from calibre.utils.date import parse_date
 from calibre.ebooks.mobi import MobiError
 from calibre.ebooks.metadata import MetaInformation, check_isbn
 from calibre.ebooks.mobi.langcodes import main_language, sub_language, mobi2iana
+from calibre.utils.localization import canonicalize_lang

 NULL_INDEX = 0xffffffff

@ -68,6 +69,14 @@ class EXTHHeader(object): # {{{
                    title = content.decode(codec)
                except:
                    pass
+            elif idx == 524: # Lang code
+                try:
+                    lang = content.decode(codec)
+                    lang = canonicalize_lang(lang)
+                    if lang:
+                        self.mi.language = lang
+                except:
+                    pass
            #else:
            #    print 'unknown record', idx, repr(content)
        if title:
@ -201,10 +210,11 @@ class BookHeader(object):
                    self.exth = EXTHHeader(raw[16 + self.length:], self.codec,
                            self.title)
                    self.exth.mi.uid = self.unique_id
-                    try:
-                        self.exth.mi.language = mobi2iana(langid, sublangid)
-                    except:
-                        self.log.exception('Unknown language code')
+                    if self.exth.mi.is_null('language'):
+                        try:
+                            self.exth.mi.language = mobi2iana(langid, sublangid)
+                        except:
+                            self.log.exception('Unknown language code')
                except:
                    self.log.exception('Invalid EXTH header')
                    self.exth_flag = 0
--- a/src/calibre/ebooks/mobi/reader/markup.py
+++ b/src/calibre/ebooks/mobi/reader/markup.py
@ -9,6 +9,8 @@ __docformat__ = 'restructuredtext en'

 import re, os

+from calibre.ebooks.chardet import strip_encoding_declarations
+
 def update_internal_links(mobi8_reader):
    # need to update all links that are internal which
    # are based on positions within the xhtml files **BEFORE**
@ -324,6 +326,8 @@ def expand_mobi8_markup(mobi8_reader, resource_map, log):
    for i, part in enumerate(parts):
        pi = mobi8_reader.partinfo[i]
        with open(os.path.join(pi.type, pi.filename), 'wb') as f:
+            part = strip_encoding_declarations(part)
+            part = part.replace('<head>', '<head><meta charset="UTF-8"/>', 1)
            f.write(part.encode('utf-8'))
            spine.append(f.name)

--- a/src/calibre/ebooks/mobi/writer2/main.py
+++ b/src/calibre/ebooks/mobi/writer2/main.py
@ -297,10 +297,13 @@ class MobiWriter(object):

        # 0x70 - 0x73 : EXTH flags
        # Bit 6 (0b1000000) being set indicates the presence of an EXTH header
+        # Bit 12 being set indicates the presence of embedded fonts
        # The purpose of the other bits is unknown
        exth_flags = 0b1010000
        if self.is_periodical:
            exth_flags |= 0b1000
+        if self.resources.has_fonts:
+            exth_flags |= 0b1000000000000
        record0.write(pack(b'>I', exth_flags))

        # 0x74 - 0x93 : Unknown
@ -406,7 +409,10 @@ class MobiWriter(object):
        # Now change the header fields that need to be different in the MOBI 6
        # header
        header_fields['first_resource_record'] = first_image_record
-        header_fields['exth_flags'] = 0b100001010000 # Kinglegen uses this
+        ef = 0b100001010000 # Kinglegen uses this
+        if self.resources.has_fonts:
+            ef |= 0b1000000000000
+        header_fields['exth_flags'] = ef
        header_fields['fdst_record'] = pack(b'>HH', 1, last_content_record)
        header_fields['fdst_count'] = 1 # Why not 0? Kindlegen uses 1
        header_fields['flis_record'] = flis_number
--- a/src/calibre/ebooks/mobi/writer2/resources.py
+++ b/src/calibre/ebooks/mobi/writer2/resources.py
@ -32,6 +32,7 @@ class Resources(object):
        self.used_image_indices = set()
        self.image_indices = set()
        self.cover_offset = self.thumbnail_offset = None
+        self.has_fonts = False

        self.add_resources(add_fonts)

@ -109,6 +110,7 @@ class Resources(object):
                        'ttf', 'otf'} and isinstance(item.data, bytes):
                    self.records.append(write_font_record(item.data))
                    self.item_map[item.href] = len(self.records)
+                    self.has_fonts = True

    def add_extra_images(self):
        '''
--- a/src/calibre/ebooks/mobi/writer8/exth.py
+++ b/src/calibre/ebooks/mobi/writer8/exth.py
@ -12,6 +12,7 @@ from struct import pack
 from io import BytesIO

 from calibre.ebooks.mobi.utils import utf8_text
+from calibre.utils.localization import lang_as_iso639_1

 EXTH_CODES = {
    'creator': 100,
@ -35,6 +36,7 @@ EXTH_CODES = {
    'hasfakecover': 203,
    'lastupdatetime': 502,
    'title': 503,
+    'language': 524,
 }

 COLLAPSE_RE = re.compile(r'[ \t\r\n\v]+')
@ -57,6 +59,16 @@ def build_exth(metadata, prefer_author_sort=False, is_periodical=False,
            else:
                creators = [unicode(c) for c in items]
            items = creators
+        elif term == 'rights':
+            try:
+                rights = utf8_text(unicode(metadata.rights[0]))
+            except:
+                rights = b'Unknown'
+            exth.write(pack(b'>II', EXTH_CODES['rights'], len(rights) + 8))
+            exth.write(rights)
+            nrecs += 1
+            continue
+
        for item in items:
            data = unicode(item)
            if term != 'description':
@ -68,18 +80,14 @@ def build_exth(metadata, prefer_author_sort=False, is_periodical=False,
                    pass
                else:
                    continue
+            if term == 'language':
+                d2 = lang_as_iso639_1(data)
+                if d2:
+                    data = d2
            data = utf8_text(data)
            exth.write(pack(b'>II', code, len(data) + 8))
            exth.write(data)
            nrecs += 1
-        if term == 'rights' :
-            try:
-                rights = utf8_text(unicode(metadata.rights[0]))
-            except:
-                rights = b'Unknown'
-            exth.write(pack(b'>II', EXTH_CODES['rights'], len(rights) + 8))
-            exth.write(rights)
-            nrecs += 1

    # Write UUID as ASIN
    uuid = None
@ -132,7 +140,7 @@ def build_exth(metadata, prefer_author_sort=False, is_periodical=False,
        nrecs += 1

    if be_kindlegen2:
-        vals = {204:201, 205:2, 206:2, 207:35621}
+        vals = {204:201, 205:2, 206:5, 207:0}
    elif is_periodical:
        # Pretend to be amazon's super secret periodical generator
        vals = {204:201, 205:2, 206:0, 207:101}
--- a/src/calibre/ebooks/mobi/writer8/mobi.py
+++ b/src/calibre/ebooks/mobi/writer8/mobi.py
@ -277,6 +277,8 @@ class KF8Book(object):
        self.exth_flags = 0b1010000
        if writer.opts.mobi_periodical:
            self.exth_flags |= 0b1000
+        if resources.has_fonts:
+            self.exth_flags |= 0b1000000000000

        self.opts = writer.opts
        self.start_offset = writer.start_offset
--- a/src/calibre/ebooks/pdf/writer.py
+++ b/src/calibre/ebooks/pdf/writer.py
@ -223,7 +223,8 @@ class PDFWriter(QObject): # {{{
        if self.cover_data is None:
            return
        item_path = os.path.join(self.tmp_path, 'cover.pdf')
-        printer = get_pdf_printer(self.opts, output_file_name=item_path)
+        printer = get_pdf_printer(self.opts, output_file_name=item_path,
+                for_comic=True)
        self.combine_queue.insert(0, item_path)
        p = QPixmap()
        p.loadFromData(self.cover_data)
--- a/src/calibre/gui2/init.py
+++ b/src/calibre/gui2/init.py
@ -89,14 +89,6 @@ gprefs.defaults['tags_browser_partition_method'] = 'first letter'
 gprefs.defaults['tags_browser_collapse_at'] = 100
 gprefs.defaults['tag_browser_dont_collapse'] = []
 gprefs.defaults['edit_metadata_single_layout'] = 'default'
-gprefs.defaults['book_display_fields'] = [
-        ('title', False), ('authors', True), ('formats', True),
-        ('series', True), ('identifiers', True), ('tags', True),
-        ('path', True), ('publisher', False), ('rating', False),
-        ('author_sort', False), ('sort', False), ('timestamp', False),
-        ('uuid', False), ('comments', True), ('id', False), ('pubdate', False),
-        ('last_modified', False), ('size', False), ('languages', False),
-        ]
 gprefs.defaults['default_author_link'] = 'http://en.wikipedia.org/w/index.php?search={author}'
 gprefs.defaults['preserve_date_on_ctl'] = True
 gprefs.defaults['cb_fullscreen'] = False
@ -581,30 +573,39 @@ class FileDialog(QObject):
        if not isinstance(initial_dir, basestring):
            initial_dir = os.path.expanduser(default_dir)
        self.selected_files = []
-        if mode == QFileDialog.AnyFile:
-            f = unicode(QFileDialog.getSaveFileName(parent, title, initial_dir, ftext, ""))
-            if f:
-                self.selected_files.append(f)
-        elif mode == QFileDialog.ExistingFile:
-            f = unicode(QFileDialog.getOpenFileName(parent, title, initial_dir, ftext, ""))
-            if f and os.path.exists(f):
-                self.selected_files.append(f)
-        elif mode == QFileDialog.ExistingFiles:
-            fs = QFileDialog.getOpenFileNames(parent, title, initial_dir, ftext, "")
-            for f in fs:
-                f = unicode(f)
-                if not f: continue
-                if not os.path.exists(f):
-                    # QFileDialog for some reason quotes spaces
-                    # on linux if there is more than one space in a row
-                    f = unquote(f)
+        use_native_dialog = not os.environ.has_key('CALIBRE_NO_NATIVE_FILEDIALOGS')
+        with SanitizeLibraryPath():
+            opts = QFileDialog.Option()
+            if not use_native_dialog:
+                opts |= QFileDialog.DontUseNativeDialog
+            if mode == QFileDialog.AnyFile:
+                f = unicode(QFileDialog.getSaveFileName(parent, title,
+                    initial_dir, ftext, "", opts))
+                if f:
+                    self.selected_files.append(f)
+            elif mode == QFileDialog.ExistingFile:
+                f = unicode(QFileDialog.getOpenFileName(parent, title,
+                    initial_dir, ftext, "", opts))
                if f and os.path.exists(f):
                    self.selected_files.append(f)
-        else:
-            opts = QFileDialog.ShowDirsOnly if mode == QFileDialog.Directory else QFileDialog.Option()
-            f = unicode(QFileDialog.getExistingDirectory(parent, title, initial_dir, opts))
-            if os.path.exists(f):
-                self.selected_files.append(f)
+            elif mode == QFileDialog.ExistingFiles:
+                fs = QFileDialog.getOpenFileNames(parent, title, initial_dir,
+                        ftext, "", opts)
+                for f in fs:
+                    f = unicode(f)
+                    if not f: continue
+                    if not os.path.exists(f):
+                        # QFileDialog for some reason quotes spaces
+                        # on linux if there is more than one space in a row
+                        f = unquote(f)
+                    if f and os.path.exists(f):
+                        self.selected_files.append(f)
+            else:
+                if mode == QFileDialog.Directory:
+                    opts |= QFileDialog.ShowDirsOnly
+                f = unicode(QFileDialog.getExistingDirectory(parent, title, initial_dir, opts))
+                if os.path.exists(f):
+                    self.selected_files.append(f)
        if self.selected_files:
            self.selected_files = [unicode(q) for q in self.selected_files]
            saved_loc = self.selected_files[0]
@ -857,16 +858,26 @@ class Application(QApplication):

 _store_app = None

+class SanitizeLibraryPath(object):
+    '''Remove the bundled calibre libraries from LD_LIBRARY_PATH on linux. This
+    is needed to prevent library conflicts when launching external utilities.'''
+
+    def __enter__(self):
+        self.orig = os.environ.get('LD_LIBRARY_PATH', '')
+        self.changed = False
+        paths = [x for x in self.orig.split(os.pathsep) if x]
+        if isfrozen and islinux and paths:
+            npaths = [x for x in paths if x != sys.frozen_path+'/lib']
+            os.environ['LD_LIBRARY_PATH'] = os.pathsep.join(npaths)
+            self.changed = True
+
+    def __exit__(self, *args):
+        if self.changed:
+            os.environ['LD_LIBRARY_PATH'] = self.orig
+
 def open_url(qurl):
-    paths = os.environ.get('LD_LIBRARY_PATH',
-                '').split(os.pathsep)
-    paths = [x for x in paths if x]
-    if isfrozen and islinux and paths:
-        npaths = [x for x in paths if x != sys.frozen_path+'/lib']
-        os.environ['LD_LIBRARY_PATH'] = os.pathsep.join(npaths)
-    QDesktopServices.openUrl(qurl)
-    if isfrozen and islinux and paths:
-        os.environ['LD_LIBRARY_PATH'] = os.pathsep.join(paths)
+    with SanitizeLibraryPath():
+        QDesktopServices.openUrl(qurl)

 def get_current_db():
    '''
--- a/src/calibre/gui2/actions/device.py
+++ b/src/calibre/gui2/actions/device.py
@ -74,9 +74,10 @@ class ShareConnMenu(QMenu): # {{{
                    action=self.toggle_server_action, group=gr)

    def server_state_changed(self, running):
+        from calibre.utils.mdns import get_external_ip
        text = _('Start Content Server')
        if running:
-            text = _('Stop Content Server')
+            text = _('Stop Content Server') + ' [%s]'%get_external_ip()
        self.toggle_server_action.setText(text)

    def build_email_entries(self, sync_menu):
--- a/src/calibre/gui2/book_details.py
+++ b/src/calibre/gui2/book_details.py
@ -84,7 +84,17 @@ def render_html(mi, css, vertical, widget, all_fields=False): # {{{
    return ans

 def get_field_list(fm, use_defaults=False):
-    src = gprefs.defaults if use_defaults else gprefs
+    from calibre.gui2.ui import get_gui
+    db = get_gui().current_db
+    if use_defaults:
+        src = db.prefs.defaults
+    else:
+        old_val = gprefs.get('book_display_fields', None)
+        if old_val is not None and not db.prefs.has_setting(
+                'book_display_fields'):
+            src = gprefs
+        else:
+            src = db.prefs
    fieldlist = list(src['book_display_fields'])
    names = frozenset([x[0] for x in fieldlist])
    for field in fm.displayable_field_keys():
--- a/src/calibre/gui2/complete.py
+++ b/src/calibre/gui2/complete.py
@ -5,14 +5,17 @@ __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'

+'''
+WARNING: The code in this module is deprecated. Use complete2.py instead. This
+code remains here for legacy plugin support.
+'''

 from PyQt4.Qt import (QLineEdit, QAbstractListModel, Qt,
        QApplication, QCompleter)

-from calibre.utils.icu import sort_key, lower
+from calibre.utils.icu import sort_key
 from calibre.gui2 import NONE
 from calibre.gui2.widgets import EnComboBox, LineEditECM
-from calibre.utils.config_base import tweaks

 class CompleteModel(QAbstractListModel):

@ -23,13 +26,12 @@ class CompleteModel(QAbstractListModel):

    def set_items(self, items):
        items = [unicode(x.strip()) for x in items]
-        if len(items) < tweaks['completion_change_to_ascii_sorting']:
-            self.items = sorted(items, key=lambda x: sort_key(x))
+        if len(items) < 2500:
+            self.items = sorted(items, key=sort_key)
            self.sorting = QCompleter.UnsortedModel
        else:
            self.items = sorted(items, key=lambda x:x.lower())
            self.sorting = QCompleter.CaseInsensitivelySortedModel
-        self.lowered_items = [lower(x) for x in self.items]
        self.reset()

    def rowCount(self, *args):
--- a/src/calibre/gui2/complete2.py
+++ b/src/calibre/gui2/complete2.py
@ -0,0 +1,419 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__   = 'GPL v3'
+__copyright__ = '2012, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+import weakref
+
+import sip
+from PyQt4.Qt import (QLineEdit, QAbstractListModel, Qt, pyqtSignal, QObject,
+        QApplication, QListView, QPoint, QModelIndex)
+
+from calibre.utils.icu import sort_key, primary_startswith
+from calibre.gui2 import NONE
+from calibre.gui2.widgets import EnComboBox, LineEditECM
+
+class CompleteModel(QAbstractListModel): # {{{
+
+    def __init__(self, parent=None):
+        QAbstractListModel.__init__(self, parent)
+        self.all_items = self.current_items = ()
+        self.current_prefix = ''
+
+    def set_items(self, items):
+        items = [unicode(x.strip()) for x in items]
+        items = [x for x in items if x]
+        items = tuple(sorted(items, key=sort_key))
+        self.all_items = self.current_items = items
+        self.reset()
+
+    def set_completion_prefix(self, prefix):
+        old_prefix = self.current_prefix
+        self.current_prefix = prefix
+        if prefix == old_prefix:
+            return
+        if not prefix:
+            self.current_items = self.all_items
+            self.reset()
+            return
+        subset = prefix.startswith(old_prefix)
+        universe = self.current_items if subset else self.all_items
+        self.current_items = tuple(x for x in universe if primary_startswith(x,
+            prefix))
+        self.reset()
+
+    def rowCount(self, *args):
+        return len(self.current_items)
+
+    def data(self, index, role):
+        if role == Qt.DisplayRole:
+            try:
+                return self.current_items[index.row()]
+            except IndexError:
+                pass
+        return NONE
+
+    def index_for_prefix(self, prefix):
+        for i, item in enumerate(self.current_items):
+            if primary_startswith(item, prefix):
+                return self.index(i)
+# }}}
+
+class Completer(QListView): # {{{
+
+    item_selected = pyqtSignal(object)
+    relayout_needed = pyqtSignal()
+
+    def __init__(self, completer_widget, max_visible_items=7):
+        QListView.__init__(self)
+        self.completer_widget = weakref.ref(completer_widget)
+        self.setWindowFlags(Qt.Popup)
+        self.max_visible_items = max_visible_items
+        self.setEditTriggers(self.NoEditTriggers)
+        self.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+        self.setSelectionBehavior(self.SelectRows)
+        self.setSelectionMode(self.SingleSelection)
+        self.setAlternatingRowColors(True)
+        self.setModel(CompleteModel(self))
+        self.setMouseTracking(True)
+        self.entered.connect(self.item_entered)
+        self.activated.connect(self.item_chosen)
+        self.pressed.connect(self.item_chosen)
+        self.installEventFilter(self)
+
+    def hide(self):
+        self.setCurrentIndex(QModelIndex())
+        QListView.hide(self)
+
+    def item_chosen(self, index):
+        if not self.isVisible(): return
+        self.hide()
+        text = self.model().data(index, Qt.DisplayRole)
+        self.item_selected.emit(unicode(text))
+
+    def set_items(self, items):
+        self.model().set_items(items)
+        if self.isVisible():
+            self.relayout_needed.emit()
+
+    def set_completion_prefix(self, prefix):
+        self.model().set_completion_prefix(prefix)
+        if self.isVisible():
+            self.relayout_needed.emit()
+
+    def item_entered(self, idx):
+        self.setCurrentIndex(idx)
+
+    def next_match(self, previous=False):
+        c = self.currentIndex()
+        if c.isValid():
+            r = c.row()
+        else:
+            r = self.model().rowCount() if previous else -1
+        r = r + (-1 if previous else 1)
+        index = self.model().index(r % self.model().rowCount())
+        self.setCurrentIndex(index)
+
+    def scroll_to(self, orig):
+        if orig:
+            index = self.model().index_for_prefix(orig)
+            if index is not None and index.isValid():
+                self.setCurrentIndex(index)
+
+    def popup(self, select_first=True):
+        p = self
+        m = p.model()
+        widget = self.completer_widget()
+        if widget is None:
+            return
+        screen = QApplication.desktop().availableGeometry(widget)
+        h = (p.sizeHintForRow(0) * min(self.max_visible_items, m.rowCount()) +
+                3) + 3
+        hsb = p.horizontalScrollBar()
+        if hsb and hsb.isVisible():
+            h += hsb.sizeHint().height()
+
+        rh = widget.height()
+        pos = widget.mapToGlobal(QPoint(0, widget.height() - 2))
+        w = min(widget.width(), screen.width())
+
+        if (pos.x() + w) > (screen.x() + screen.width()):
+            pos.setX(screen.x() + screen.width() - w)
+        if pos.x() < screen.x():
+            pos.setX(screen.x())
+
+        top = pos.y() - rh - screen.top() + 2
+        bottom = screen.bottom() - pos.y()
+        h = max(h, p.minimumHeight())
+        if h > bottom:
+            h = min(max(top, bottom), h)
+
+            if top > bottom:
+                pos.setY(pos.y() - h - rh + 2)
+
+        p.setGeometry(pos.x(), pos.y(), w, h)
+
+        if (select_first and not self.currentIndex().isValid() and
+                self.model().rowCount() > 0):
+            self.setCurrentIndex(self.model().index(0))
+
+        if not p.isVisible():
+            p.show()
+
+    def eventFilter(self, obj, e):
+        'Redirect key presses from the popup to the widget'
+        widget = self.completer_widget()
+        if widget is None or sip.isdeleted(widget):
+            return False
+        etype = e.type()
+        if obj is not self:
+            return QObject.eventFilter(self, obj, e)
+
+        if etype == e.KeyPress:
+            key = e.key()
+            if key == Qt.Key_Escape:
+                self.hide()
+                e.accept()
+                return True
+            if key == Qt.Key_F4 and e.modifiers() & Qt.AltModifier:
+                self.hide()
+                e.accept()
+                return True
+            if key in (Qt.Key_Enter, Qt.Key_Return):
+                if not self.currentIndex().isValid():
+                    self.hide()
+                    e.accept()
+                    return True
+                return False
+            if key in (Qt.Key_End, Qt.Key_Home, Qt.Key_Up, Qt.Key_Down,
+                    Qt.Key_PageUp, Qt.Key_PageDown):
+                # Let the list view handle these keys
+                return False
+            if key in (Qt.Key_Tab, Qt.Key_Backtab):
+                self.next_match(previous=key == Qt.Key_Backtab)
+                e.accept()
+                return True
+            # Send to widget
+            widget.eat_focus_out = False
+            widget.keyPressEvent(e)
+            widget.eat_focus_out = True
+            if not widget.hasFocus():
+                # Widget lost focus hide the popup
+                self.hide()
+            if e.isAccepted():
+                return True
+        elif etype == e.MouseButtonPress:
+            if not self.underMouse():
+                self.hide()
+                e.accept()
+                return True
+        return False
+# }}}
+
+class LineEdit(QLineEdit, LineEditECM):
+    '''
+    A line edit that completes on multiple items separated by a
+    separator. Use the :meth:`update_items_cache` to set the list of
+    all possible completions. Separator can be controlled with the
+    :meth:`set_separator` and :meth:`set_space_before_sep` methods.
+
+    A call to self.set_separator(None) will allow this widget to be used
+    to complete non multiple fields as well.
+    '''
+
+    def __init__(self, parent=None, completer_widget=None):
+        QLineEdit.__init__(self, parent)
+
+        self.sep = ','
+        self.space_before_sep = False
+        self.add_separator = True
+        self.original_cursor_pos = None
+        completer_widget = (self if completer_widget is None else
+                completer_widget)
+
+        self.mcompleter = Completer(completer_widget)
+        self.mcompleter.item_selected.connect(self.completion_selected,
+                type=Qt.QueuedConnection)
+        self.mcompleter.relayout_needed.connect(self.relayout)
+        self.mcompleter.setFocusProxy(completer_widget)
+        self.textEdited.connect(self.text_edited)
+        self.no_popup = False
+
+    # Interface {{{
+    def update_items_cache(self, complete_items):
+        self.all_items = complete_items
+
+    def set_separator(self, sep):
+        self.sep = sep
+
+    def set_space_before_sep(self, space_before):
+        self.space_before_sep = space_before
+
+    def set_add_separator(self, what):
+        self.add_separator = bool(what)
+
+    @dynamic_property
+    def all_items(self):
+        def fget(self):
+            return self.mcompleter.model().all_items
+        def fset(self, items):
+            self.mcompleter.model().set_items(items)
+        return property(fget=fget, fset=fset)
+
+    # }}}
+
+    def complete(self, show_all=False, select_first=True):
+        orig = None
+        if show_all:
+            orig = self.mcompleter.model().current_prefix
+            self.mcompleter.set_completion_prefix('')
+        if not self.mcompleter.model().current_items:
+            self.mcompleter.hide()
+            return
+        self.mcompleter.popup(select_first=select_first)
+        self.mcompleter.scroll_to(orig)
+
+    def relayout(self):
+        self.mcompleter.popup()
+
+    def text_edited(self, *args):
+        if self.no_popup: return
+        self.update_completions()
+        select_first = len(self.mcompleter.model().current_prefix) > 0
+        if not select_first:
+            self.mcompleter.setCurrentIndex(QModelIndex())
+        self.complete(select_first=select_first)
+
+    def update_completions(self):
+        ' Update the list of completions '
+        self.original_cursor_pos = cpos = self.cursorPosition()
+        text = unicode(self.text())
+        prefix = text[:cpos]
+        complete_prefix = prefix.lstrip()
+        if self.sep:
+            complete_prefix = prefix.split(self.sep)[-1].lstrip()
+        self.mcompleter.set_completion_prefix(complete_prefix)
+
+    def get_completed_text(self, text):
+        'Get completed text in before and after parts'
+        if self.sep is None:
+            return text, ''
+        else:
+            cursor_pos = self.original_cursor_pos
+            if cursor_pos is None:
+                cursor_pos = self.cursorPosition()
+            self.original_cursor_pos = None
+            # Split text
+            curtext = unicode(self.text())
+            before_text = curtext[:cursor_pos]
+            after_text = curtext[cursor_pos:].rstrip()
+            # Remove the completion prefix from the before text
+            before_text = self.sep.join(before_text.split(self.sep)[:-1]).rstrip()
+            if before_text:
+                # Add the separator to the end of before_text
+                if self.space_before_sep:
+                    before_text += ' '
+                before_text += self.sep + ' '
+            if self.add_separator or after_text:
+                # Add separator to the end of completed text
+                if self.space_before_sep:
+                    text = text.rstrip() + ' '
+                completed_text = text + self.sep + ' '
+            else:
+                completed_text = text
+            return before_text + completed_text, after_text
+
+    def completion_selected(self, text):
+        before_text, after_text = self.get_completed_text(unicode(text))
+        self.setText(before_text + after_text)
+        self.setCursorPosition(len(before_text))
+
+class EditWithComplete(EnComboBox):
+
+    def __init__(self, *args):
+        EnComboBox.__init__(self, *args)
+        self.setLineEdit(LineEdit(self, completer_widget=self))
+        self.setCompleter(None)
+        self.eat_focus_out = True
+        self.installEventFilter(self)
+
+    # Interface {{{
+    def showPopup(self):
+        self.lineEdit().complete(show_all=True)
+
+    def update_items_cache(self, complete_items):
+        self.lineEdit().update_items_cache(complete_items)
+
+    def set_separator(self, sep):
+        self.lineEdit().set_separator(sep)
+
+    def set_space_before_sep(self, space_before):
+        self.lineEdit().set_space_before_sep(space_before)
+
+    def set_add_separator(self, what):
+        self.lineEdit().set_add_separator(what)
+
+    def show_initial_value(self, what):
+        what = unicode(what) if what else u''
+        self.setText(what)
+        self.lineEdit().selectAll()
+
+    @dynamic_property
+    def all_items(self):
+        def fget(self): return self.lineEdit().all_items
+        def fset(self, val): self.lineEdit().all_items = val
+        return property(fget=fget, fset=fset)
+
+
+    # }}}
+
+    def text(self):
+        return unicode(self.lineEdit().text())
+
+    def selectAll(self):
+        self.lineEdit().selectAll()
+
+    def setText(self, val):
+        le = self.lineEdit()
+        le.no_popup = True
+        le.setText(val)
+        le.no_popup = False
+
+    def setCursorPosition(self, *args):
+        self.lineEdit().setCursorPosition(*args)
+
+    @property
+    def textChanged(self):
+        return self.lineEdit().textChanged
+
+    def clear(self):
+        self.lineEdit().clear()
+        EnComboBox.clear(self)
+
+    def eventFilter(self, obj, e):
+        try:
+            c = self.lineEdit().mcompleter
+        except AttributeError:
+            return False
+        etype = e.type()
+        if self.eat_focus_out and self is obj and etype == e.FocusOut:
+            if c.isVisible():
+                return True
+        return EnComboBox.eventFilter(self, obj, e)
+
+if __name__ == '__main__':
+    from PyQt4.Qt import QDialog, QVBoxLayout
+    app = QApplication([])
+    d = QDialog()
+    d.setLayout(QVBoxLayout())
+    le = EditWithComplete(d)
+    d.layout().addWidget(le)
+    items = ['one', 'otwo', 'othree', 'ooone', 'ootwo',
+        'oothree', 'a1', 'a2',u'Edgas', u'Èdgar', u'Édgaq', u'Edgar', u'Édgar']
+    le.update_items_cache(items)
+    le.show_initial_value('')
+    d.exec_()
--- a/src/calibre/gui2/convert/htmlz_output.py
+++ b/src/calibre/gui2/convert/htmlz_output.py
@ -17,7 +17,8 @@ class PluginWidget(Widget, Ui_Form):
    ICON = I('mimetypes/html.png')

    def __init__(self, parent, get_option, get_help, db=None, book_id=None):
-        Widget.__init__(self, parent, ['htmlz_css_type', 'htmlz_class_style'])
+        Widget.__init__(self, parent, ['htmlz_css_type', 'htmlz_class_style',
+            'htmlz_title_filename'])
        self.db, self.book_id = db, book_id
        for x in get_option('htmlz_css_type').option.choices:
            self.opt_htmlz_css_type.addItem(x)
--- a/src/calibre/gui2/convert/htmlz_output.ui
+++ b/src/calibre/gui2/convert/htmlz_output.ui
@ -14,7 +14,7 @@
   <string>Form</string>
  </property>
  <layout class="QGridLayout" name="gridLayout">
-   <item row="2" column="0">
+   <item row="3" column="0">
    <spacer name="verticalSpacer">
     <property name="orientation">
      <enum>Qt::Vertical</enum>
@ -27,6 +27,9 @@
     </property>
    </spacer>
   </item>
+   <item row="1" column="1">
+    <widget class="QComboBox" name="opt_htmlz_class_style"/>
+   </item>
   <item row="0" column="0">
    <widget class="QLabel" name="label">
     <property name="text">
@ -51,8 +54,12 @@
     </property>
    </widget>
   </item>
-   <item row="1" column="1">
-    <widget class="QComboBox" name="opt_htmlz_class_style"/>
+   <item row="2" column="0" colspan="2">
+    <widget class="QCheckBox" name="opt_htmlz_title_filename">
+     <property name="text">
+      <string>Use book &amp;title as the filename for the HTML file inside the archive</string>
+     </property>
+    </widget>
   </item>
  </layout>
 </widget>
--- a/src/calibre/gui2/convert/metadata.ui
+++ b/src/calibre/gui2/convert/metadata.ui
@ -190,7 +190,7 @@
        </widget>
       </item>
       <item row="4" column="1">
-        <widget class="MultiCompleteLineEdit" name="tags">
+        <widget class="EditWithComplete" name="tags">
         <property name="toolTip">
          <string>Tags categorize the book. This is particularly useful while searching. &lt;br&gt;&lt;br&gt;They can be any words or phrases, separated by commas.</string>
         </property>
@ -213,7 +213,7 @@
        </widget>
       </item>
       <item row="5" column="1">
-        <widget class="MultiCompleteComboBox" name="series">
+        <widget class="EditWithComplete" name="series">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>10</horstretch>
@ -248,14 +248,14 @@
        </widget>
       </item>
       <item row="3" column="1">
-        <widget class="MultiCompleteComboBox" name="publisher">
+        <widget class="EditWithComplete" name="publisher">
         <property name="editable">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
-        <widget class="MultiCompleteComboBox" name="author">
+        <widget class="EditWithComplete" name="author">
         <property name="editable">
          <bool>true</bool>
         </property>
@ -277,14 +277,9 @@
   <header>widgets.h</header>
  </customwidget>
  <customwidget>
-   <class>MultiCompleteComboBox</class>
+   <class>EditWithComplete</class>
   <extends>QComboBox</extends>
-   <header>calibre/gui2/complete.h</header>
-  </customwidget>
-  <customwidget>
-   <class>MultiCompleteLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>calibre/gui2/complete.h</header>
+   <header>calibre/gui2/complete2.h</header>
  </customwidget>
  <customwidget>
   <class>ImageView</class>
--- a/src/calibre/gui2/custom_column_widgets.py
+++ b/src/calibre/gui2/custom_column_widgets.py
@ -13,7 +13,7 @@ from PyQt4.Qt import QComboBox, QLabel, QSpinBox, QDoubleSpinBox, QDateTimeEdit,
        QPushButton, QMessageBox, QToolButton

 from calibre.utils.date import qt_to_dt, now
-from calibre.gui2.complete import MultiCompleteLineEdit, MultiCompleteComboBox
+from calibre.gui2.complete2 import EditWithComplete
 from calibre.gui2.comments_editor import Editor as CommentsEditor
 from calibre.gui2 import UNDEFINED_QDATETIME, error_dialog
 from calibre.gui2.dialogs.tag_editor import TagEditor
@ -235,7 +235,7 @@ class MultipleWidget(QWidget):
        layout.setSpacing(5)
        layout.setContentsMargins(0, 0, 0, 0)

-        self.tags_box = MultiCompleteLineEdit(parent)
+        self.tags_box = EditWithComplete(parent)
        layout.addWidget(self.tags_box, stretch=1000)
        self.editor_button = QToolButton(self)
        self.editor_button.setToolTip(_('Open Item Editor'))
@ -293,7 +293,7 @@ class Text(Base):
            w.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
            w.get_editor_button().clicked.connect(self.edit)
        else:
-            w = MultiCompleteComboBox(parent)
+            w = EditWithComplete(parent)
            w.set_separator(None)
            w.setSizeAdjustPolicy(w.AdjustToMinimumContentsLengthWithIcon)
            w.setMinimumContentsLength(25)
@ -363,7 +363,7 @@ class Text(Base):
 class Series(Base):

    def setup_ui(self, parent):
-        w = MultiCompleteComboBox(parent)
+        w = EditWithComplete(parent)
        w.set_separator(None)
        w.setSizeAdjustPolicy(w.AdjustToMinimumContentsLengthWithIcon)
        w.setMinimumContentsLength(25)
@ -807,7 +807,7 @@ class BulkDateTime(BulkBase):
 class BulkSeries(BulkBase):

    def setup_ui(self, parent):
-        self.make_widgets(parent, MultiCompleteComboBox)
+        self.make_widgets(parent, EditWithComplete)
        values = self.all_values = list(self.db.all_custom(num=self.col_id))
        values.sort(key=sort_key)
        self.main_widget.setSizeAdjustPolicy(self.main_widget.AdjustToMinimumContentsLengthWithIcon)
@ -934,7 +934,7 @@ class RemoveTags(QWidget):
        layout.setSpacing(5)
        layout.setContentsMargins(0, 0, 0, 0)

-        self.tags_box = MultiCompleteLineEdit(parent)
+        self.tags_box = EditWithComplete(parent)
        self.tags_box.update_items_cache(values)
        layout.addWidget(self.tags_box, stretch=3)
        self.checkbox = QCheckBox(_('Remove all tags'), parent)
@ -956,7 +956,7 @@ class BulkText(BulkBase):
        values = self.all_values = list(self.db.all_custom(num=self.col_id))
        values.sort(key=sort_key)
        if self.col_metadata['is_multiple']:
-            self.make_widgets(parent, MultiCompleteLineEdit,
+            self.make_widgets(parent, EditWithComplete,
                              extra_label_text=_('tags to add'))
            self.main_widget.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
            self.adding_widget = self.main_widget
@ -976,7 +976,7 @@ class BulkText(BulkBase):
                self.main_widget.set_add_separator(
                                tweaks['authors_completer_append_separator'])
        else:
-            self.make_widgets(parent, MultiCompleteComboBox)
+            self.make_widgets(parent, EditWithComplete)
            self.main_widget.set_separator(None)
            self.main_widget.setSizeAdjustPolicy(
                        self.main_widget.AdjustToMinimumContentsLengthWithIcon)
--- a/src/calibre/gui2/dialogs/add_empty_book.py
+++ b/src/calibre/gui2/dialogs/add_empty_book.py
@ -7,7 +7,7 @@ __license__   = 'GPL v3'
 from PyQt4.Qt import QDialog, QGridLayout, QLabel, QDialogButtonBox,  \
            QApplication, QSpinBox, QToolButton, QIcon
 from calibre.ebooks.metadata import string_to_authors
-from calibre.gui2.complete import MultiCompleteComboBox
+from calibre.gui2.complete2 import EditWithComplete
 from calibre.utils.config import tweaks

 class AddEmptyBookDialog(QDialog):
@ -32,7 +32,7 @@ class AddEmptyBookDialog(QDialog):
        self.author_label = QLabel(_('Set the author of the new books to:'))
        self._layout.addWidget(self.author_label, 2, 0, 1, 2)

-        self.authors_combo = MultiCompleteComboBox(self)
+        self.authors_combo = EditWithComplete(self)
        self.authors_combo.setSizeAdjustPolicy(
                self.authors_combo.AdjustToMinimumContentsLengthWithIcon)
        self.authors_combo.setEditable(True)
--- a/src/calibre/gui2/dialogs/metadata_bulk.ui
+++ b/src/calibre/gui2/dialogs/metadata_bulk.ui
@ -76,7 +76,7 @@
            </widget>
           </item>
           <item row="0" column="1">
-            <widget class="MultiCompleteComboBox" name="authors">
+            <widget class="EditWithComplete" name="authors">
             <property name="editable">
              <bool>true</bool>
             </property>
@ -175,7 +175,7 @@
            </widget>
           </item>
           <item row="4" column="1">
-            <widget class="MultiCompleteComboBox" name="publisher">
+            <widget class="EditWithComplete" name="publisher">
             <property name="editable">
              <bool>true</bool>
             </property>
@ -195,7 +195,7 @@
            </widget>
           </item>
           <item row="5" column="1">
-            <widget class="MultiCompleteLineEdit" name="tags">
+            <widget class="EditWithComplete" name="tags">
             <property name="toolTip">
              <string>Tags categorize the book. This is particularly useful while searching. &lt;br&gt;&lt;br&gt;They can be any words or phrases, separated by commas.</string>
             </property>
@ -229,7 +229,7 @@
            </widget>
           </item>
           <item row="6" column="1">
-            <widget class="MultiCompleteLineEdit" name="remove_tags">
+            <widget class="EditWithComplete" name="remove_tags">
             <property name="toolTip">
              <string>Comma separated list of tags to remove from the books. </string>
             </property>
@ -262,7 +262,7 @@
            </widget>
           </item>
           <item row="7" column="1">
-            <widget class="MultiCompleteComboBox" name="series">
+            <widget class="EditWithComplete" name="series">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
               <horstretch>0</horstretch>
@ -1181,14 +1181,9 @@ not multiple and the destination field is multiple</string>
   <header>widgets.h</header>
  </customwidget>
  <customwidget>
-   <class>MultiCompleteComboBox</class>
+   <class>EditWithComplete</class>
   <extends>QComboBox</extends>
-   <header>calibre/gui2/complete.h</header>
-  </customwidget>
-  <customwidget>
-   <class>MultiCompleteLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>calibre/gui2/complete.h</header>
+   <header>calibre/gui2/complete2.h</header>
  </customwidget>
  <customwidget>
   <class>HistoryLineEdit</class>
--- a/src/calibre/gui2/dialogs/search.ui
+++ b/src/calibre/gui2/dialogs/search.ui
@ -237,21 +237,21 @@
        </widget>
       </item>
       <item row="2" column="1">
-        <widget class="MultiCompleteComboBox" name="authors_box">
+        <widget class="EditWithComplete" name="authors_box">
         <property name="toolTip">
          <string>Enter an author's name. Only one author can be used.</string>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
-        <widget class="MultiCompleteComboBox" name="series_box">
+        <widget class="EditWithComplete" name="series_box">
         <property name="toolTip">
          <string>Enter a series name, without an index. Only one series name can be used.</string>
         </property>
        </widget>
       </item>
       <item row="4" column="1">
-        <widget class="MultiCompleteLineEdit" name="tags_box">
+        <widget class="EditWithComplete" name="tags_box">
         <property name="toolTip">
          <string>Enter tags separated by spaces</string>
         </property>
@ -327,14 +327,9 @@
   <header>widgets.h</header>
  </customwidget>
  <customwidget>
-   <class>MultiCompleteLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>calibre/gui2/complete.h</header>
-  </customwidget>
-  <customwidget>
-   <class>MultiCompleteComboBox</class>
+   <class>EditWithComplete</class>
   <extends>QComboBox</extends>
-   <header>calibre/gui2/complete.h</header>
+   <header>calibre/gui2/complete2.h</header>
  </customwidget>
 </customwidgets>
 <tabstops>
--- a/src/calibre/gui2/languages.py
+++ b/src/calibre/gui2/languages.py
@ -7,14 +7,14 @@ __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'

-from calibre.gui2.complete import MultiCompleteComboBox
+from calibre.gui2.complete2 import EditWithComplete
 from calibre.utils.localization import lang_map
 from calibre.utils.icu import sort_key, lower

-class LanguagesEdit(MultiCompleteComboBox):
+class LanguagesEdit(EditWithComplete):

    def __init__(self, parent=None, db=None):
-        MultiCompleteComboBox.__init__(self, parent)
+        EditWithComplete.__init__(self, parent)

        self.setSizeAdjustPolicy(self.AdjustToMinimumContentsLengthWithIcon)
        self.setMinimumContentsLength(20)
--- a/src/calibre/gui2/library/delegates.py
+++ b/src/calibre/gui2/library/delegates.py
@ -14,7 +14,7 @@ from PyQt4.Qt import (Qt, QApplication, QStyle, QIcon,  QDoubleSpinBox,
 from calibre.gui2 import UNDEFINED_QDATETIME, error_dialog, rating_font
 from calibre.constants import iswindows
 from calibre.gui2.widgets import EnLineEdit
-from calibre.gui2.complete import MultiCompleteLineEdit, MultiCompleteComboBox
+from calibre.gui2.complete2 import EditWithComplete
 from calibre.utils.date import now, format_date, qt_to_dt
 from calibre.utils.config import tweaks
 from calibre.utils.formatter import validation_formatter
@ -121,18 +121,21 @@ class TextDelegate(QStyledItemDelegate): # {{{

    def createEditor(self, parent, option, index):
        if self.auto_complete_function:
-            editor = MultiCompleteComboBox(parent)
+            editor = EditWithComplete(parent)
            editor.set_separator(None)
            complete_items = [i[1] for i in self.auto_complete_function()]
            editor.update_items_cache(complete_items)
-            ct = index.data(Qt.DisplayRole).toString()
-            editor.show_initial_value(ct)
        else:
            editor = EnLineEdit(parent)
        return editor

+    def setEditorData(self, editor, index):
+        ct = unicode(index.data(Qt.DisplayRole).toString())
+        editor.setText(ct)
+        editor.selectAll()
+
    def setModelData(self, editor, model, index):
-        if isinstance(editor, MultiCompleteComboBox):
+        if isinstance(editor, EditWithComplete):
            val = editor.lineEdit().text()
            model.setData(index, QVariant(val), Qt.EditRole)
        else:
@ -153,7 +156,7 @@ class CompleteDelegate(QStyledItemDelegate): # {{{
    def createEditor(self, parent, option, index):
        if self.db and hasattr(self.db, self.items_func_name):
            col = index.model().column_map[index.column()]
-            editor = MultiCompleteComboBox(parent)
+            editor = EditWithComplete(parent)
            editor.set_separator(self.sep)
            editor.set_space_before_sep(self.space_before_sep)
            if self.sep == '&':
@ -164,14 +167,17 @@ class CompleteDelegate(QStyledItemDelegate): # {{{
                all_items = list(self.db.all_custom(
                    label=self.db.field_metadata.key_to_label(col)))
            editor.update_items_cache(all_items)
-            ct = index.data(Qt.DisplayRole).toString()
-            editor.show_initial_value(ct)
        else:
            editor = EnLineEdit(parent)
        return editor

+    def setEditorData(self, editor, index):
+        ct = unicode(index.data(Qt.DisplayRole).toString())
+        editor.setText(ct)
+        editor.selectAll()
+
    def setModelData(self, editor, model, index):
-        if isinstance(editor, MultiCompleteComboBox):
+        if isinstance(editor, EditWithComplete):
            val = editor.lineEdit().text()
            model.setData(index, QVariant(val), Qt.EditRole)
        else:
@ -183,10 +189,12 @@ class LanguagesDelegate(QStyledItemDelegate): # {{{
    def createEditor(self, parent, option, index):
        editor = LanguagesEdit(parent=parent)
        editor.init_langs(index.model().db)
-        ct = index.data(Qt.DisplayRole).toString()
-        editor.show_initial_value(ct)
        return editor

+    def setEditorData(self, editor, index):
+        ct = unicode(index.data(Qt.DisplayRole).toString())
+        editor.show_initial_value(ct)
+
    def setModelData(self, editor, model, index):
        val = ','.join(editor.lang_codes)
        model.setData(index, QVariant(val), Qt.EditRole)
@ -244,13 +252,21 @@ class CcTextDelegate(QStyledItemDelegate): # {{{
    def createEditor(self, parent, option, index):
        m = index.model()
        col = m.column_map[index.column()]
-        editor = MultiCompleteLineEdit(parent)
+        editor = EditWithComplete(parent)
        editor.set_separator(None)
        complete_items = sorted(list(m.db.all_custom(label=m.db.field_metadata.key_to_label(col))),
                                key=sort_key)
        editor.update_items_cache(complete_items)
        return editor

+    def setEditorData(self, editor, index):
+        ct = unicode(index.data(Qt.DisplayRole).toString())
+        editor.setText(ct)
+        editor.selectAll()
+
+    def setModelData(self, editor, model, index):
+        val = editor.text()
+        model.setData(index, QVariant(val), Qt.EditRole)
 # }}}

 class CcNumberDelegate(QStyledItemDelegate): # {{{
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@ -125,7 +125,7 @@ class BooksView(QTableView): # {{{
        self.last_modified_delegate = DateDelegate(self,
                tweak_name='gui_last_modified_display_format')
        self.languages_delegate = LanguagesDelegate(self)
-        self.tags_delegate = CompleteDelegate(self, ',', 'all_tags')
+        self.tags_delegate = CompleteDelegate(self, ',', 'all_tag_names')
        self.authors_delegate = CompleteDelegate(self, '&', 'all_author_names', True)
        self.cc_names_delegate = CompleteDelegate(self, '&', 'all_custom', True)
        self.series_delegate = TextDelegate(self)
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@ -313,21 +313,39 @@ def cant_start(msg=_('If you are sure it is not running')+', ',

    raise SystemExit(1)

-def communicate(opts, args):
-    t = RC()
+def build_pipe(print_error=True):
+    t = RC(print_error=print_error)
    t.start()
-    time.sleep(3)
-    if not t.done:
-        f = os.path.expanduser('~/.calibre_calibre GUI.lock')
-        cant_start(what=_('try deleting the file')+': '+f)
+    t.join(3.0)
+    if t.is_alive():
+        if iswindows():
+            cant_start()
+        else:
+            f = os.path.expanduser('~/.calibre_calibre GUI.lock')
+            cant_start(what=_('try deleting the file')+': '+f)
        raise SystemExit(1)
+    return t

+def shutdown_other(rc=None):
+    if rc is None:
+        rc = build_pipe(print_error=False)
+        if rc.conn is None:
+            prints(_('No running calibre found'))
+            return # No running instance found
+    from calibre.utils.lock import singleinstance
+    rc.conn.send('shutdown:')
+    prints(_('Shutdown command sent, waiting for shutdown...'))
+    for i in xrange(50):
+        if singleinstance('calibre GUI'):
+            return
+        time.sleep(0.1)
+    prints(_('Failed to shutdown running calibre instance'))
+    raise SystemExit(1)
+
+def communicate(opts, args):
+    t = build_pipe()
    if opts.shutdown_running_calibre:
-        t.conn.send('shutdown:')
-        from calibre.utils.lock import singleinstance
-        prints(_('Shutdown command sent, waiting for shutdown...'))
-        while not singleinstance('calibre GUI'):
-            time.sleep(0.1)
+        shutdown_other(t)
    else:
        if len(args) > 1:
            args[1] = os.path.abspath(args[1])
@ -335,7 +353,6 @@ def communicate(opts, args):
    t.conn.close()
    raise SystemExit(0)

-
 def main(args=sys.argv):
    gui_debug = None
    if args[0] == '__CALIBRE_GUI_DEBUG__':
--- a/src/calibre/gui2/metadata/basic_widgets.py
+++ b/src/calibre/gui2/metadata/basic_widgets.py
@ -15,7 +15,6 @@ from PyQt4.Qt import (Qt, QDateTimeEdit, pyqtSignal, QMessageBox,
    QPushButton, QSpinBox, QLineEdit, QSizePolicy, QDialogButtonBox, QAction)

 from calibre.gui2.widgets import EnLineEdit, FormatList as _FormatList, ImageView
-from calibre.gui2.complete import MultiCompleteLineEdit, MultiCompleteComboBox
 from calibre.utils.icu import sort_key
 from calibre.utils.config import tweaks, prefs
 from calibre.ebooks.metadata import (title_sort, authors_to_string,
@ -23,6 +22,7 @@ from calibre.ebooks.metadata import (title_sort, authors_to_string,
 from calibre.ebooks.metadata.meta import get_metadata
 from calibre.gui2 import (file_icon_provider, UNDEFINED_QDATETIME,
        choose_files, error_dialog, choose_images)
+from calibre.gui2.complete2 import EditWithComplete
 from calibre.utils.date import (local_tz, qt_to_dt, as_local_time,
        UNDEFINED_DATE)
 from calibre import strftime
@ -204,7 +204,7 @@ class TitleSortEdit(TitleEdit):
 # }}}

 # Authors {{{
-class AuthorsEdit(MultiCompleteComboBox):
+class AuthorsEdit(EditWithComplete):

    TOOLTIP = ''
    LABEL = _('&Author(s):')
@ -212,7 +212,7 @@ class AuthorsEdit(MultiCompleteComboBox):
    def __init__(self, parent, manage_authors):
        self.dialog = parent
        self.books_to_refresh = set([])
-        MultiCompleteComboBox.__init__(self, parent)
+        EditWithComplete.__init__(self, parent)
        self.setToolTip(self.TOOLTIP)
        self.setWhatsThis(self.TOOLTIP)
        self.setEditable(True)
@ -443,13 +443,13 @@ class AuthorSortEdit(EnLineEdit):
 # }}}

 # Series {{{
-class SeriesEdit(MultiCompleteComboBox):
+class SeriesEdit(EditWithComplete):

    TOOLTIP = _('List of known series. You can add new series.')
    LABEL = _('&Series:')

    def __init__(self, parent):
-        MultiCompleteComboBox.__init__(self, parent)
+        EditWithComplete.__init__(self, parent)
        self.set_separator(None)
        self.dialog = parent
        self.setSizeAdjustPolicy(
@ -1086,14 +1086,14 @@ class RatingEdit(QSpinBox): # {{{

 # }}}

-class TagsEdit(MultiCompleteLineEdit): # {{{
+class TagsEdit(EditWithComplete): # {{{
    LABEL = _('Ta&gs:')
    TOOLTIP = '<p>'+_('Tags categorize the book. This is particularly '
            'useful while searching. <br><br>They can be any words '
            'or phrases, separated by commas.')

    def __init__(self, parent):
-        MultiCompleteLineEdit.__init__(self, parent)
+        EditWithComplete.__init__(self, parent)
        self.books_to_refresh = set([])
        self.setToolTip(self.TOOLTIP)
        self.setWhatsThis(self.TOOLTIP)
@ -1114,7 +1114,7 @@ class TagsEdit(MultiCompleteLineEdit): # {{{
        tags = db.tags(id_, index_is_id=True)
        tags = tags.split(',') if tags else []
        self.current_val = tags
-        self.all_items = db.all_tags()
+        self.all_items = db.all_tag_names()
        self.original_val = self.current_val

    @property
@ -1327,11 +1327,11 @@ class ISBNDialog(QDialog) : # {{{

 # }}}

-class PublisherEdit(MultiCompleteComboBox): # {{{
+class PublisherEdit(EditWithComplete): # {{{
    LABEL = _('&Publisher:')

    def __init__(self, parent):
-        MultiCompleteComboBox.__init__(self, parent)
+        EditWithComplete.__init__(self, parent)
        self.set_separator(None)
        self.setSizeAdjustPolicy(
                self.AdjustToMinimumContentsLengthWithIcon)
--- a/src/calibre/gui2/preferences/init.py
+++ b/src/calibre/gui2/preferences/init.py
@ -13,6 +13,7 @@ from PyQt4.Qt import (QWidget, pyqtSignal, QCheckBox, QAbstractSpinBox,

 from calibre.customize.ui import preferences_plugins
 from calibre.utils.config import ConfigProxy
+from calibre.gui2.complete2 import EditWithComplete

 class AbortCommit(Exception):
    pass
@ -133,11 +134,15 @@ class Setting(object):
    def initialize(self):
        self.gui_obj.blockSignals(True)
        if self.datatype == 'choice':
-            self.gui_obj.clear()
-            for x in self.choices:
-                if isinstance(x, basestring):
-                    x = (x, x)
-                self.gui_obj.addItem(x[0], QVariant(x[1]))
+            choices = self.choices or []
+            if isinstance(self.gui_obj, EditWithComplete):
+                self.gui_obj.all_items = choices
+            else:
+                self.gui_obj.clear()
+                for x in choices:
+                    if isinstance(x, basestring):
+                        x = (x, x)
+                    self.gui_obj.addItem(x[0], QVariant(x[1]))
        self.set_gui_val(self.get_config_val(default=False))
        self.gui_obj.blockSignals(False)
        self.initial_value = self.get_gui_val()
@ -171,11 +176,14 @@ class Setting(object):
        elif self.datatype == 'string':
            self.gui_obj.setText(val if val else '')
        elif self.datatype == 'choice':
-            idx = self.gui_obj.findData(QVariant(val), role=Qt.UserRole,
-                    flags=self.CHOICES_SEARCH_FLAGS)
-            if idx == -1:
-                idx = 0
-            self.gui_obj.setCurrentIndex(idx)
+            if isinstance(self.gui_obj, EditWithComplete):
+                self.gui_obj.setText(val)
+            else:
+                idx = self.gui_obj.findData(QVariant(val), role=Qt.UserRole,
+                        flags=self.CHOICES_SEARCH_FLAGS)
+                if idx == -1:
+                    idx = 0
+                self.gui_obj.setCurrentIndex(idx)

    def get_gui_val(self):
        if self.datatype == 'bool':
@ -187,9 +195,12 @@ class Setting(object):
            if self.empty_string_is_None and not val:
                val = None
        elif self.datatype == 'choice':
-            idx = self.gui_obj.currentIndex()
-            if idx < 0: idx = 0
-            val = unicode(self.gui_obj.itemData(idx).toString())
+            if isinstance(self.gui_obj, EditWithComplete):
+                val = unicode(self.gui_obj.text())
+            else:
+                idx = self.gui_obj.currentIndex()
+                if idx < 0: idx = 0
+                val = unicode(self.gui_obj.itemData(idx).toString())
        return val

 class CommaSeparatedList(Setting):
--- a/src/calibre/gui2/preferences/look_feel.py
+++ b/src/calibre/gui2/preferences/look_feel.py
@ -75,7 +75,7 @@ class DisplayedFields(QAbstractListModel): # {{{

    def commit(self):
        if self.changed:
-            gprefs['book_display_fields'] = self.fields
+            self.db.prefs['book_display_fields'] = self.fields

    def move(self, idx, delta):
        row = idx.row() + delta
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@ -320,7 +320,7 @@ Manage Authors. You can use the values {author} and
      </attribute>
      <layout class="QGridLayout" name="gridLayout_10">
       <item row="3" column="2" colspan="3">
-        <widget class="MultiCompleteLineEdit" name="opt_categories_using_hierarchy">
+        <widget class="EditWithComplete" name="opt_categories_using_hierarchy">
         <property name="toolTip">
          <string>A comma-separated list of categories in which items containing
 periods are displayed in the tag browser trees. For example, if
@ -397,7 +397,7 @@ up into subcategories. If the partition method is set to disable, this value is
        </widget>
       </item>
       <item row="1" column="3" colspan="2">
-        <widget class="MultiCompleteLineEdit" name="opt_tag_browser_dont_collapse">
+        <widget class="EditWithComplete" name="opt_tag_browser_dont_collapse">
         <property name="toolTip">
          <string>A comma-separated list of categories that are not to
 be partitioned even if the number of items is larger than
@ -506,9 +506,9 @@ a few top-level elements.</string>
 </widget>
 <customwidgets>
  <customwidget>
-   <class>MultiCompleteLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>calibre/gui2/complete.h</header>
+   <class>EditWithComplete</class>
+   <extends>QComboBox</extends>
+   <header>calibre/gui2/complete2.h</header>
  </customwidget>
 </customwidgets>
 <resources>
--- a/src/calibre/gui2/preferences/search.py
+++ b/src/calibre/gui2/preferences/search.py
@ -98,7 +98,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
            db.prefs.set('grouped_search_make_user_categories', [])
        r('grouped_search_make_user_categories', db.prefs, setting=CommaSeparatedList)
        self.muc_changed = False
-        self.opt_grouped_search_make_user_categories.editingFinished.connect(
+        self.opt_grouped_search_make_user_categories.lineEdit().editingFinished.connect(
                                                        self.muc_box_changed)

    def set_similar_fields(self, initial=False):
--- a/src/calibre/gui2/preferences/search.ui
+++ b/src/calibre/gui2/preferences/search.ui
@ -69,7 +69,7 @@
       </widget>
      </item>
      <item row="2" column="1">
-       <widget class="MultiCompleteLineEdit" name="opt_limit_search_columns_to"/>
+       <widget class="EditWithComplete" name="opt_limit_search_columns_to"/>
      </item>
      <item row="5" column="0" colspan="2">
       <widget class="QLabel" name="label_3">
@ -134,7 +134,7 @@ a search term by changing the value box then pressing Save.</string>
         </widget>
        </item>
        <item>
-         <widget class="MultiCompleteLineEdit" name="gst_value"/>
+         <widget class="EditWithComplete" name="gst_value"/>
        </item>
        <item>
         <widget class="QToolButton" name="gst_save_button">
@ -173,7 +173,7 @@ of a search term by changing the value box then pressing Save.</string>
         </widget>
        </item>
        <item>
-         <widget class="MultiCompleteLineEdit" name="opt_grouped_search_make_user_categories">
+         <widget class="EditWithComplete" name="opt_grouped_search_make_user_categories">
          <property name="toolTip">
           <string>Enter the names of any grouped search terms you wish
 to be shown as user categories</string>
@ -301,9 +301,9 @@ to be shown as user categories</string>
 </widget>
 <customwidgets>
  <customwidget>
-   <class>MultiCompleteLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>calibre/gui2/complete.h</header>
+   <class>EditWithComplete</class>
+   <extends>QComboBox</extends>
+   <header>calibre/gui2/complete2.h</header>
  </customwidget>
 </customwidgets>
 <resources>
--- a/src/calibre/gui2/store/stores/bn_plugin.py
+++ b/src/calibre/gui2/store/stores/bn_plugin.py
@ -6,7 +6,6 @@ __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'

-import random
 import urllib
 from contextlib import closing

--- a/src/calibre/gui2/tools.py
+++ b/src/calibre/gui2/tools.py
@ -11,7 +11,6 @@ import cPickle, os

 from PyQt4.Qt import QDialog, QProgressDialog, QString, QTimer

-from calibre.constants import DEBUG
 from calibre.ptempfile import PersistentTemporaryFile
 from calibre.gui2 import warning_dialog, question_dialog
 from calibre.gui2.convert.single import NoSupportedInputFormats
--- a/src/calibre/gui2/viewer/config.py
+++ b/src/calibre/gui2/viewer/config.py
@ -51,6 +51,8 @@ def config(defaults=None):
            help=_('The amount by which to change the font size when clicking'
                ' the font larger/smaller buttons. Should be a number between '
                '0 and 1.'))
+    c.add_opt('fullscreen_clock', default=False, action='store_true',
+            help=_('Show a clock in fullscreen mode.'))

    fonts = c.add_group('FONTS', _('Font options'))
    fonts('serif_family', default='Times New Roman' if iswindows else 'Liberation Serif',
@ -117,6 +119,7 @@ class ConfigDialog(QDialog, Ui_Dialog):
            self.hyphenate.setVisible(False)
            self.hyphenate_default_lang.setVisible(False)
            self.hyphenate_label.setVisible(False)
+        self.opt_fullscreen_clock.setChecked(opts.fullscreen_clock)

    def accept(self, *args):
        if self.shortcut_config.is_editing:
@ -148,6 +151,7 @@ class ConfigDialog(QDialog, Ui_Dialog):
                str(self.hyphenate_default_lang.itemData(idx).toString()))
        c.set('line_scrolling_stops_on_pagebreaks',
                self.opt_line_scrolling_stops_on_pagebreaks.isChecked())
+        c.set('fullscreen_clock', self.opt_fullscreen_clock.isChecked())
        return QDialog.accept(self, *args)


--- a/src/calibre/gui2/viewer/config.ui
+++ b/src/calibre/gui2/viewer/config.ui
@ -6,7 +6,7 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>479</width>
+    <width>839</width>
    <height>630</height>
   </rect>
  </property>
@ -167,20 +167,6 @@
       </item>
       <item>
        <layout class="QGridLayout" name="gridLayout_2">
-         <item row="8" column="0" colspan="2">
-          <widget class="QCheckBox" name="opt_remember_window_size">
-           <property name="text">
-            <string>Remember last used &amp;window size and layout</string>
-           </property>
-          </widget>
-         </item>
-         <item row="9" column="0" colspan="2">
-          <widget class="QCheckBox" name="opt_remember_current_page">
-           <property name="text">
-            <string>Remember the &amp;current page when quitting</string>
-           </property>
-          </widget>
-         </item>
         <item row="5" column="0" colspan="2">
          <widget class="QCheckBox" name="hyphenate">
           <property name="text">
@ -205,13 +191,6 @@
           </property>
          </widget>
         </item>
-         <item row="7" column="0" colspan="2">
-          <widget class="QCheckBox" name="opt_fit_images">
-           <property name="text">
-            <string>&amp;Resize images larger than the viewer window (needs restart)</string>
-           </property>
-          </widget>
-         </item>
         <item row="4" column="0">
          <widget class="QLabel" name="label_11">
           <property name="text">
@ -247,13 +226,6 @@
           </property>
          </widget>
         </item>
-         <item row="10" column="0" colspan="2">
-          <widget class="QCheckBox" name="opt_wheel_flips_pages">
-           <property name="text">
-            <string>Mouse &amp;wheel flips pages</string>
-           </property>
-          </widget>
-         </item>
         <item row="3" column="1">
          <widget class="QSpinBox" name="max_fs_width">
           <property name="toolTip">
@ -301,13 +273,48 @@
           </property>
          </widget>
         </item>
-         <item row="11" column="0" colspan="2">
+         <item row="7" column="0">
+          <widget class="QCheckBox" name="opt_fit_images">
+           <property name="text">
+            <string>&amp;Resize images larger than the viewer window (needs restart)</string>
+           </property>
+          </widget>
+         </item>
+         <item row="8" column="0">
+          <widget class="QCheckBox" name="opt_remember_window_size">
+           <property name="text">
+            <string>Remember last used &amp;window size and layout</string>
+           </property>
+          </widget>
+         </item>
+         <item row="7" column="1">
+          <widget class="QCheckBox" name="opt_wheel_flips_pages">
+           <property name="text">
+            <string>Mouse &amp;wheel flips pages</string>
+           </property>
+          </widget>
+         </item>
+         <item row="8" column="1">
+          <widget class="QCheckBox" name="opt_remember_current_page">
+           <property name="text">
+            <string>Remember the &amp;current page when quitting</string>
+           </property>
+          </widget>
+         </item>
+         <item row="9" column="0">
          <widget class="QCheckBox" name="opt_line_scrolling_stops_on_pagebreaks">
           <property name="text">
            <string>Line &amp;scrolling stops at page breaks</string>
           </property>
          </widget>
         </item>
+         <item row="9" column="1">
+          <widget class="QCheckBox" name="opt_fullscreen_clock">
+           <property name="text">
+            <string>Show &amp;clock in full screen mode</string>
+           </property>
+          </widget>
+         </item>
        </layout>
       </item>
      </layout>
--- a/src/calibre/gui2/viewer/documentview.py
+++ b/src/calibre/gui2/viewer/documentview.py
@ -134,6 +134,7 @@ class Document(QWebPage): # {{{
        screen_width = QApplication.desktop().screenGeometry().width()
        # Leave some space for the scrollbar and some border
        self.max_fs_width = min(opts.max_fs_width, screen_width-50)
+        self.fullscreen_clock = opts.fullscreen_clock

    def fit_images(self):
        if self.do_fit_images and not self.in_paged_mode:
@ -193,6 +194,14 @@ class Document(QWebPage): # {{{
        self.read_anchor_positions(use_cache=False)
        self.first_load = False

+    def colors(self):
+        self.javascript('''
+            bs = getComputedStyle(document.body);
+            py_bridge.value = [bs.backgroundColor, bs.color]
+            ''')
+        ans = self.bridge_value
+        return (ans if isinstance(ans, list) else ['white', 'black'])
+
    def read_anchor_positions(self, use_cache=True):
        self.bridge_value = tuple(self.index_anchors)
        self.javascript(u'''
--- a/src/calibre/gui2/viewer/main.py
+++ b/src/calibre/gui2/viewer/main.py
@ -6,9 +6,10 @@ from functools import partial
 from threading import Thread

 from PyQt4.Qt import (QApplication, Qt, QIcon, QTimer, QByteArray, QSize,
-        QDoubleSpinBox, QLabel, QTextBrowser, QPropertyAnimation, QPainter,
-        QBrush, QColor, pyqtSignal, QUrl, QRegExpValidator, QRegExp, QLineEdit,
-        QToolButton, QMenu, QInputDialog, QAction, QKeySequence, QModelIndex)
+        QTime, QDoubleSpinBox, QLabel, QTextBrowser, QPropertyAnimation,
+        QPainter, QBrush, QColor, pyqtSignal, QUrl, QRegExpValidator, QRegExp,
+        QLineEdit, QToolButton, QMenu, QInputDialog, QAction, QKeySequence,
+        QModelIndex)

 from calibre.gui2.viewer.main_ui import Ui_EbookViewer
 from calibre.gui2.viewer.printing import Printing
@ -288,6 +289,23 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
        self.addAction(self.toggle_toolbar_action)
        self.full_screen_label_anim = QPropertyAnimation(
                self.full_screen_label, 'size')
+        self.clock_label = QLabel('99:99', self)
+        self.clock_label.setVisible(False)
+        self.clock_label.setFocusPolicy(Qt.NoFocus)
+        self.clock_label_style = '''
+            QLabel {
+                text-align: right;
+                border-width: 1px;
+                border-style: solid;
+                border-radius: 8px;
+                background-color: %s;
+                color: %s;
+                font-family: monospace;
+                font-size: larger;
+                padding: 5px;
+        }'''
+        self.clock_timer = QTimer(self)
+        self.clock_timer.timeout.connect(self.update_clock)
        self.esc_full_screen_action = a = QAction(self)
        self.addAction(a)
        a.setShortcut(Qt.Key_Escape)
@ -454,9 +472,29 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
        a.start()
        QTimer.singleShot(2750, self.full_screen_label.hide)
        self.view.document.switch_to_fullscreen_mode()
+        if self.view.document.fullscreen_clock:
+            self.show_clock()
+
+    def show_clock(self):
+        self.clock_label.setVisible(True)
+        self.clock_label.setText('99:99 AA')
+        self.clock_timer.start(1000)
+        self.clock_label.setStyleSheet(self.clock_label_style%
+                tuple(self.view.document.colors()))
+        self.clock_label.resize(self.clock_label.sizeHint())
+        sw = QApplication.desktop().screenGeometry(self.view)
+        self.clock_label.move(sw.width() - self.vertical_scrollbar.width() - 15
+                - self.clock_label.width(), sw.height() -
+                self.clock_label.height()-10)
+        self.update_clock()
+
+    def update_clock(self):
+        self.clock_label.setText(QTime.currentTime().toString('h:mm a'))

    def showNormal(self):
        self.view.document.page_position.save()
+        self.clock_label.setVisible(False)
+        self.clock_timer.stop()
        self.window_mode_changed = 'normal'
        self.esc_full_screen_action.setEnabled(False)
        self.tool_bar.setVisible(True)
--- a/src/calibre/library/caches.py
+++ b/src/calibre/library/caches.py
@ -156,12 +156,14 @@ def _match(query, value, matchkind):
                elif query == t:
                    return True
            elif matchkind == REGEXP_MATCH:
-                return re.search(query, t, re.I|re.UNICODE)
+                if re.search(query, t, re.I|re.UNICODE):
+                    return True
            elif matchkind == CONTAINS_MATCH:
                if pref_use_primary_find_in_search:
-                    return primary_find(query, t)[0] != -1
-                else:
-                    return query in t
+                    if primary_find(query, t)[0] != -1:
+                        return True
+                elif query in t:
+                        return True
        except re.error:
            pass
    return False
@ -913,7 +915,9 @@ class ResultCache(SearchQueryParser): # {{{

    def set(self, row, col, val, row_is_id=False):
        id = row if row_is_id else self._map_filtered[row]
-        self._data[id][col] = val
+        d = self._data[id]
+        d[col] = val
+        d.refresh_composites()

    def get(self, row, col, row_is_id=False):
        id = row if row_is_id else self._map_filtered[row]
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@ -251,6 +251,14 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
        defs['similar_tags_match_kind'] = 'match_all'
        defs['similar_series_search_key'] = 'series'
        defs['similar_series_match_kind'] = 'match_any'
+        defs['book_display_fields'] = [
+        ('title', False), ('authors', True), ('formats', True),
+        ('series', True), ('identifiers', True), ('tags', True),
+        ('path', True), ('publisher', False), ('rating', False),
+        ('author_sort', False), ('sort', False), ('timestamp', False),
+        ('uuid', False), ('comments', True), ('id', False), ('pubdate', False),
+        ('last_modified', False), ('size', False), ('languages', False),
+        ]

        # Migrate the bool tristate tweak
        defs['bools_are_tristate'] = \
@ -1088,8 +1096,11 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
        identical_book_ids = set([])
        if mi.authors:
            try:
+                quathors = mi.authors[:10] # Too many authors causes parsing of
+                                           # the search expression to fail
                query = u' and '.join([u'author:"=%s"'%(a.replace('"', '')) for a in
-                    mi.authors])
+                    quathors])
+                qauthors = mi.authors[10:]
            except ValueError:
                return identical_book_ids
            try:
@ -1097,6 +1108,18 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
            except:
                traceback.print_exc()
                return identical_book_ids
+            if qauthors and book_ids:
+                matches = set()
+                qauthors = {lower(x) for x in qauthors}
+                for book_id in book_ids:
+                    aut = self.authors(book_id, index_is_id=True)
+                    if aut:
+                        aut = {lower(x.replace('|', ',')) for x in
+                                aut.split(',')}
+                        if aut.issuperset(qauthors):
+                            matches.add(book_id)
+                book_ids = matches
+
            for book_id in book_ids:
                fbook_title = self.title(book_id, index_is_id=True)
                fbook_title = fuzzy_title(fbook_title)
@ -3737,4 +3760,42 @@ books_series_link      feeds
            'SELECT {0}, count(*) FROM books_{1}_link GROUP BY {0}'.format(
                fm['link_column'], fm['table']))

+    def all_author_names(self):
+        ai = self.FIELD_MAP['authors']
+        ans = set()
+        for rec in self.data.iterall():
+            auts = rec[ai]
+            if auts:
+                for x in auts.split(','):
+                    ans.add(x.replace('|', ','))
+        return ans
+
+    def all_tag_names(self):
+        ai = self.FIELD_MAP['tags']
+        ans = set()
+        for rec in self.data.iterall():
+            auts = rec[ai]
+            if auts:
+                for x in auts.split(','):
+                    ans.add(x)
+        return ans
+
+    def all_publisher_names(self):
+        ai = self.FIELD_MAP['publisher']
+        ans = set()
+        for rec in self.data.iterall():
+            auts = rec[ai]
+            if auts:
+                ans.add(auts)
+        return ans
+
+    def all_series_names(self):
+        ai = self.FIELD_MAP['series']
+        ans = set()
+        for rec in self.data.iterall():
+            auts = rec[ai]
+            if auts:
+                ans.add(auts)
+        return ans
+

--- a/src/calibre/library/prefs.py
+++ b/src/calibre/library/prefs.py
@ -34,6 +34,9 @@ class DBPrefs(dict):
    def to_raw(self, val):
        return json.dumps(val, indent=2, default=to_json)

+    def has_setting(self, key):
+        return key in self
+
    def __getitem__(self, key):
        try:
            return dict.__getitem__(self, key)
--- a/src/calibre/test_build.py
+++ b/src/calibre/test_build.py
@ -76,15 +76,15 @@ def test_qt():
    print ('Qt OK!')

 def test_imaging():
-    from calibre.utils.magick.draw import create_canvas, Image
-    im = create_canvas(20, 20, '#ffffff')
-    jpg = im.export('jpg')
-    Image().load(jpg)
-    im.export('png')
-    print ('ImageMagick OK!')
+    from calibre.ebooks import calibre_cover
+    data = calibre_cover('test', 'ok')
+    if len(data) > 1000:
+        print ('ImageMagick OK!')
+    else:
+        raise RuntimeError('ImageMagick choked!')
    from PIL import Image
-    i = Image.open(cStringIO.StringIO(jpg))
-    if i.size != (20, 20):
+    i = Image.open(cStringIO.StringIO(data))
+    if i.size < (20, 20):
        raise RuntimeError('PIL choked!')
    print ('PIL OK!')

@ -94,6 +94,12 @@ def test_unrar():
        raise RuntimeError('Failed to load libunrar')
    print ('Unrar OK!')

+def test_icu():
+    from calibre.utils.icu import _icu_not_ok
+    if _icu_not_ok:
+        raise RuntimeError('ICU module not loaded/valid')
+    print ('ICU OK!')
+
 def test():
    test_plugins()
    test_lxml()
@ -102,6 +108,7 @@ def test():
    test_qt()
    test_imaging()
    test_unrar()
+    test_icu()
    if iswindows:
        test_win32()
        test_winutil()
--- a/src/calibre/translations/af.po
+++ b/src/calibre/translations/af.po
--- a/src/calibre/translations/ar.po
+++ b/src/calibre/translations/ar.po
--- a/src/calibre/translations/ast.po
+++ b/src/calibre/translations/ast.po
--- a/src/calibre/translations/az.po
+++ b/src/calibre/translations/az.po
--- a/src/calibre/translations/bg.po
+++ b/src/calibre/translations/bg.po
--- a/src/calibre/translations/bn.po
+++ b/src/calibre/translations/bn.po
--- a/src/calibre/translations/br.po
+++ b/src/calibre/translations/br.po
--- a/src/calibre/translations/bs.po
+++ b/src/calibre/translations/bs.po
--- a/src/calibre/translations/ca.po
+++ b/src/calibre/translations/ca.po
--- a/src/calibre/translations/calibre.pot
+++ b/src/calibre/translations/calibre.pot
--- a/src/calibre/translations/cs.po
+++ b/src/calibre/translations/cs.po
--- a/src/calibre/translations/cy.po
+++ b/src/calibre/translations/cy.po
--- a/src/calibre/translations/da.po
+++ b/src/calibre/translations/da.po
--- a/src/calibre/translations/de.po
+++ b/src/calibre/translations/de.po
--- a/src/calibre/translations/el.po
+++ b/src/calibre/translations/el.po
--- a/src/calibre/translations/en_AU.po
+++ b/src/calibre/translations/en_AU.po
--- a/src/calibre/translations/en_CA.po
+++ b/src/calibre/translations/en_CA.po
--- a/src/calibre/translations/en_GB.po
+++ b/src/calibre/translations/en_GB.po
--- a/src/calibre/translations/eo.po
+++ b/src/calibre/translations/eo.po
--- a/src/calibre/translations/es.po
+++ b/src/calibre/translations/es.po
--- a/src/calibre/translations/et.po
+++ b/src/calibre/translations/et.po
--- a/src/calibre/translations/eu.po
+++ b/src/calibre/translations/eu.po
--- a/src/calibre/translations/fa.po
+++ b/src/calibre/translations/fa.po
--- a/src/calibre/translations/fi.po
+++ b/src/calibre/translations/fi.po
--- a/src/calibre/translations/fo.po
+++ b/src/calibre/translations/fo.po
--- a/src/calibre/translations/fr.po
+++ b/src/calibre/translations/fr.po
--- a/src/calibre/translations/fr_CA.po
+++ b/src/calibre/translations/fr_CA.po
--- a/src/calibre/translations/gl.po
+++ b/src/calibre/translations/gl.po
--- a/src/calibre/translations/gu.po
+++ b/src/calibre/translations/gu.po
--- a/src/calibre/translations/he.po
+++ b/src/calibre/translations/he.po
--- a/src/calibre/translations/hi.po
+++ b/src/calibre/translations/hi.po
--- a/src/calibre/translations/hr.po
+++ b/src/calibre/translations/hr.po
--- a/src/calibre/translations/hu.po
+++ b/src/calibre/translations/hu.po
--- a/src/calibre/translations/id.po
+++ b/src/calibre/translations/id.po
--- a/src/calibre/translations/is.po
+++ b/src/calibre/translations/is.po
--- a/src/calibre/translations/it.po
+++ b/src/calibre/translations/it.po
--- a/src/calibre/translations/ja.po
+++ b/src/calibre/translations/ja.po
--- a/Show More
+++ b/Show More