From c06f894229a15d35cc88c98b52177a76399dcd7f Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sat, 11 Apr 2009 10:31:47 -0400
Subject: [PATCH 1/8] USBMS: Do not check for books in subdirs on devices that
 do not support subdirs.

---
 src/calibre/devices/usbms/driver.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/calibre/devices/usbms/driver.py b/src/calibre/devices/usbms/driver.py
index 68041a19cd..0a66b78014 100644
--- a/src/calibre/devices/usbms/driver.py
+++ b/src/calibre/devices/usbms/driver.py
@@ -57,12 +57,17 @@ class USBMS(Device):
         prefix = self._card_prefix if oncard else self._main_prefix
         ebook_dir = self.EBOOK_DIR_CARD if oncard else self.EBOOK_DIR_MAIN
 
-        # Get all books in all directories under the root ebook_dir directory
-        for path, dirs, files in os.walk(os.path.join(prefix, ebook_dir)):
-            # Filter out anything that isn't in the list of supported ebook
-            # types
-            for book_type in self.FORMATS:
-                for filename in fnmatch.filter(files, '*.%s' % (book_type)):
+        # Get all books in the ebook_dir directory
+        if self.SUPPORTS_SUB_DIRS:
+            for path, dirs, files in os.walk(os.path.join(prefix, ebook_dir)):
+                # Filter out anything that isn't in the list of supported ebook types
+                for book_type in self.FORMATS:
+                    for filename in fnmatch.filter(files, '*.%s' % (book_type)):
+                        bl.append(self.__class__.book_from_path(os.path.join(path, filename)))
+        else:
+            path = os.path.join(prefix, ebook_dir)
+            for filename in os.listdir(path):
+                if path_to_ext(filename) in self.FORMATS:
                     bl.append(self.__class__.book_from_path(os.path.join(path, filename)))
         return bl
 

From 8d774b6e7c6c3cc41f2d41594622fa5bf6ba26c0 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sat, 11 Apr 2009 11:46:55 -0400
Subject: [PATCH 2/8] EPubInput: make convert conform to interface.

---
 src/calibre/ebooks/epub/input.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/calibre/ebooks/epub/input.py b/src/calibre/ebooks/epub/input.py
index 4c1cdbfcf5..5c8a5c9d89 100644
--- a/src/calibre/ebooks/epub/input.py
+++ b/src/calibre/ebooks/epub/input.py
@@ -51,8 +51,7 @@ class EPUBInput(InputFormatPlugin):
             traceback.print_exc()
         return False
 
-    def convert(self, stream, options, file_ext, parse_cache, log, 
-                accelerators):
+    def convert(self, stream, options, file_ext, log, accelerators):
         from calibre.utils.zipfile import ZipFile
         from calibre import walk
         from calibre.ebooks import DRMError
@@ -72,6 +71,5 @@ class EPUBInput(InputFormatPlugin):
         if os.path.exists(encfile):
             if not self.process_encryption(encfile, opf, log):
                 raise DRMError(os.path.basename(path))
-        
-        return opf
-        
+
+        return os.path.join(os.getcwd(), opf)

From 316b5670c5030ec61df704c15dbeb1791b49d3af Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sat, 11 Apr 2009 17:38:12 -0400
Subject: [PATCH 3/8] space symbol

---
 src/calibre/ebooks/htmlsymbols.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/ebooks/htmlsymbols.py b/src/calibre/ebooks/htmlsymbols.py
index fa10873845..d46e4c707a 100644
--- a/src/calibre/ebooks/htmlsymbols.py
+++ b/src/calibre/ebooks/htmlsymbols.py
@@ -306,5 +306,7 @@ HTML_SYMBOLS = {
                 u'ý' : ['&#253;', '&yacute;'], # latin small letter y with acute
                 u'þ' : ['&#254;', '&thorn;'], # latin small letter thorn
                 u'ÿ' : ['&#255;', '&yuml;'], # latin small letter y with diaeresis
+                # More
+                u' ' : ['&#160;'],
                }
 

From b963cdc58104300189b5bb258b09e7065e0e0639 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sat, 11 Apr 2009 19:32:39 -0400
Subject: [PATCH 4/8] MobiReader only reads part of file when getting metadata

---
 src/calibre/ebooks/mobi/reader.py | 101 +++++++++++++++++++++++-------
 1 file changed, 79 insertions(+), 22 deletions(-)

diff --git a/src/calibre/ebooks/mobi/reader.py b/src/calibre/ebooks/mobi/reader.py
index fa43a7af42..38d8255348 100644
--- a/src/calibre/ebooks/mobi/reader.py
+++ b/src/calibre/ebooks/mobi/reader.py
@@ -157,6 +157,62 @@ class BookHeader(object):
                 self.exth.mi.language = self.language
 
 
+class MetadataHeader(BookHeader):
+    def __init__(self, stream, log):
+        self.stream = stream
+        
+        self.ident = self.identity()
+        self.num_sections = self.section_count()
+        
+        if self.num_sections >= 2:
+            header = self.header()
+            BookHeader.__init__(self, header, self.ident, None, log)
+        else:
+            self.exth = None
+            
+    def identity(self):
+        self.stream.seek(60)
+        ident = self.stream.read(8).upper()
+        
+        if ident not in ['BOOKMOBI', 'TEXTREAD']:
+            raise MobiError('Unknown book type: %s' % ident)
+        return ident
+            
+    def section_count(self):
+        self.stream.seek(76)
+        return struct.unpack('>H', self.stream.read(2))[0]
+            
+    def section_offset(self, number):
+        self.stream.seek(78+number*8)
+        return struct.unpack('>LBBBB', self.stream.read(8))[0]
+        
+    def header(self):
+        section_headers = []
+            
+        # First section with the metadata
+        section_headers.append(self.section_offset(0))
+        # Second section used to get the lengh of the first
+        section_headers.append(self.section_offset(1))
+
+        end_off = section_headers[1]
+        off = section_headers[0]
+    
+        self.stream.seek(off)
+        return self.stream.read(end_off - off)
+
+    def section_data(self, number):
+        start = self.section_offset(number)
+        
+        if number == self.num_sections -1:
+            end = os.stat(self.stream.name).st_size
+        else:
+            end = self.section_offset(number + 1)
+            
+        self.stream.seek(start)
+        
+        return self.stream.read(end - start)
+
+
 class MobiReader(object):
     PAGE_BREAK_PAT = re.compile(r'(<[/]{0,1}mbp:pagebreak\s*[/]{0,1}>)+', re.IGNORECASE)
     IMAGE_ATTRS = ('lowrecindex', 'recindex', 'hirecindex')
@@ -414,7 +470,7 @@ class MobiReader(object):
     def create_opf(self, htmlfile, guide=None, root=None):
         mi = getattr(self.book_header.exth, 'mi', self.embedded_mi)
         if mi is None:
-            mi = MetaInformation(self.title, [_('Unknown')])
+            mi = MetaInformation(self.book_header.title, [_('Unknown')])
         opf = OPFCreator(os.path.dirname(htmlfile), mi)
         if hasattr(self.book_header.exth, 'cover_offset'):
             opf.cover = 'images/%05d.jpg'%(self.book_header.exth.cover_offset+1)
@@ -595,25 +651,26 @@ class MobiReader(object):
 def get_metadata(stream):
     from calibre.utils.logging import Log
     log = Log()
-    mr = MobiReader(stream, log)
-    if mr.book_header.exth is None:
-        mi = MetaInformation(mr.name, [_('Unknown')])
-    else:
-        mi = mr.create_opf('dummy.html')[0]
-        try:
-            if hasattr(mr.book_header.exth, 'cover_offset'):
-                cover_index = mr.book_header.first_image_index + \
-                              mr.book_header.exth.cover_offset
-                data  = mr.sections[int(cover_index)][0]
-            else:
-                data  = mr.sections[mr.book_header.first_image_index][0]
-            buf = cStringIO.StringIO(data)
-            im = PILImage.open(buf)
-            obuf = cStringIO.StringIO()
-            im.convert('RGBA').save(obuf, format='JPEG')
-            mi.cover_data = ('jpg', obuf.getvalue())
-        except:
-            log.exception()
+    
+    mi = MetaInformation(stream.name, [_('Unknown')])
+    try:
+        mh = MetadataHeader(stream, log)
+
+        if mh.exth is not None:
+            if mh.exth.mi is not None:
+                mi = mh.exth.mi
+            
+        if hasattr(mh.exth, 'cover_offset'):
+            cover_index = mh.first_image_index + mh.exth.cover_offset
+            data  = mh.section_data(int(cover_index))
+        else:
+            data  = mh.section_data(mh.first_image_index)
+        buf = cStringIO.StringIO(data)
+        im = PILImage.open(buf)
+        obuf = cStringIO.StringIO()
+        im.convert('RGBA').save(obuf, format='JPEG')
+        mi.cover_data = ('jpg', obuf.getvalue())
+    except:
+        log.exception()
+    
     return mi
-
-

From eed1f6923191b86f53ed8c489d98f4385384a0e9 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sat, 11 Apr 2009 20:22:03 -0400
Subject: [PATCH 5/8] MobiReader read metadata from content with older prc
 files.

---
 src/calibre/ebooks/mobi/reader.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/mobi/reader.py b/src/calibre/ebooks/mobi/reader.py
index 38d8255348..9e29ea09b3 100644
--- a/src/calibre/ebooks/mobi/reader.py
+++ b/src/calibre/ebooks/mobi/reader.py
@@ -15,7 +15,8 @@ except ImportError:
 
 from lxml import html, etree
 
-from calibre import entity_to_unicode
+from calibre import entity_to_unicode, sanitize_file_name
+from calibre.ptempfile import TemporaryDirectory
 from calibre.ebooks import DRMError
 from calibre.ebooks.chardet import ENCODING_PATS
 from calibre.ebooks.mobi import MobiError
@@ -25,7 +26,6 @@ from calibre.ebooks.mobi.langcodes import main_language, sub_language
 from calibre.ebooks.metadata import MetaInformation
 from calibre.ebooks.metadata.opf2 import OPFCreator, OPF
 from calibre.ebooks.metadata.toc import TOC
-from calibre import sanitize_file_name
 
 class EXTHHeader(object):
 
@@ -659,6 +659,13 @@ def get_metadata(stream):
         if mh.exth is not None:
             if mh.exth.mi is not None:
                 mi = mh.exth.mi
+        else:
+            with TemporaryDirectory('_mobi_meta_reader') as tdir:
+                mr = MobiReader(stream, log)
+                parse_cache = {}
+                mr.extract_content(tdir, parse_cache)
+                if mr.embedded_mi is not None:
+                    mi = mr.embedded_mi
             
         if hasattr(mh.exth, 'cover_offset'):
             cover_index = mh.first_image_index + mh.exth.cover_offset

From 632db425a2be1ccb36749bb3f029b75e3cb8a26e Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sat, 11 Apr 2009 20:32:00 -0400
Subject: [PATCH 6/8] MobiReader do not include file path in default metadata
 title.

---
 src/calibre/ebooks/mobi/reader.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/mobi/reader.py b/src/calibre/ebooks/mobi/reader.py
index 9e29ea09b3..161a6995ba 100644
--- a/src/calibre/ebooks/mobi/reader.py
+++ b/src/calibre/ebooks/mobi/reader.py
@@ -652,7 +652,7 @@ def get_metadata(stream):
     from calibre.utils.logging import Log
     log = Log()
     
-    mi = MetaInformation(stream.name, [_('Unknown')])
+    mi = MetaInformation(os.path.basename(stream.name), [_('Unknown')])
     try:
         mh = MetadataHeader(stream, log)
 

From a48dd172db1e35f5cf54628051e8e7d44852217d Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sun, 12 Apr 2009 10:03:46 -0400
Subject: [PATCH 7/8] PDFMetadataWriter working

---
 src/calibre/customize/builtins.py  | 11 +++++++++++
 src/calibre/ebooks/metadata/pdf.py | 31 +++++++++++++++++++-----------
 src/calibre/ebooks/oeb/iterator.py |  1 +
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 484d46dc36..a9fc342059 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -262,6 +262,17 @@ class MOBIMetadataWriter(MetadataWriterPlugin):
     def set_metadata(self, stream, mi, type):
         from calibre.ebooks.metadata.mobi import set_metadata
         set_metadata(stream, mi)
+        
+class PDFMetadataWriter(MetadataWriterPlugin):
+
+    name        = 'Set PDF metadata'
+    file_types  = set(['pdf'])
+    description = _('Set metadata in %s files') % 'PDF'
+    author      = 'John Schember'
+    
+    def set_metadata(self, stream, mi, type):
+        from calibre.ebooks.metadata.pdf import set_metadata
+        set_metadata(stream, mi)
 
 
 from calibre.ebooks.epub.input import EPUBInput
diff --git a/src/calibre/ebooks/metadata/pdf.py b/src/calibre/ebooks/metadata/pdf.py
index 6b94b07275..06a02939ba 100644
--- a/src/calibre/ebooks/metadata/pdf.py
+++ b/src/calibre/ebooks/metadata/pdf.py
@@ -5,7 +5,7 @@ from __future__ import with_statement
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 
-import sys, os, re, StringIO
+import sys, os, StringIO
 
 from calibre.ebooks.metadata import MetaInformation, authors_to_string
 from calibre.ptempfile import TemporaryDirectory
@@ -52,18 +52,27 @@ def get_metadata(stream, extract_cover=True):
 
 def set_metadata(stream, mi):
     stream.seek(0)
-    raw = stream.read()
-    if mi.title:
-        tit = mi.title.encode('utf-8') if isinstance(mi.title, unicode) else mi.title
-        raw = re.compile(r'<<.*?/Title\((.+?)\)', re.DOTALL).sub(lambda m: m.group().replace(m.group(1), tit), raw)
-    if mi.authors:
-        au = authors_to_string(mi.authors)
-        if isinstance(au, unicode):
-            au = au.encode('utf-8')
-        raw = re.compile(r'<<.*?/Author\((.+?)\)', re.DOTALL).sub(lambda m: m.group().replace(m.group(1), au), raw)
+    
+    # Use a StringIO object for the pdf because we will want to over
+    # write it later and if we are working on the stream directly it
+    # could cause some issues.
+    raw = StringIO.StringIO(stream.read())
+    orig_pdf = PdfFileReader(raw)
+    
+    title = mi.title if mi.title else orig_pdf.documentInfo.title
+    author = authors_to_string(mi.authors) if mi.authors else orig_pdf.documentInfo.author
+    
+    out_pdf = PdfFileWriter(title=title, author=author)
+    for page in orig_pdf.pages:
+        out_pdf.addPage(page)
+        
+    out_str = StringIO.StringIO()
+    out_pdf.write(out_str)
+    
     stream.seek(0)
     stream.truncate()
-    stream.write(raw)
+    out_str.seek(0)
+    stream.write(out_str.read())
     stream.seek(0)
 
 def get_cover(stream):
diff --git a/src/calibre/ebooks/oeb/iterator.py b/src/calibre/ebooks/oeb/iterator.py
index ec0eda908a..88fffc604a 100644
--- a/src/calibre/ebooks/oeb/iterator.py
+++ b/src/calibre/ebooks/oeb/iterator.py
@@ -1,3 +1,4 @@
+from __future__ import with_statement
 __license__   = 'GPL v3'
 __copyright__ = '2008 Kovid Goyal <kovid at kovidgoyal.net>'
 

From 1bd3829c6b4442283541c31e3630c0ca16f643da Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sun, 12 Apr 2009 12:48:16 -0400
Subject: [PATCH 8/8] Don't allow editing of config category names. Fix import.

---
 src/calibre/gui2/dialogs/config.py |   2 +-
 src/calibre/gui2/dialogs/config.ui | 794 +++++++++++++++--------------
 2 files changed, 399 insertions(+), 397 deletions(-)

diff --git a/src/calibre/gui2/dialogs/config.py b/src/calibre/gui2/dialogs/config.py
index 831d44251e..1b2a2b8702 100644
--- a/src/calibre/gui2/dialogs/config.py
+++ b/src/calibre/gui2/dialogs/config.py
@@ -18,7 +18,7 @@ from calibre.utils.config import prefs
 from calibre.gui2.widgets import FilenamePattern
 from calibre.gui2.library import BooksModel
 from calibre.ebooks import BOOK_EXTENSIONS
-from calibre.ebooks.epub.iterator import is_supported
+from calibre.ebooks.oeb.iterator import is_supported
 from calibre.library import server_config
 from calibre.customize.ui import initialized_plugins, is_disabled, enable_plugin, \
                                  disable_plugin, customize_plugin, \
diff --git a/src/calibre/gui2/dialogs/config.ui b/src/calibre/gui2/dialogs/config.ui
index 9afcac8914..ac432c52c0 100644
--- a/src/calibre/gui2/dialogs/config.ui
+++ b/src/calibre/gui2/dialogs/config.ui
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >
  <author>Kovid Goyal</author>
  <class>Dialog</class>
- <widget class="QDialog" name="Dialog">
-  <property name="geometry">
+ <widget class="QDialog" name="Dialog" >
+  <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
@@ -11,108 +10,111 @@
     <height>557</height>
    </rect>
   </property>
-  <property name="windowTitle">
+  <property name="windowTitle" >
    <string>Configuration</string>
   </property>
-  <property name="windowIcon">
-   <iconset resource="../images.qrc">
+  <property name="windowIcon" >
+   <iconset resource="../images.qrc" >
     <normaloff>:/images/config.svg</normaloff>:/images/config.svg</iconset>
   </property>
-  <layout class="QGridLayout">
-   <item row="0" column="0">
-    <layout class="QHBoxLayout">
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <layout class="QHBoxLayout" >
      <item>
-      <widget class="QListView" name="category_view">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+      <widget class="QListView" name="category_view" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Expanding" hsizetype="MinimumExpanding" >
          <horstretch>1</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="font">
+       <property name="font" >
         <font>
          <weight>75</weight>
          <bold>true</bold>
         </font>
        </property>
-       <property name="tabKeyNavigation">
+       <property name="editTriggers" >
+        <set>QAbstractItemView::NoEditTriggers</set>
+       </property>
+       <property name="tabKeyNavigation" >
         <bool>true</bool>
        </property>
-       <property name="showDropIndicator" stdset="0">
+       <property name="showDropIndicator" stdset="0" >
         <bool>false</bool>
        </property>
-       <property name="iconSize">
+       <property name="iconSize" >
         <size>
          <width>48</width>
          <height>48</height>
         </size>
        </property>
-       <property name="verticalScrollMode">
+       <property name="verticalScrollMode" >
         <enum>QAbstractItemView::ScrollPerItem</enum>
        </property>
-       <property name="horizontalScrollMode">
+       <property name="horizontalScrollMode" >
         <enum>QAbstractItemView::ScrollPerPixel</enum>
        </property>
-       <property name="flow">
+       <property name="flow" >
         <enum>QListView::TopToBottom</enum>
        </property>
-       <property name="spacing">
+       <property name="spacing" >
         <number>20</number>
        </property>
-       <property name="viewMode">
+       <property name="viewMode" >
         <enum>QListView::ListMode</enum>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QStackedWidget" name="stackedWidget">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+      <widget class="QStackedWidget" name="stackedWidget" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
          <horstretch>100</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="currentIndex">
+       <property name="currentIndex" >
         <number>0</number>
        </property>
-       <widget class="QWidget" name="page_3">
-        <layout class="QVBoxLayout" name="verticalLayout">
+       <widget class="QWidget" name="page_3" >
+        <layout class="QVBoxLayout" name="verticalLayout" >
          <item>
-          <layout class="QVBoxLayout" name="_2">
+          <layout class="QVBoxLayout" name="_2" >
            <item>
-            <widget class="QLabel" name="label">
-             <property name="maximumSize">
+            <widget class="QLabel" name="label" >
+             <property name="maximumSize" >
               <size>
                <width>16777215</width>
                <height>70</height>
               </size>
              </property>
-             <property name="text">
+             <property name="text" >
               <string>&amp;Location of ebooks (The ebooks are stored in folders sorted by author and metadata is stored in the file metadata.db)</string>
              </property>
-             <property name="wordWrap">
+             <property name="wordWrap" >
               <bool>true</bool>
              </property>
-             <property name="buddy">
+             <property name="buddy" >
               <cstring>location</cstring>
              </property>
             </widget>
            </item>
            <item>
-            <layout class="QHBoxLayout" name="_3">
+            <layout class="QHBoxLayout" name="_3" >
              <item>
-              <widget class="QLineEdit" name="location"/>
+              <widget class="QLineEdit" name="location" />
              </item>
              <item>
-              <widget class="QToolButton" name="browse_button">
-               <property name="toolTip">
+              <widget class="QToolButton" name="browse_button" >
+               <property name="toolTip" >
                 <string>Browse for the new database location</string>
                </property>
-               <property name="text">
+               <property name="text" >
                 <string>...</string>
                </property>
-               <property name="icon">
-                <iconset resource="../images.qrc">
+               <property name="icon" >
+                <iconset resource="../images.qrc" >
                  <normaloff>:/images/mimetypes/dir.svg</normaloff>:/images/mimetypes/dir.svg</iconset>
                </property>
               </widget>
@@ -122,107 +124,107 @@
           </layout>
          </item>
          <item>
-          <widget class="QCheckBox" name="new_version_notification">
-           <property name="text">
+          <widget class="QCheckBox" name="new_version_notification" >
+           <property name="text" >
             <string>Show notification when &amp;new version is available</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QCheckBox" name="pdf_metadata">
-           <property name="toolTip">
+          <widget class="QCheckBox" name="pdf_metadata" >
+           <property name="toolTip" >
             <string>If you disable this setting, metadata is guessed from the filename instead. This can be configured in the Advanced section.</string>
            </property>
-           <property name="text">
+           <property name="text" >
             <string>Read &amp;metadata from files</string>
            </property>
-           <property name="checked">
+           <property name="checked" >
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
-          <layout class="QGridLayout" name="gridLayout_2">
-           <item row="0" column="0">
-            <widget class="QLabel" name="label_5">
-             <property name="text">
+          <layout class="QGridLayout" name="gridLayout_2" >
+           <item row="0" column="0" >
+            <widget class="QLabel" name="label_5" >
+             <property name="text" >
               <string>Format for &amp;single file save:</string>
              </property>
-             <property name="buddy">
+             <property name="buddy" >
               <cstring>single_format</cstring>
              </property>
             </widget>
            </item>
-           <item row="0" column="1">
-            <widget class="QComboBox" name="single_format"/>
+           <item row="0" column="1" >
+            <widget class="QComboBox" name="single_format" />
            </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="label_2">
-             <property name="text">
+           <item row="1" column="0" >
+            <widget class="QLabel" name="label_2" >
+             <property name="text" >
               <string>Default network &amp;timeout:</string>
              </property>
-             <property name="buddy">
+             <property name="buddy" >
               <cstring>timeout</cstring>
              </property>
             </widget>
            </item>
-           <item row="1" column="1">
-            <widget class="QSpinBox" name="timeout">
-             <property name="toolTip">
+           <item row="1" column="1" >
+            <widget class="QSpinBox" name="timeout" >
+             <property name="toolTip" >
               <string>Set the default timeout for network fetches (i.e. anytime we go out to the internet to get information)</string>
              </property>
-             <property name="suffix">
+             <property name="suffix" >
               <string> seconds</string>
              </property>
-             <property name="minimum">
+             <property name="minimum" >
               <number>2</number>
              </property>
-             <property name="maximum">
+             <property name="maximum" >
               <number>120</number>
              </property>
-             <property name="value">
+             <property name="value" >
               <number>5</number>
              </property>
             </widget>
            </item>
-           <item row="2" column="1">
-            <widget class="QComboBox" name="language"/>
+           <item row="2" column="1" >
+            <widget class="QComboBox" name="language" />
            </item>
-           <item row="2" column="0">
-            <widget class="QLabel" name="label_7">
-             <property name="text">
+           <item row="2" column="0" >
+            <widget class="QLabel" name="label_7" >
+             <property name="text" >
               <string>Choose &amp;language (requires restart):</string>
              </property>
-             <property name="buddy">
+             <property name="buddy" >
               <cstring>language</cstring>
              </property>
             </widget>
            </item>
-           <item row="3" column="1">
-            <widget class="QComboBox" name="priority">
+           <item row="3" column="1" >
+            <widget class="QComboBox" name="priority" >
              <item>
-              <property name="text">
+              <property name="text" >
                <string>Normal</string>
               </property>
              </item>
              <item>
-              <property name="text">
+              <property name="text" >
                <string>High</string>
               </property>
              </item>
              <item>
-              <property name="text">
+              <property name="text" >
                <string>Low</string>
               </property>
              </item>
             </widget>
            </item>
-           <item row="3" column="0">
-            <widget class="QLabel" name="priority_label">
-             <property name="text">
+           <item row="3" column="0" >
+            <widget class="QLabel" name="priority_label" >
+             <property name="text" >
               <string>Job &amp;priority:</string>
              </property>
-             <property name="buddy">
+             <property name="buddy" >
               <cstring>priority</cstring>
              </property>
             </widget>
@@ -230,19 +232,19 @@
           </layout>
          </item>
          <item>
-          <widget class="QGroupBox" name="dirs_box">
-           <property name="title">
+          <widget class="QGroupBox" name="dirs_box" >
+           <property name="title" >
             <string>Frequently used directories</string>
            </property>
-           <layout class="QGridLayout" name="_5">
-            <item row="0" column="0">
-             <layout class="QHBoxLayout" name="_6">
+           <layout class="QGridLayout" name="_5" >
+            <item row="0" column="0" >
+             <layout class="QHBoxLayout" name="_6" >
               <item>
-               <widget class="QListWidget" name="directory_list">
-                <property name="alternatingRowColors">
+               <widget class="QListWidget" name="directory_list" >
+                <property name="alternatingRowColors" >
                  <bool>true</bool>
                 </property>
-                <property name="iconSize">
+                <property name="iconSize" >
                  <size>
                   <width>22</width>
                   <height>22</height>
@@ -251,13 +253,13 @@
                </widget>
               </item>
               <item>
-               <layout class="QVBoxLayout" name="_7">
+               <layout class="QVBoxLayout" name="_7" >
                 <item>
                  <spacer>
-                  <property name="orientation">
+                  <property name="orientation" >
                    <enum>Qt::Vertical</enum>
                   </property>
-                  <property name="sizeHint" stdset="0">
+                  <property name="sizeHint" stdset="0" >
                    <size>
                     <width>20</width>
                     <height>40</height>
@@ -266,25 +268,25 @@
                  </spacer>
                 </item>
                 <item>
-                 <widget class="QToolButton" name="add_button">
-                  <property name="toolTip">
+                 <widget class="QToolButton" name="add_button" >
+                  <property name="toolTip" >
                    <string>Add a directory to the frequently used directories list</string>
                   </property>
-                  <property name="text">
+                  <property name="text" >
                    <string>...</string>
                   </property>
-                  <property name="icon">
-                   <iconset resource="../images.qrc">
+                  <property name="icon" >
+                   <iconset resource="../images.qrc" >
                     <normaloff>:/images/plus.svg</normaloff>:/images/plus.svg</iconset>
                   </property>
                  </widget>
                 </item>
                 <item>
                  <spacer>
-                  <property name="orientation">
+                  <property name="orientation" >
                    <enum>Qt::Vertical</enum>
                   </property>
-                  <property name="sizeHint" stdset="0">
+                  <property name="sizeHint" stdset="0" >
                    <size>
                     <width>20</width>
                     <height>40</height>
@@ -293,25 +295,25 @@
                  </spacer>
                 </item>
                 <item>
-                 <widget class="QToolButton" name="remove_button">
-                  <property name="toolTip">
+                 <widget class="QToolButton" name="remove_button" >
+                  <property name="toolTip" >
                    <string>Remove a directory from the frequently used directories list</string>
                   </property>
-                  <property name="text">
+                  <property name="text" >
                    <string>...</string>
                   </property>
-                  <property name="icon">
-                   <iconset resource="../images.qrc">
+                  <property name="icon" >
+                   <iconset resource="../images.qrc" >
                     <normaloff>:/images/list_remove.svg</normaloff>:/images/list_remove.svg</iconset>
                   </property>
                  </widget>
                 </item>
                 <item>
                  <spacer>
-                  <property name="orientation">
+                  <property name="orientation" >
                    <enum>Qt::Vertical</enum>
                   </property>
-                  <property name="sizeHint" stdset="0">
+                  <property name="sizeHint" stdset="0" >
                    <size>
                     <width>20</width>
                     <height>40</height>
@@ -328,111 +330,111 @@
          </item>
         </layout>
        </widget>
-       <widget class="QWidget" name="page">
-        <layout class="QVBoxLayout" name="verticalLayout_4">
+       <widget class="QWidget" name="page" >
+        <layout class="QVBoxLayout" name="verticalLayout_4" >
          <item>
-          <widget class="QCheckBox" name="roman_numerals">
-           <property name="text">
+          <widget class="QCheckBox" name="roman_numerals" >
+           <property name="text" >
             <string>Use &amp;Roman numerals for series number</string>
            </property>
-           <property name="checked">
+           <property name="checked" >
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QCheckBox" name="systray_icon">
-           <property name="text">
+          <widget class="QCheckBox" name="systray_icon" >
+           <property name="text" >
             <string>Enable system &amp;tray icon (needs restart)</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QCheckBox" name="systray_notifications">
-           <property name="text">
+          <widget class="QCheckBox" name="systray_notifications" >
+           <property name="text" >
             <string>Show &amp;notifications in system tray</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QCheckBox" name="separate_cover_flow">
-           <property name="text">
+          <widget class="QCheckBox" name="separate_cover_flow" >
+           <property name="text" >
             <string>Show cover &amp;browser in a separate window (needs restart)</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QCheckBox" name="sync_news">
-           <property name="text">
+          <widget class="QCheckBox" name="sync_news" >
+           <property name="text" >
             <string>Automatically send downloaded &amp;news to ebook reader</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QCheckBox" name="delete_news">
-           <property name="text">
+          <widget class="QCheckBox" name="delete_news" >
+           <property name="text" >
             <string>&amp;Delete news from library when it is automatically sent to reader</string>
            </property>
           </widget>
          </item>
          <item>
-          <layout class="QHBoxLayout" name="horizontalLayout">
+          <layout class="QHBoxLayout" name="horizontalLayout" >
            <item>
-            <widget class="QLabel" name="label_6">
-             <property name="text">
+            <widget class="QLabel" name="label_6" >
+             <property name="text" >
               <string>&amp;Number of covers to show in browse mode (needs restart):</string>
              </property>
-             <property name="buddy">
+             <property name="buddy" >
               <cstring>cover_browse</cstring>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="QSpinBox" name="cover_browse"/>
+            <widget class="QSpinBox" name="cover_browse" />
            </item>
           </layout>
          </item>
          <item>
-          <widget class="QGroupBox" name="groupBox_2">
-           <property name="title">
+          <widget class="QGroupBox" name="groupBox_2" >
+           <property name="title" >
             <string>Toolbar</string>
            </property>
-           <layout class="QGridLayout" name="gridLayout">
-            <item row="0" column="1">
-             <widget class="QComboBox" name="toolbar_button_size">
+           <layout class="QGridLayout" name="gridLayout" >
+            <item row="0" column="1" >
+             <widget class="QComboBox" name="toolbar_button_size" >
               <item>
-               <property name="text">
+               <property name="text" >
                 <string>Large</string>
                </property>
               </item>
               <item>
-               <property name="text">
+               <property name="text" >
                 <string>Medium</string>
                </property>
               </item>
               <item>
-               <property name="text">
+               <property name="text" >
                 <string>Small</string>
                </property>
               </item>
              </widget>
             </item>
-            <item row="0" column="0">
-             <widget class="QLabel" name="label_4">
-              <property name="text">
+            <item row="0" column="0" >
+             <widget class="QLabel" name="label_4" >
+              <property name="text" >
                <string>&amp;Button size in toolbar</string>
               </property>
-              <property name="buddy">
+              <property name="buddy" >
                <cstring>toolbar_button_size</cstring>
               </property>
              </widget>
             </item>
-            <item row="1" column="0">
-             <widget class="QCheckBox" name="show_toolbar_text">
-              <property name="text">
+            <item row="1" column="0" >
+             <widget class="QCheckBox" name="show_toolbar_text" >
+              <property name="text" >
                <string>Show &amp;text in toolbar buttons</string>
               </property>
-              <property name="checked">
+              <property name="checked" >
                <bool>true</bool>
               </property>
              </widget>
@@ -441,44 +443,44 @@
           </widget>
          </item>
          <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_7">
+          <layout class="QHBoxLayout" name="horizontalLayout_7" >
            <item>
-            <widget class="QGroupBox" name="groupBox">
-             <property name="title">
+            <widget class="QGroupBox" name="groupBox" >
+             <property name="title" >
               <string>Select visible &amp;columns in library view</string>
              </property>
-             <layout class="QVBoxLayout" name="verticalLayout_7">
+             <layout class="QVBoxLayout" name="verticalLayout_7" >
               <item>
-               <layout class="QHBoxLayout" name="horizontalLayout_3">
+               <layout class="QHBoxLayout" name="horizontalLayout_3" >
                 <item>
-                 <widget class="QListWidget" name="columns">
-                  <property name="alternatingRowColors">
+                 <widget class="QListWidget" name="columns" >
+                  <property name="alternatingRowColors" >
                    <bool>true</bool>
                   </property>
-                  <property name="selectionBehavior">
+                  <property name="selectionBehavior" >
                    <enum>QAbstractItemView::SelectRows</enum>
                   </property>
                  </widget>
                 </item>
                 <item>
-                 <layout class="QVBoxLayout" name="verticalLayout_3">
+                 <layout class="QVBoxLayout" name="verticalLayout_3" >
                   <item>
-                   <widget class="QToolButton" name="column_up">
-                    <property name="text">
+                   <widget class="QToolButton" name="column_up" >
+                    <property name="text" >
                      <string>...</string>
                     </property>
-                    <property name="icon">
-                     <iconset resource="../images.qrc">
+                    <property name="icon" >
+                     <iconset resource="../images.qrc" >
                       <normaloff>:/images/arrow-up.svg</normaloff>:/images/arrow-up.svg</iconset>
                     </property>
                    </widget>
                   </item>
                   <item>
-                   <spacer name="verticalSpacer_2">
-                    <property name="orientation">
+                   <spacer name="verticalSpacer_2" >
+                    <property name="orientation" >
                      <enum>Qt::Vertical</enum>
                     </property>
-                    <property name="sizeHint" stdset="0">
+                    <property name="sizeHint" stdset="0" >
                      <size>
                       <width>20</width>
                       <height>40</height>
@@ -487,12 +489,12 @@
                    </spacer>
                   </item>
                   <item>
-                   <widget class="QToolButton" name="column_down">
-                    <property name="text">
+                   <widget class="QToolButton" name="column_down" >
+                    <property name="text" >
                      <string>...</string>
                     </property>
-                    <property name="icon">
-                     <iconset resource="../images.qrc">
+                    <property name="icon" >
+                     <iconset resource="../images.qrc" >
                       <normaloff>:/images/arrow-down.svg</normaloff>:/images/arrow-down.svg</iconset>
                     </property>
                    </widget>
@@ -505,17 +507,17 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="groupBox_3">
-             <property name="title">
+            <widget class="QGroupBox" name="groupBox_3" >
+             <property name="title" >
               <string>Use internal &amp;viewer for:</string>
              </property>
-             <layout class="QGridLayout" name="gridLayout_4">
-              <item row="0" column="0">
-               <widget class="QListWidget" name="viewer">
-                <property name="alternatingRowColors">
+             <layout class="QGridLayout" name="gridLayout_4" >
+              <item row="0" column="0" >
+               <widget class="QListWidget" name="viewer" >
+                <property name="alternatingRowColors" >
                  <bool>true</bool>
                 </property>
-                <property name="selectionMode">
+                <property name="selectionMode" >
                  <enum>QAbstractItemView::NoSelection</enum>
                 </property>
                </widget>
@@ -536,99 +538,99 @@
         <zorder></zorder>
         <zorder></zorder>
        </widget>
-       <widget class="QWidget" name="page_6">
-        <layout class="QGridLayout" name="gridLayout_6">
-         <item row="0" column="0" colspan="2">
-          <widget class="QLabel" name="label_22">
-           <property name="text">
+       <widget class="QWidget" name="page_6" >
+        <layout class="QGridLayout" name="gridLayout_6" >
+         <item row="0" column="0" colspan="2" >
+          <widget class="QLabel" name="label_22" >
+           <property name="text" >
             <string>calibre can send your books to you (or your reader) by email</string>
            </property>
-           <property name="wordWrap">
+           <property name="wordWrap" >
             <bool>true</bool>
            </property>
           </widget>
          </item>
-         <item row="1" column="0" colspan="2">
-          <layout class="QHBoxLayout" name="horizontalLayout_9">
+         <item row="1" column="0" colspan="2" >
+          <layout class="QHBoxLayout" name="horizontalLayout_9" >
            <item>
-            <widget class="QLabel" name="label_15">
-             <property name="text">
+            <widget class="QLabel" name="label_15" >
+             <property name="text" >
               <string>Send email &amp;from:</string>
              </property>
-             <property name="buddy">
+             <property name="buddy" >
               <cstring>email_from</cstring>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="QLineEdit" name="email_from">
-             <property name="toolTip">
-              <string>&lt;p&gt;This is what will be present in the From: field of emails sent by calibre.&lt;br&gt; Set it to your email address</string>
+            <widget class="QLineEdit" name="email_from" >
+             <property name="toolTip" >
+              <string>&lt;p>This is what will be present in the From: field of emails sent by calibre.&lt;br> Set it to your email address</string>
              </property>
             </widget>
            </item>
           </layout>
          </item>
-         <item row="2" column="0" colspan="2">
-          <layout class="QHBoxLayout" name="horizontalLayout_8">
+         <item row="2" column="0" colspan="2" >
+          <layout class="QHBoxLayout" name="horizontalLayout_8" >
            <item>
-            <widget class="QTableView" name="email_view">
-             <property name="selectionMode">
+            <widget class="QTableView" name="email_view" >
+             <property name="selectionMode" >
               <enum>QAbstractItemView::SingleSelection</enum>
              </property>
-             <property name="selectionBehavior">
+             <property name="selectionBehavior" >
               <enum>QAbstractItemView::SelectRows</enum>
              </property>
             </widget>
            </item>
            <item>
-            <layout class="QVBoxLayout" name="verticalLayout_8">
+            <layout class="QVBoxLayout" name="verticalLayout_8" >
              <item>
-              <widget class="QToolButton" name="email_add">
-               <property name="toolTip">
+              <widget class="QToolButton" name="email_add" >
+               <property name="toolTip" >
                 <string>Add an email address to which to send books</string>
                </property>
-               <property name="text">
+               <property name="text" >
                 <string>&amp;Add email</string>
                </property>
-               <property name="icon">
-                <iconset resource="../images.qrc">
+               <property name="icon" >
+                <iconset resource="../images.qrc" >
                  <normaloff>:/images/plus.svg</normaloff>:/images/plus.svg</iconset>
                </property>
-               <property name="iconSize">
+               <property name="iconSize" >
                 <size>
                  <width>24</width>
                  <height>24</height>
                 </size>
                </property>
-               <property name="toolButtonStyle">
+               <property name="toolButtonStyle" >
                 <enum>Qt::ToolButtonTextUnderIcon</enum>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QPushButton" name="email_make_default">
-               <property name="text">
+              <widget class="QPushButton" name="email_make_default" >
+               <property name="text" >
                 <string>Make &amp;default</string>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QToolButton" name="email_remove">
-               <property name="text">
+              <widget class="QToolButton" name="email_remove" >
+               <property name="text" >
                 <string>&amp;Remove email</string>
                </property>
-               <property name="icon">
-                <iconset resource="../images.qrc">
+               <property name="icon" >
+                <iconset resource="../images.qrc" >
                  <normaloff>:/images/minus.svg</normaloff>:/images/minus.svg</iconset>
                </property>
-               <property name="iconSize">
+               <property name="iconSize" >
                 <size>
                  <width>24</width>
                  <height>24</height>
                 </size>
                </property>
-               <property name="toolButtonStyle">
+               <property name="toolButtonStyle" >
                 <enum>Qt::ToolButtonTextUnderIcon</enum>
                </property>
               </widget>
@@ -637,155 +639,155 @@
            </item>
           </layout>
          </item>
-         <item row="3" column="0">
-          <widget class="QGroupBox" name="groupBox_5">
-           <property name="toolTip">
-            <string>&lt;p&gt;A mail server is useful if the service you are sending mail to only accepts email from well know mail services.</string>
+         <item row="3" column="0" >
+          <widget class="QGroupBox" name="groupBox_5" >
+           <property name="toolTip" >
+            <string>&lt;p>A mail server is useful if the service you are sending mail to only accepts email from well know mail services.</string>
            </property>
-           <property name="title">
+           <property name="title" >
             <string>Mail &amp;Server</string>
            </property>
-           <layout class="QGridLayout" name="gridLayout_3">
-            <item row="0" column="0" colspan="4">
-             <widget class="QLabel" name="label_16">
-              <property name="text">
-               <string>calibre can &lt;b&gt;optionally&lt;/b&gt; use a server to send mail</string>
+           <layout class="QGridLayout" name="gridLayout_3" >
+            <item row="0" column="0" colspan="4" >
+             <widget class="QLabel" name="label_16" >
+              <property name="text" >
+               <string>calibre can &lt;b>optionally&lt;/b> use a server to send mail</string>
               </property>
-              <property name="wordWrap">
+              <property name="wordWrap" >
                <bool>true</bool>
               </property>
              </widget>
             </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="label_17">
-              <property name="text">
+            <item row="1" column="0" >
+             <widget class="QLabel" name="label_17" >
+              <property name="text" >
                <string>&amp;Hostname:</string>
               </property>
-              <property name="buddy">
+              <property name="buddy" >
                <cstring>relay_host</cstring>
               </property>
              </widget>
             </item>
-            <item row="1" column="1" colspan="2">
-             <widget class="QLineEdit" name="relay_host">
-              <property name="toolTip">
+            <item row="1" column="1" colspan="2" >
+             <widget class="QLineEdit" name="relay_host" >
+              <property name="toolTip" >
                <string>The hostname of your mail server. For e.g. smtp.gmail.com</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="3">
-             <layout class="QHBoxLayout" name="horizontalLayout_11">
+            <item row="1" column="3" >
+             <layout class="QHBoxLayout" name="horizontalLayout_11" >
               <item>
-               <widget class="QLabel" name="label_18">
-                <property name="text">
+               <widget class="QLabel" name="label_18" >
+                <property name="text" >
                  <string>&amp;Port:</string>
                 </property>
-                <property name="buddy">
+                <property name="buddy" >
                  <cstring>relay_port</cstring>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QSpinBox" name="relay_port">
-                <property name="toolTip">
+               <widget class="QSpinBox" name="relay_port" >
+                <property name="toolTip" >
                  <string>The port your mail server listens for connections on. The default is 25</string>
                 </property>
-                <property name="minimum">
+                <property name="minimum" >
                  <number>1</number>
                 </property>
-                <property name="maximum">
+                <property name="maximum" >
                  <number>65555</number>
                 </property>
-                <property name="value">
+                <property name="value" >
                  <number>25</number>
                 </property>
                </widget>
               </item>
              </layout>
             </item>
-            <item row="2" column="0">
-             <widget class="QLabel" name="label_19">
-              <property name="text">
+            <item row="2" column="0" >
+             <widget class="QLabel" name="label_19" >
+              <property name="text" >
                <string>&amp;Username:</string>
               </property>
-              <property name="buddy">
+              <property name="buddy" >
                <cstring>relay_username</cstring>
               </property>
              </widget>
             </item>
-            <item row="2" column="1" colspan="2">
-             <widget class="QLineEdit" name="relay_username">
-              <property name="toolTip">
+            <item row="2" column="1" colspan="2" >
+             <widget class="QLineEdit" name="relay_username" >
+              <property name="toolTip" >
                <string>Your username on the mail server</string>
               </property>
              </widget>
             </item>
-            <item row="3" column="0">
-             <widget class="QLabel" name="label_20">
-              <property name="text">
+            <item row="3" column="0" >
+             <widget class="QLabel" name="label_20" >
+              <property name="text" >
                <string>&amp;Password:</string>
               </property>
-              <property name="buddy">
+              <property name="buddy" >
                <cstring>relay_password</cstring>
               </property>
              </widget>
             </item>
-            <item row="3" column="1" colspan="2">
-             <widget class="QLineEdit" name="relay_password">
-              <property name="toolTip">
+            <item row="3" column="1" colspan="2" >
+             <widget class="QLineEdit" name="relay_password" >
+              <property name="toolTip" >
                <string>Your password on the mail server</string>
               </property>
-              <property name="echoMode">
+              <property name="echoMode" >
                <enum>QLineEdit::Password</enum>
               </property>
              </widget>
             </item>
-            <item row="3" column="3">
-             <widget class="QCheckBox" name="relay_show_password">
-              <property name="text">
+            <item row="3" column="3" >
+             <widget class="QCheckBox" name="relay_show_password" >
+              <property name="text" >
                <string>&amp;Show</string>
               </property>
              </widget>
             </item>
-            <item row="4" column="0">
-             <widget class="QLabel" name="label_21">
-              <property name="text">
+            <item row="4" column="0" >
+             <widget class="QLabel" name="label_21" >
+              <property name="text" >
                <string>&amp;Encryption:</string>
               </property>
-              <property name="buddy">
+              <property name="buddy" >
                <cstring>relay_tls</cstring>
               </property>
              </widget>
             </item>
-            <item row="4" column="1">
-             <widget class="QRadioButton" name="relay_tls">
-              <property name="toolTip">
+            <item row="4" column="1" >
+             <widget class="QRadioButton" name="relay_tls" >
+              <property name="toolTip" >
                <string>Use TLS encryption when connecting to the mail server. This is the most common.</string>
               </property>
-              <property name="text">
+              <property name="text" >
                <string>&amp;TLS</string>
               </property>
-              <property name="checked">
+              <property name="checked" >
                <bool>true</bool>
               </property>
              </widget>
             </item>
-            <item row="4" column="2" colspan="2">
-             <widget class="QRadioButton" name="relay_ssl">
-              <property name="toolTip">
+            <item row="4" column="2" colspan="2" >
+             <widget class="QRadioButton" name="relay_ssl" >
+              <property name="toolTip" >
                <string>Use SSL encryption when connecting to the mail server.</string>
               </property>
-              <property name="text">
+              <property name="text" >
                <string>&amp;SSL</string>
               </property>
              </widget>
             </item>
-            <item row="3" column="4">
-             <spacer name="horizontalSpacer_3">
-              <property name="orientation">
+            <item row="3" column="4" >
+             <spacer name="horizontalSpacer_3" >
+              <property name="orientation" >
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeHint" stdset="0">
+              <property name="sizeHint" stdset="0" >
                <size>
                 <width>40</width>
                 <height>20</height>
@@ -796,31 +798,31 @@
            </layout>
           </widget>
          </item>
-         <item row="3" column="1">
-          <layout class="QVBoxLayout" name="verticalLayout_9">
+         <item row="3" column="1" >
+          <layout class="QVBoxLayout" name="verticalLayout_9" >
            <item>
-            <widget class="QToolButton" name="relay_use_gmail">
-             <property name="text">
+            <widget class="QToolButton" name="relay_use_gmail" >
+             <property name="text" >
               <string>Use Gmail</string>
              </property>
-             <property name="icon">
-              <iconset resource="../images.qrc">
+             <property name="icon" >
+              <iconset resource="../images.qrc" >
                <normaloff>:/images/gmail_logo.png</normaloff>:/images/gmail_logo.png</iconset>
              </property>
-             <property name="iconSize">
+             <property name="iconSize" >
               <size>
                <width>48</width>
                <height>48</height>
               </size>
              </property>
-             <property name="toolButtonStyle">
+             <property name="toolButtonStyle" >
               <enum>Qt::ToolButtonTextUnderIcon</enum>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="QPushButton" name="test_email_button">
-             <property name="text">
+            <widget class="QPushButton" name="test_email_button" >
+             <property name="text" >
               <string>&amp;Test email</string>
              </property>
             </widget>
@@ -829,16 +831,16 @@
          </item>
         </layout>
        </widget>
-       <widget class="QWidget" name="page_2">
-        <layout class="QVBoxLayout">
+       <widget class="QWidget" name="page_2" >
+        <layout class="QVBoxLayout" >
          <item>
-          <layout class="QHBoxLayout">
+          <layout class="QHBoxLayout" >
            <item>
             <spacer>
-             <property name="orientation">
+             <property name="orientation" >
               <enum>Qt::Horizontal</enum>
              </property>
-             <property name="sizeHint" stdset="0">
+             <property name="sizeHint" stdset="0" >
               <size>
                <width>40</width>
                <height>20</height>
@@ -847,21 +849,21 @@
             </spacer>
            </item>
            <item>
-            <widget class="QToolButton" name="compact_button">
-             <property name="toolTip">
+            <widget class="QToolButton" name="compact_button" >
+             <property name="toolTip" >
               <string>Free unused diskspace from the database</string>
              </property>
-             <property name="text">
+             <property name="text" >
               <string>&amp;Compact database</string>
              </property>
             </widget>
            </item>
            <item>
             <spacer>
-             <property name="orientation">
+             <property name="orientation" >
               <enum>Qt::Horizontal</enum>
              </property>
-             <property name="sizeHint" stdset="0">
+             <property name="sizeHint" stdset="0" >
               <size>
                <width>40</width>
                <height>20</height>
@@ -872,17 +874,17 @@
           </layout>
          </item>
          <item>
-          <widget class="QGroupBox" name="metadata_box">
-           <property name="title">
+          <widget class="QGroupBox" name="metadata_box" >
+           <property name="title" >
             <string>&amp;Metadata from file name</string>
            </property>
-           <layout class="QVBoxLayout">
+           <layout class="QVBoxLayout" >
             <item>
              <spacer>
-              <property name="orientation">
+              <property name="orientation" >
                <enum>Qt::Vertical</enum>
               </property>
-              <property name="sizeHint" stdset="0">
+              <property name="sizeHint" stdset="0" >
                <size>
                 <width>20</width>
                 <height>40</height>
@@ -895,96 +897,96 @@
          </item>
         </layout>
        </widget>
-       <widget class="QWidget" name="page_4">
-        <layout class="QVBoxLayout" name="verticalLayout_2">
+       <widget class="QWidget" name="page_4" >
+        <layout class="QVBoxLayout" name="verticalLayout_2" >
          <item>
-          <widget class="QLabel" name="label_9">
-           <property name="text">
+          <widget class="QLabel" name="label_9" >
+           <property name="text" >
             <string>calibre contains a network server that allows you to access your book collection using a browser from anywhere in the world. Any changes to the settings will only take effect after a server restart.</string>
            </property>
-           <property name="wordWrap">
+           <property name="wordWrap" >
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
-          <layout class="QGridLayout" name="gridLayout_5">
-           <item row="0" column="0">
-            <widget class="QLabel" name="label_10">
-             <property name="text">
+          <layout class="QGridLayout" name="gridLayout_5" >
+           <item row="0" column="0" >
+            <widget class="QLabel" name="label_10" >
+             <property name="text" >
               <string>Server &amp;port:</string>
              </property>
-             <property name="buddy">
+             <property name="buddy" >
               <cstring>port</cstring>
              </property>
             </widget>
            </item>
-           <item row="0" column="1">
-            <widget class="QSpinBox" name="port">
-             <property name="minimum">
+           <item row="0" column="1" >
+            <widget class="QSpinBox" name="port" >
+             <property name="minimum" >
               <number>1025</number>
              </property>
-             <property name="maximum">
+             <property name="maximum" >
               <number>16000</number>
              </property>
-             <property name="value">
+             <property name="value" >
               <number>8080</number>
              </property>
             </widget>
            </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="label_11">
-             <property name="text">
+           <item row="1" column="0" >
+            <widget class="QLabel" name="label_11" >
+             <property name="text" >
               <string>&amp;Username:</string>
              </property>
-             <property name="buddy">
+             <property name="buddy" >
               <cstring>username</cstring>
              </property>
             </widget>
            </item>
-           <item row="1" column="1">
-            <widget class="QLineEdit" name="username"/>
+           <item row="1" column="1" >
+            <widget class="QLineEdit" name="username" />
            </item>
-           <item row="2" column="0">
-            <widget class="QLabel" name="label_12">
-             <property name="text">
+           <item row="2" column="0" >
+            <widget class="QLabel" name="label_12" >
+             <property name="text" >
               <string>&amp;Password:</string>
              </property>
-             <property name="buddy">
+             <property name="buddy" >
               <cstring>password</cstring>
              </property>
             </widget>
            </item>
-           <item row="2" column="1">
-            <widget class="QLineEdit" name="password">
-             <property name="toolTip">
+           <item row="2" column="1" >
+            <widget class="QLineEdit" name="password" >
+             <property name="toolTip" >
               <string>If you leave the password blank, anyone will be able to access your book collection using the web interface.</string>
              </property>
             </widget>
            </item>
-           <item row="4" column="1">
-            <widget class="QCheckBox" name="show_server_password">
-             <property name="text">
+           <item row="4" column="1" >
+            <widget class="QCheckBox" name="show_server_password" >
+             <property name="text" >
               <string>&amp;Show password</string>
              </property>
             </widget>
            </item>
-           <item row="3" column="1">
-            <widget class="QLineEdit" name="max_cover_size">
-             <property name="toolTip">
+           <item row="3" column="1" >
+            <widget class="QLineEdit" name="max_cover_size" >
+             <property name="toolTip" >
               <string>The maximum size (widthxheight) for displayed covers. Larger covers are resized. </string>
              </property>
-             <property name="text">
+             <property name="text" >
               <string/>
              </property>
             </widget>
            </item>
-           <item row="3" column="0">
-            <widget class="QLabel" name="label_3">
-             <property name="text">
+           <item row="3" column="0" >
+            <widget class="QLabel" name="label_3" >
+             <property name="text" >
               <string>Max. &amp;cover size:</string>
              </property>
-             <property name="buddy">
+             <property name="buddy" >
               <cstring>max_cover_size</cstring>
              </property>
             </widget>
@@ -992,27 +994,27 @@
           </layout>
          </item>
          <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <layout class="QHBoxLayout" name="horizontalLayout_2" >
            <item>
-            <widget class="QPushButton" name="start">
-             <property name="text">
+            <widget class="QPushButton" name="start" >
+             <property name="text" >
               <string>&amp;Start Server</string>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="QPushButton" name="stop">
-             <property name="text">
+            <widget class="QPushButton" name="stop" >
+             <property name="text" >
               <string>St&amp;op Server</string>
              </property>
             </widget>
            </item>
            <item>
-            <spacer name="horizontalSpacer">
-             <property name="orientation">
+            <spacer name="horizontalSpacer" >
+             <property name="orientation" >
               <enum>Qt::Horizontal</enum>
              </property>
-             <property name="sizeHint" stdset="0">
+             <property name="sizeHint" stdset="0" >
               <size>
                <width>40</width>
                <height>20</height>
@@ -1021,8 +1023,8 @@
             </spacer>
            </item>
            <item>
-            <widget class="QPushButton" name="test">
-             <property name="text">
+            <widget class="QPushButton" name="test" >
+             <property name="text" >
               <string>&amp;Test Server</string>
              </property>
             </widget>
@@ -1030,25 +1032,25 @@
           </layout>
          </item>
          <item>
-          <widget class="QCheckBox" name="auto_launch">
-           <property name="text">
+          <widget class="QCheckBox" name="auto_launch" >
+           <property name="text" >
             <string>Run server &amp;automatically on startup</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="view_logs">
-           <property name="text">
+          <widget class="QPushButton" name="view_logs" >
+           <property name="text" >
             <string>View &amp;server logs</string>
            </property>
           </widget>
          </item>
          <item>
-          <spacer name="verticalSpacer_3">
-           <property name="orientation">
+          <spacer name="verticalSpacer_3" >
+           <property name="orientation" >
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" stdset="0">
+           <property name="sizeHint" stdset="0" >
             <size>
              <width>20</width>
              <height>40</height>
@@ -1057,21 +1059,21 @@
           </spacer>
          </item>
          <item>
-          <widget class="QLabel" name="label_13">
-           <property name="text">
+          <widget class="QLabel" name="label_13" >
+           <property name="text" >
             <string>If you want to use the content server to access your ebook collection on your iphone with Stanza, you will need to add the URL http://myhostname:8080/stanza as a new catalog in the stanza reader on your iphone. Here myhostname should be the fully qualified hostname or the IP address of this computer.</string>
            </property>
-           <property name="wordWrap">
+           <property name="wordWrap" >
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
-          <spacer name="verticalSpacer">
-           <property name="orientation">
+          <spacer name="verticalSpacer" >
+           <property name="orientation" >
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" stdset="0">
+           <property name="sizeHint" stdset="0" >
             <size>
              <width>20</width>
              <height>40</height>
@@ -1081,53 +1083,53 @@
          </item>
         </layout>
        </widget>
-       <widget class="QWidget" name="page_5">
-        <layout class="QVBoxLayout" name="verticalLayout_6">
+       <widget class="QWidget" name="page_5" >
+        <layout class="QVBoxLayout" name="verticalLayout_6" >
          <item>
-          <widget class="QLabel" name="label_8">
-           <property name="text">
+          <widget class="QLabel" name="label_8" >
+           <property name="text" >
             <string>Here you can customize the behavior of Calibre by controlling what plugins it uses.</string>
            </property>
-           <property name="wordWrap">
+           <property name="wordWrap" >
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QTreeView" name="plugin_view">
-           <property name="iconSize">
+          <widget class="QTreeView" name="plugin_view" >
+           <property name="iconSize" >
             <size>
              <width>32</width>
              <height>32</height>
             </size>
            </property>
-           <property name="animated">
+           <property name="animated" >
             <bool>true</bool>
            </property>
-           <property name="headerHidden">
+           <property name="headerHidden" >
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_6">
+          <layout class="QHBoxLayout" name="horizontalLayout_6" >
            <item>
-            <widget class="QPushButton" name="toggle_plugin">
-             <property name="text">
+            <widget class="QPushButton" name="toggle_plugin" >
+             <property name="text" >
               <string>Enable/&amp;Disable plugin</string>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="QPushButton" name="customize_plugin">
-             <property name="text">
+            <widget class="QPushButton" name="customize_plugin" >
+             <property name="text" >
               <string>&amp;Customize plugin</string>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="QPushButton" name="remove_plugin">
-             <property name="text">
+            <widget class="QPushButton" name="remove_plugin" >
+             <property name="text" >
               <string>&amp;Remove plugin</string>
              </property>
             </widget>
@@ -1135,33 +1137,33 @@
           </layout>
          </item>
          <item>
-          <widget class="QGroupBox" name="groupBox_4">
-           <property name="title">
+          <widget class="QGroupBox" name="groupBox_4" >
+           <property name="title" >
             <string>Add new plugin</string>
            </property>
-           <layout class="QVBoxLayout" name="verticalLayout_5">
+           <layout class="QVBoxLayout" name="verticalLayout_5" >
             <item>
-             <layout class="QHBoxLayout" name="horizontalLayout_5">
+             <layout class="QHBoxLayout" name="horizontalLayout_5" >
               <item>
-               <widget class="QLabel" name="label_14">
-                <property name="text">
+               <widget class="QLabel" name="label_14" >
+                <property name="text" >
                  <string>Plugin &amp;file:</string>
                 </property>
-                <property name="buddy">
+                <property name="buddy" >
                  <cstring>plugin_path</cstring>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QLineEdit" name="plugin_path"/>
+               <widget class="QLineEdit" name="plugin_path" />
               </item>
               <item>
-               <widget class="QToolButton" name="button_plugin_browse">
-                <property name="text">
+               <widget class="QToolButton" name="button_plugin_browse" >
+                <property name="text" >
                  <string>...</string>
                 </property>
-                <property name="icon">
-                 <iconset resource="../images.qrc">
+                <property name="icon" >
+                 <iconset resource="../images.qrc" >
                   <normaloff>:/images/document_open.svg</normaloff>:/images/document_open.svg</iconset>
                 </property>
                </widget>
@@ -1169,13 +1171,13 @@
              </layout>
             </item>
             <item>
-             <layout class="QHBoxLayout" name="horizontalLayout_4">
+             <layout class="QHBoxLayout" name="horizontalLayout_4" >
               <item>
-               <spacer name="horizontalSpacer_2">
-                <property name="orientation">
+               <spacer name="horizontalSpacer_2" >
+                <property name="orientation" >
                  <enum>Qt::Horizontal</enum>
                 </property>
-                <property name="sizeHint" stdset="0">
+                <property name="sizeHint" stdset="0" >
                  <size>
                   <width>40</width>
                   <height>20</height>
@@ -1184,8 +1186,8 @@
                </spacer>
               </item>
               <item>
-               <widget class="QPushButton" name="button_plugin_add">
-                <property name="text">
+               <widget class="QPushButton" name="button_plugin_add" >
+                <property name="text" >
                  <string>&amp;Add</string>
                 </property>
                </widget>
@@ -1201,12 +1203,12 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="0">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
+   <item row="1" column="0" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons">
+     <property name="standardButtons" >
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
@@ -1214,7 +1216,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../images.qrc"/>
+  <include location="../images.qrc" />
  </resources>
  <connections>
   <connection>
@@ -1223,11 +1225,11 @@
    <receiver>Dialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel">
+    <hint type="sourcelabel" >
      <x>239</x>
      <y>558</y>
     </hint>
-    <hint type="destinationlabel">
+    <hint type="destinationlabel" >
      <x>157</x>
      <y>274</y>
     </hint>
@@ -1239,11 +1241,11 @@
    <receiver>Dialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel">
+    <hint type="sourcelabel" >
      <x>307</x>
      <y>558</y>
     </hint>
-    <hint type="destinationlabel">
+    <hint type="destinationlabel" >
      <x>286</x>
      <y>274</y>
     </hint>