From 336294fe358e23794a35c7122fd635aba077c9ad Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Sat, 10 Jul 2010 14:07:00 +0100
Subject: [PATCH 01/19] Recover from UI changes

---
 src/calibre/gui2/layout.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py
index f3b650f531..7b70224872 100644
--- a/src/calibre/gui2/layout.py
+++ b/src/calibre/gui2/layout.py
@@ -12,6 +12,7 @@ from PyQt4.Qt import QIcon, Qt, QWidget, QAction, QToolBar, QSize, QVariant, \
 
 from calibre.constants import __appname__, filesystem_encoding
 from calibre.gui2.search_box import SearchBox2, SavedSearchBox
+from calibre.gui2.widgets import ComboBoxWithHelp
 from calibre.gui2.throbber import ThrobbingButton
 from calibre.gui2 import NONE
 from calibre import human_readable
@@ -280,12 +281,7 @@ class SearchBar(QWidget): # {{{
         self._layout = l = QHBoxLayout()
         self.setLayout(self._layout)
 
-        self.restriction_label = QLabel(_("&Restrict to:"))
-        l.addWidget(self.restriction_label)
-        self.restriction_label.setSizePolicy(QSizePolicy.Minimum,
-                QSizePolicy.Minimum)
-
-        x = QComboBox(self)
+        x = ComboBoxWithHelp(self)
         x.setMaximumSize(QSize(150, 16777215))
         x.setObjectName("search_restriction")
         x.setToolTip(_("Books display will be restricted to those matching the selected saved search"))
@@ -344,7 +340,6 @@ class SearchBar(QWidget): # {{{
         x.setToolTip(_("Delete current saved search"))
 
         self.label.setBuddy(parent.search)
-        self.restriction_label.setBuddy(parent.search_restriction)
 
 
 # }}}

From f9896d01f31a638dc87b884600b90fd7cf4e147e Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Sat, 10 Jul 2010 15:40:38 +0100
Subject: [PATCH 02/19] Put GPL line back in (don't know how it disappeared)

---
 src/calibre/gui2/widgets.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py
index e3874fdc3a..97758482fc 100644
--- a/src/calibre/gui2/widgets.py
+++ b/src/calibre/gui2/widgets.py
@@ -1,3 +1,4 @@
+__license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 '''
 Miscellaneous widgets used in the GUI

From 62a5b4d459a9dc9dbb24c99e411376c43cb79f6a Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Sun, 11 Jul 2010 10:04:49 +0100
Subject: [PATCH 03/19] Fixes to work around Qt strangeness with date editing

---
 src/calibre/gui2/custom_column_widgets.py | 9 +++++++--
 src/calibre/gui2/library/delegates.py     | 8 ++++----
 src/calibre/library/caches.py             | 4 ++--
 src/calibre/utils/date.py                 | 2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/calibre/gui2/custom_column_widgets.py b/src/calibre/gui2/custom_column_widgets.py
index 2a9c81e8ee..58c2f15452 100644
--- a/src/calibre/gui2/custom_column_widgets.py
+++ b/src/calibre/gui2/custom_column_widgets.py
@@ -132,9 +132,11 @@ class DateEdit(QDateEdit):
 
     def focusInEvent(self, x):
         self.setSpecialValueText('')
+        QDateEdit.focusInEvent(self, x)
 
     def focusOutEvent(self, x):
         self.setSpecialValueText(_('Undefined'))
+        QDateEdit.focusOutEvent(self, x)
 
 class DateTime(Base):
 
@@ -142,7 +144,10 @@ class DateTime(Base):
         self.widgets = [QLabel('&'+self.col_metadata['name']+':', parent),
                 DateEdit(parent)]
         w = self.widgets[1]
-        w.setDisplayFormat('dd MMM yyyy')
+        format = self.col_metadata['display'].get('date_format','')
+        if not format:
+            format = 'dd MMM yyyy'
+        w.setDisplayFormat(format)
         w.setCalendarPopup(True)
         w.setMinimumDate(UNDEFINED_QDATE)
         w.setSpecialValueText(_('Undefined'))
@@ -156,7 +161,7 @@ class DateTime(Base):
 
     def getter(self):
         val = self.widgets[1].date()
-        if val == UNDEFINED_QDATE:
+        if val <= UNDEFINED_QDATE:
             val = None
         else:
             val = qt_to_dt(val)
diff --git a/src/calibre/gui2/library/delegates.py b/src/calibre/gui2/library/delegates.py
index 529055ecd2..40f7a2e4e0 100644
--- a/src/calibre/gui2/library/delegates.py
+++ b/src/calibre/gui2/library/delegates.py
@@ -96,7 +96,7 @@ class DateDelegate(QStyledItemDelegate): # {{{
 
     def displayText(self, val, locale):
         d = val.toDate()
-        if d == UNDEFINED_QDATE:
+        if d <= UNDEFINED_QDATE:
             return ''
         return format_date(d.toPyDate(), 'dd MMM yyyy')
 
@@ -116,7 +116,7 @@ class PubDateDelegate(QStyledItemDelegate): # {{{
 
     def displayText(self, val, locale):
         d = val.toDate()
-        if d == UNDEFINED_QDATE:
+        if d <= UNDEFINED_QDATE:
             return ''
         format = tweaks['gui_pubdate_display_format']
         if format is None:
@@ -194,7 +194,7 @@ class CcDateDelegate(QStyledItemDelegate): # {{{
 
     def displayText(self, val, locale):
         d = val.toDate()
-        if d == UNDEFINED_QDATE:
+        if d <= UNDEFINED_QDATE:
             return ''
         return format_date(d.toPyDate(), self.format)
 
@@ -217,7 +217,7 @@ class CcDateDelegate(QStyledItemDelegate): # {{{
 
     def setModelData(self, editor, model, index):
         val = editor.date()
-        if val == UNDEFINED_QDATE:
+        if val <= UNDEFINED_QDATE:
             val = None
         model.setData(index, QVariant(val), Qt.EditRole)
 
diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py
index d46ae23d90..af950a36fc 100644
--- a/src/calibre/library/caches.py
+++ b/src/calibre/library/caches.py
@@ -209,13 +209,13 @@ class ResultCache(SearchQueryParser):
         if query == 'false':
             for item in self._data:
                 if item is None: continue
-                if item[loc] is None or item[loc] == UNDEFINED_DATE:
+                if item[loc] is None or item[loc] <= UNDEFINED_DATE:
                     matches.add(item[0])
             return matches
         if query == 'true':
             for item in self._data:
                 if item is None: continue
-                if item[loc] is not None and item[loc] != UNDEFINED_DATE:
+                if item[loc] is not None and item[loc] > UNDEFINED_DATE:
                     matches.add(item[0])
             return matches
 
diff --git a/src/calibre/utils/date.py b/src/calibre/utils/date.py
index c5fba13f57..b25940d23d 100644
--- a/src/calibre/utils/date.py
+++ b/src/calibre/utils/date.py
@@ -44,7 +44,7 @@ parse_date_day_first = compute_locale_info_for_parse_date()
 utc_tz = _utc_tz = tzutc()
 local_tz = _local_tz = SafeLocalTimeZone()
 
-UNDEFINED_DATE = datetime(101,1,1, tzinfo=utc_tz)
+UNDEFINED_DATE = datetime(1000,1,1, tzinfo=utc_tz)
 
 def parse_date(date_string, assume_utc=False, as_utc=True, default=None):
     '''

From abdee7d012c253f198271a9ea838e3e447807f6c Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Sun, 11 Jul 2010 10:51:56 +0100
Subject: [PATCH 04/19] Disable editing metadata on the device view when
 automatic update is chosen.

---
 src/calibre/gui2/library/models.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 9f1a72b021..89008735fe 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -1216,7 +1216,9 @@ class DeviceBooksModel(BooksModel): # {{{
         return done
 
     def set_editable(self, editable):
-        self.editable = editable
+        # Cannot edit if metadata is sent on connect. Reason: changes will
+        # revert to what is in the library on next connect.
+        self.editable = editable and prefs['manage_device_metadata']!='on_connect'
 
     def set_search_restriction(self, s):
         pass

From 30436a9e6aa58ff5009733ccbb9f71519d8e4ffb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 11 Jul 2010 09:28:27 -0600
Subject: [PATCH 05/19] Fix #6100 (Improved aldiko support)

---
 src/calibre/devices/android/driver.py | 10 ++++++++++
 src/calibre/devices/usbms/device.py   |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py
index 5642235b31..9951dc57ad 100644
--- a/src/calibre/devices/android/driver.py
+++ b/src/calibre/devices/android/driver.py
@@ -70,6 +70,16 @@ class ANDROID(USBMS):
             dirs = [x.strip() for x in dirs.split(',')]
         self.EBOOK_DIR_MAIN = dirs
 
+    def get_main_ebook_dir(self, for_upload=False):
+        dirs = self.EBOOK_DIR_MAIN
+        if not for_upload:
+            def aldiko_tweak(x):
+                return 'eBooks' if x == 'eBooks/import' else x
+            if isinstance(dirs, basestring):
+                dirs = [dirs]
+            dirs = list(map(aldiko_tweak, dirs))
+        return dirs
+
 class S60(USBMS):
 
     name = 'S60 driver'
diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py
index 55790420f2..c07b7fd761 100644
--- a/src/calibre/devices/usbms/device.py
+++ b/src/calibre/devices/usbms/device.py
@@ -732,7 +732,7 @@ class Device(DeviceConfig, DevicePlugin):
                 traceback.print_exc()
         self._main_prefix = self._card_a_prefix = self._card_b_prefix = None
 
-    def get_main_ebook_dir(self):
+    def get_main_ebook_dir(self, for_upload=False):
         return self.EBOOK_DIR_MAIN
 
     def _sanity_check(self, on_card, files):
@@ -750,7 +750,7 @@ class Device(DeviceConfig, DevicePlugin):
             path = os.path.join(self._card_b_prefix,
                     *(self.EBOOK_DIR_CARD_B.split('/')))
         else:
-            candidates = self.get_main_ebook_dir()
+            candidates = self.get_main_ebook_dir(for_upload=True)
             if isinstance(candidates, basestring):
                 candidates = [candidates]
             candidates = [

From ba94ea9670eb7010328d721830881199cee1a842 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 11 Jul 2010 09:47:41 -0600
Subject: [PATCH 06/19] oops

---
 src/calibre/gui2/convert/structure_detection.ui | 6 +-----
 src/calibre/gui2/custom_column_widgets.py       | 9 ++-------
 src/calibre/gui2/library/delegates.py           | 8 ++++----
 src/calibre/gui2/library/models.py              | 4 +---
 src/calibre/library/caches.py                   | 4 ++--
 src/calibre/utils/date.py                       | 2 +-
 6 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/calibre/gui2/convert/structure_detection.ui b/src/calibre/gui2/convert/structure_detection.ui
index 67fd0a31b2..e4414473f5 100644
--- a/src/calibre/gui2/convert/structure_detection.ui
+++ b/src/calibre/gui2/convert/structure_detection.ui
@@ -28,11 +28,7 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="QComboBox" name="opt_chapter_mark">
-     <property name="minimumContentsLength">
-      <number>30</number>
-     </property>
-    </widget>
+    <widget class="QComboBox" name="opt_chapter_mark"/>
    </item>
    <item row="2" column="0">
     <widget class="QCheckBox" name="opt_remove_first_image">
diff --git a/src/calibre/gui2/custom_column_widgets.py b/src/calibre/gui2/custom_column_widgets.py
index 58c2f15452..2a9c81e8ee 100644
--- a/src/calibre/gui2/custom_column_widgets.py
+++ b/src/calibre/gui2/custom_column_widgets.py
@@ -132,11 +132,9 @@ class DateEdit(QDateEdit):
 
     def focusInEvent(self, x):
         self.setSpecialValueText('')
-        QDateEdit.focusInEvent(self, x)
 
     def focusOutEvent(self, x):
         self.setSpecialValueText(_('Undefined'))
-        QDateEdit.focusOutEvent(self, x)
 
 class DateTime(Base):
 
@@ -144,10 +142,7 @@ class DateTime(Base):
         self.widgets = [QLabel('&'+self.col_metadata['name']+':', parent),
                 DateEdit(parent)]
         w = self.widgets[1]
-        format = self.col_metadata['display'].get('date_format','')
-        if not format:
-            format = 'dd MMM yyyy'
-        w.setDisplayFormat(format)
+        w.setDisplayFormat('dd MMM yyyy')
         w.setCalendarPopup(True)
         w.setMinimumDate(UNDEFINED_QDATE)
         w.setSpecialValueText(_('Undefined'))
@@ -161,7 +156,7 @@ class DateTime(Base):
 
     def getter(self):
         val = self.widgets[1].date()
-        if val <= UNDEFINED_QDATE:
+        if val == UNDEFINED_QDATE:
             val = None
         else:
             val = qt_to_dt(val)
diff --git a/src/calibre/gui2/library/delegates.py b/src/calibre/gui2/library/delegates.py
index 40f7a2e4e0..529055ecd2 100644
--- a/src/calibre/gui2/library/delegates.py
+++ b/src/calibre/gui2/library/delegates.py
@@ -96,7 +96,7 @@ class DateDelegate(QStyledItemDelegate): # {{{
 
     def displayText(self, val, locale):
         d = val.toDate()
-        if d <= UNDEFINED_QDATE:
+        if d == UNDEFINED_QDATE:
             return ''
         return format_date(d.toPyDate(), 'dd MMM yyyy')
 
@@ -116,7 +116,7 @@ class PubDateDelegate(QStyledItemDelegate): # {{{
 
     def displayText(self, val, locale):
         d = val.toDate()
-        if d <= UNDEFINED_QDATE:
+        if d == UNDEFINED_QDATE:
             return ''
         format = tweaks['gui_pubdate_display_format']
         if format is None:
@@ -194,7 +194,7 @@ class CcDateDelegate(QStyledItemDelegate): # {{{
 
     def displayText(self, val, locale):
         d = val.toDate()
-        if d <= UNDEFINED_QDATE:
+        if d == UNDEFINED_QDATE:
             return ''
         return format_date(d.toPyDate(), self.format)
 
@@ -217,7 +217,7 @@ class CcDateDelegate(QStyledItemDelegate): # {{{
 
     def setModelData(self, editor, model, index):
         val = editor.date()
-        if val <= UNDEFINED_QDATE:
+        if val == UNDEFINED_QDATE:
             val = None
         model.setData(index, QVariant(val), Qt.EditRole)
 
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 89008735fe..9f1a72b021 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -1216,9 +1216,7 @@ class DeviceBooksModel(BooksModel): # {{{
         return done
 
     def set_editable(self, editable):
-        # Cannot edit if metadata is sent on connect. Reason: changes will
-        # revert to what is in the library on next connect.
-        self.editable = editable and prefs['manage_device_metadata']!='on_connect'
+        self.editable = editable
 
     def set_search_restriction(self, s):
         pass
diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py
index af950a36fc..d46ae23d90 100644
--- a/src/calibre/library/caches.py
+++ b/src/calibre/library/caches.py
@@ -209,13 +209,13 @@ class ResultCache(SearchQueryParser):
         if query == 'false':
             for item in self._data:
                 if item is None: continue
-                if item[loc] is None or item[loc] <= UNDEFINED_DATE:
+                if item[loc] is None or item[loc] == UNDEFINED_DATE:
                     matches.add(item[0])
             return matches
         if query == 'true':
             for item in self._data:
                 if item is None: continue
-                if item[loc] is not None and item[loc] > UNDEFINED_DATE:
+                if item[loc] is not None and item[loc] != UNDEFINED_DATE:
                     matches.add(item[0])
             return matches
 
diff --git a/src/calibre/utils/date.py b/src/calibre/utils/date.py
index b25940d23d..c5fba13f57 100644
--- a/src/calibre/utils/date.py
+++ b/src/calibre/utils/date.py
@@ -44,7 +44,7 @@ parse_date_day_first = compute_locale_info_for_parse_date()
 utc_tz = _utc_tz = tzutc()
 local_tz = _local_tz = SafeLocalTimeZone()
 
-UNDEFINED_DATE = datetime(1000,1,1, tzinfo=utc_tz)
+UNDEFINED_DATE = datetime(101,1,1, tzinfo=utc_tz)
 
 def parse_date(date_string, assume_utc=False, as_utc=True, default=None):
     '''

From de0aea0eb7630ed467997d66d15f7b6790b10483 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 11 Jul 2010 09:52:15 -0600
Subject: [PATCH 07/19] Possible fix for conversion box being too wide

---
 src/calibre/gui2/convert/structure_detection.ui | 6 +++++-
 src/calibre/gui2/convert/xexp_edit.ui           | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/convert/structure_detection.ui b/src/calibre/gui2/convert/structure_detection.ui
index e4414473f5..2e97c0d3ca 100644
--- a/src/calibre/gui2/convert/structure_detection.ui
+++ b/src/calibre/gui2/convert/structure_detection.ui
@@ -28,7 +28,11 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="QComboBox" name="opt_chapter_mark"/>
+    <widget class="QComboBox" name="opt_chapter_mark">
+     <property name="minimumContentsLength">
+      <number>20</number>
+     </property>
+    </widget>
    </item>
    <item row="2" column="0">
     <widget class="QCheckBox" name="opt_remove_first_image">
diff --git a/src/calibre/gui2/convert/xexp_edit.ui b/src/calibre/gui2/convert/xexp_edit.ui
index 1b0196a8a1..f98eb8b1b8 100644
--- a/src/calibre/gui2/convert/xexp_edit.ui
+++ b/src/calibre/gui2/convert/xexp_edit.ui
@@ -43,6 +43,15 @@
          <height>0</height>
         </size>
        </property>
+       <property name="maximumSize">
+        <size>
+         <width>500</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="minimumContentsLength">
+        <number>30</number>
+       </property>
       </widget>
      </item>
     </layout>

From 924b8a3b3eac3afdf3059dc2a7df7002049bd8a0 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Sun, 11 Jul 2010 17:16:03 +0100
Subject: [PATCH 08/19] Remove change to default date, reverting it to year 101

---
 src/calibre/utils/date.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/utils/date.py b/src/calibre/utils/date.py
index b25940d23d..c5fba13f57 100644
--- a/src/calibre/utils/date.py
+++ b/src/calibre/utils/date.py
@@ -44,7 +44,7 @@ parse_date_day_first = compute_locale_info_for_parse_date()
 utc_tz = _utc_tz = tzutc()
 local_tz = _local_tz = SafeLocalTimeZone()
 
-UNDEFINED_DATE = datetime(1000,1,1, tzinfo=utc_tz)
+UNDEFINED_DATE = datetime(101,1,1, tzinfo=utc_tz)
 
 def parse_date(date_string, assume_utc=False, as_utc=True, default=None):
     '''

From acdc3d864a4402dc6df778d1cbc7d8de2da43233 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Mon, 12 Jul 2010 10:05:14 +0100
Subject: [PATCH 09/19] Add 'set to today' buttons to metadata editors

---
 src/calibre/gui2/custom_column_widgets.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/custom_column_widgets.py b/src/calibre/gui2/custom_column_widgets.py
index 58c2f15452..fed1de93a1 100644
--- a/src/calibre/gui2/custom_column_widgets.py
+++ b/src/calibre/gui2/custom_column_widgets.py
@@ -10,9 +10,10 @@ from functools import partial
 
 from PyQt4.Qt import QComboBox, QLabel, QSpinBox, QDoubleSpinBox, QDateEdit, \
         QDate, QGroupBox, QVBoxLayout, QPlainTextEdit, QSizePolicy, \
-        QSpacerItem, QIcon, QCheckBox, QWidget, QHBoxLayout, SIGNAL
+        QSpacerItem, QIcon, QCheckBox, QWidget, QHBoxLayout, SIGNAL, \
+        QPushButton
 
-from calibre.utils.date import qt_to_dt
+from calibre.utils.date import qt_to_dt, now
 from calibre.gui2.widgets import TagsLineEdit, EnComboBox
 from calibre.gui2 import UNDEFINED_QDATE
 from calibre.utils.config import tweaks
@@ -138,19 +139,24 @@ class DateEdit(QDateEdit):
         self.setSpecialValueText(_('Undefined'))
         QDateEdit.focusOutEvent(self, x)
 
+    def set_to_today(self):
+        self.setDate(now())
+
 class DateTime(Base):
 
     def setup_ui(self, parent):
-        self.widgets = [QLabel('&'+self.col_metadata['name']+':', parent),
-                DateEdit(parent)]
+        cm = self.col_metadata
+        self.widgets = [QLabel('&'+cm['name']+':', parent), DateEdit(parent),
+            QLabel(''), QPushButton(_('Set \'%s\' to today')%cm['name'], parent)]
         w = self.widgets[1]
-        format = self.col_metadata['display'].get('date_format','')
+        format = cm['display'].get('date_format','')
         if not format:
             format = 'dd MMM yyyy'
         w.setDisplayFormat(format)
         w.setCalendarPopup(True)
         w.setMinimumDate(UNDEFINED_QDATE)
         w.setSpecialValueText(_('Undefined'))
+        self.widgets[3].clicked.connect(w.set_to_today)
 
     def setter(self, val):
         if val is None:

From 0e64fff394eef54ae77ce33329fef1a8b7648e7e Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Mon, 12 Jul 2010 10:15:43 +0100
Subject: [PATCH 10/19] Put back some of the changes that the merge from trunk
 removed.

---
 src/calibre/gui2/custom_column_widgets.py | 2 ++
 src/calibre/gui2/library/models.py        | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/custom_column_widgets.py b/src/calibre/gui2/custom_column_widgets.py
index 14a1a4abdc..96232fe85f 100644
--- a/src/calibre/gui2/custom_column_widgets.py
+++ b/src/calibre/gui2/custom_column_widgets.py
@@ -133,9 +133,11 @@ class DateEdit(QDateEdit):
 
     def focusInEvent(self, x):
         self.setSpecialValueText('')
+        QDateEdit.focusInEvent(self, x)
 
     def focusOutEvent(self, x):
         self.setSpecialValueText(_('Undefined'))
+        QDateEdit.focusOutEvent(self, x)
 
     def set_to_today(self):
         self.setDate(now())
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 9f1a72b021..89008735fe 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -1216,7 +1216,9 @@ class DeviceBooksModel(BooksModel): # {{{
         return done
 
     def set_editable(self, editable):
-        self.editable = editable
+        # Cannot edit if metadata is sent on connect. Reason: changes will
+        # revert to what is in the library on next connect.
+        self.editable = editable and prefs['manage_device_metadata']!='on_connect'
 
     def set_search_restriction(self, s):
         pass

From f2dd86faecc7296caa982479f2459de9709147b7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 12 Jul 2010 07:56:13 -0600
Subject: [PATCH 11/19] Fix #6152 ("Edit meta information" should be "Edit
 metadata")

---
 src/calibre/gui2/layout.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py
index c44efa2354..1c853cbdff 100644
--- a/src/calibre/gui2/layout.py
+++ b/src/calibre/gui2/layout.py
@@ -403,7 +403,7 @@ class MainWindowMixin(object):
 
         ac('add', _('Add books'), 'add_book.svg', _('A'))
         ac('del', _('Remove books'), 'trash.svg', _('Del'))
-        ac('edit', _('Edit meta info'), 'edit_input.svg', _('E'))
+        ac('edit', _('Edit metadata'), 'edit_input.svg', _('E'))
         ac('merge', _('Merge book records'), 'merge_books.svg', _('M'))
         ac('sync', _('Send to device'), 'sync.svg')
         ac('save', _('Save to disk'), 'save.svg', _('S'))

From e16310c70a3ef7548c5dc9aa8ff37af50090bfa5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 12 Jul 2010 08:08:12 -0600
Subject: [PATCH 12/19] El PAin Impresso by DM

---
 resources/images/news/elpais_impreso.png | Bin 0 -> 717 bytes
 resources/recipes/elpais_impreso.recipe  |  86 +++++++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 resources/images/news/elpais_impreso.png
 create mode 100644 resources/recipes/elpais_impreso.recipe

diff --git a/resources/images/news/elpais_impreso.png b/resources/images/news/elpais_impreso.png
new file mode 100644
index 0000000000000000000000000000000000000000..35dcaf2d44455f3e97f3985c9df6483463370f5b
GIT binary patch
literal 717
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
zK-vS0-A-oPfdtD69Mgd`SU*F|v9*U87#P2Kx;TbdoL)M4zyIYxk)!tO!&q2VS{L4!
z)X=07)$*(RXk&tjmx<r8ixXY{Gl~CWGc7bT%u`c4_bTCtyrEM-h|)5Z-i;ByE2iA~
zRr@`zJwG~1*5`w-{?7OFs?Y6wzO&QY_*nfMjRO(CUQC<y{CQj}!>YDoH;<#Op{wKG
z`Zryz`dTXL!1(ysR__0Ec1<~1{Q2GHG|oj#7VGX;o~qC~_v410+*!R(HUENZ)3Pj1
z{+!&-*<{qZ)#k0NA%hZwQdh@@9dnd-@8WZK7v0D|)5bdLw&$D9;{Ok;<Mh@fuxT}|
z$YZL|uMj-Kea>~o&qZPnZ!E0qTk?yesUhbb`wkAJrVbO22?0#!0(j3_mMR^6(OBp9
zO}%3Cmzkf=^UB%Oxi5`zx$+@SN|i%N?)}m%jVGV7YtGaxj99hc)yG9g%C;MsOjxjV
zt#Bp_#~vXMjm5_j-o548{@yn6+gGEs2S<$yYbJE3yZsDZ_h7c_k5}g$byF5Bd$4Fv
z#0jC-clx>}O1(<m8?h)v>%z9xt1G$hX|uCeOL~+s3%q}slw#4@vGG@Jv-WiV&D+;Y
zhq~@jSaeoRs&D4%^w*3tXZaYL&itqCk=C^0!PdYgtr?H+e9`S{UB4r$$6PpiI>!dx
zTTN!h1~OcHWo2Iyo)w%sAoFa^!t1RMF7O2CJ=^|8nz4>qey*ru;cO3mU~*6`ag8WR
zNi0dVN-jzTQVd20h6cI@=DLPPAqEy!24+?!Cb~e<z~D(X|1uN}x%nxXX_W{Kh9QRL
cRwhPPCT0)~8aiLAfEpM)UHx3vIVCg!07L#OdH?_b

literal 0
HcmV?d00001

diff --git a/resources/recipes/elpais_impreso.recipe b/resources/recipes/elpais_impreso.recipe
new file mode 100644
index 0000000000..b30db0707a
--- /dev/null
+++ b/resources/recipes/elpais_impreso.recipe
@@ -0,0 +1,86 @@
+# -*- coding: utf-8 -*-
+__license__   = 'GPL v3'
+__copyright__ = '2010, Darko Miletic <darko.miletic at gmail.com>'
+'''
+www.elpais.com/diario/
+'''
+
+from calibre import strftime
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class ElPaisImpresa(BasicNewsRecipe):
+    title                 = 'El País - edicion impresa'
+    __author__            = 'Darko Miletic'
+    description           = 'el periodico global en Español'
+    publisher             = 'EDICIONES EL PAIS, S.L.'
+    category              = 'news, politics,Spain,actualidad,noticias,informacion,videos,fotografias,audios,graficos,nacional,internacional,deportes,economia,tecnologia,cultura,gente,television,sociedad,opinion,blogs,foros,chats,encuestas,entrevistas,participacion'
+    no_stylesheets        = True
+    encoding              = 'latin1'
+    use_embedded_content  = False
+    language              = 'es'
+    publication_type      = 'newspaper'
+    masthead_url          = 'http://www.elpais.com/im/tit_logo_global.gif'
+    index                 = 'http://www.elpais.com/diario/'
+    extra_css             = ' p{text-align: justify} body{ text-align: left; font-family: Georgia,"Times New Roman",Times,serif } h2{font-family: Arial,Helvetica,sans-serif} img{margin-bottom: 0.4em} '
+
+    conversion_options = {
+                          'comment'      : description
+                        , 'tags'         : category
+                        , 'publisher'    : publisher
+                        , 'language'     : language
+                        }
+
+    feeds          = [
+                        (u'Internacional'     , index + u'internacional/'     )
+                       ,(u'España'            , index + u'espana/'            )
+                       ,(u'Economia'          , index + u'economia/'          )
+                       ,(u'Opinion'           , index + u'opinion/'           )
+                       ,(u'Viñetas'           , index + u'vineta/'            )
+                       ,(u'Sociedad'          , index + u'sociedad/'          )
+                       ,(u'Cultura'           , index + u'cultura/'           )
+                       ,(u'Tendencias'        , index + u'tendencias/'        )
+                       ,(u'Gente'             , index + u'gente/'             )
+                       ,(u'Obituarios'        , index + u'obituarios/'        )
+                       ,(u'Deportes'          , index + u'deportes/'          )
+                       ,(u'Pantallas'         , index + u'radioytv/'          )
+                       ,(u'Ultima'            , index + u'ultima/'            )
+                       ,(u'Educacion'         , index + u'educacion/'         )
+                       ,(u'Saludo'            , index + u'salud/'             )
+                       ,(u'Ciberpais'         , index + u'ciberpais/'         )
+                       ,(u'EP3'               , index + u'ep3/'               )
+                       ,(u'Cine'              , index + u'cine/'              )
+                       ,(u'Babelia'           , index + u'babelia/'           )
+                       ,(u'El viajero'        , index + u'viajero/'           )
+                       ,(u'Negocios'          , index + u'negocios/'          )
+                       ,(u'Domingo'           , index + u'domingo/'           )
+                       ,(u'El Pais semanal'   , index + u'eps/'               )
+                       ,(u'Quadern Catalunya' , index + u'quadern-catalunya/' )
+                     ]
+
+    keep_only_tags=[dict(attrs={'class':['cabecera_noticia','contenido_noticia']})]
+    remove_attributes=['width','height']
+    remove_tags=[dict(name='link')]
+
+    def parse_index(self):
+        totalfeeds = []
+        lfeeds = self.get_feeds()
+        for feedobj in lfeeds:
+            feedtitle, feedurl = feedobj
+            self.report_progress(0, _('Fetching feed')+' %s...'%(feedtitle if feedtitle else feedurl))
+            articles = []
+            soup = self.index_to_soup(feedurl)
+            for item in soup.findAll('a',attrs={'class':['g19r003','g19i003','g17r003','g17i003']}):
+                url   = 'http://www.elpais.com' + item['href'].rpartition('/')[0]
+                title = self.tag_to_string(item)
+                date  = strftime(self.timefmt)
+                articles.append({
+                                      'title'      :title
+                                     ,'date'       :date
+                                     ,'url'        :url
+                                     ,'description':''
+                                    })
+            totalfeeds.append((feedtitle, articles))
+        return totalfeeds
+
+    def print_version(self, url):
+        return url + '?print=1'

From abdb1f3910d89b81457ea7a8c4abf859b4ba9d41 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 12 Jul 2010 08:15:20 -0600
Subject: [PATCH 13/19] ...

---
 resources/recipes/ap.recipe | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/recipes/ap.recipe b/resources/recipes/ap.recipe
index 572c0aa392..0118cf0726 100644
--- a/resources/recipes/ap.recipe
+++ b/resources/recipes/ap.recipe
@@ -12,9 +12,9 @@ class AssociatedPress(BasicNewsRecipe):
 
     max_articles_per_feed = 15
     html2lrf_options = ['--force-page-break-before-tag="chapter"']
-    
-    
-    preprocess_regexps = [ (re.compile(i[0], re.IGNORECASE | re.DOTALL), i[1]) for i in 
+
+
+    preprocess_regexps = [ (re.compile(i[0], re.IGNORECASE | re.DOTALL), i[1]) for i in
 [
         (r'<HEAD>.*?</HEAD>' , lambda match : '<HEAD></HEAD>'),
         (r'<body class="apple-rss-no-unread-mode" onLoad="setup(null)">.*?<!-- start Entries -->', lambda match : '<body>'),
@@ -25,10 +25,10 @@ class AssociatedPress(BasicNewsRecipe):
         (r'<p class="ap-story-p">', lambda match : '<p>'),
         (r'Learn more about our <a href="http://apdigitalnews.com/privacy.html">Privacy Policy</a>.*?</body>', lambda match : '</body>'),
     ]
-    ]   
-     
+    ]
+
+
 
-  
     feeds = [ ('AP Headlines', 'http://hosted.ap.org/lineups/TOPHEADS-rss_2.0.xml?SITE=ORAST&SECTION=HOME'),
                   ('AP US News', 'http://hosted.ap.org/lineups/USHEADS-rss_2.0.xml?SITE=CAVIC&SECTION=HOME'),
                    ('AP World News', 'http://hosted.ap.org/lineups/WORLDHEADS-rss_2.0.xml?SITE=SCAND&SECTION=HOME'),
@@ -38,4 +38,4 @@ class AssociatedPress(BasicNewsRecipe):
                    ('AP Health News', 'http://hosted.ap.org/lineups/HEALTHHEADS-rss_2.0.xml?SITE=FLDAY&SECTION=HOME'),
                    ('AP Science News', 'http://hosted.ap.org/lineups/SCIENCEHEADS-rss_2.0.xml?SITE=OHCIN&SECTION=HOME'),
                    ('AP Strange News', 'http://hosted.ap.org/lineups/STRANGEHEADS-rss_2.0.xml?SITE=WCNC&SECTION=HOME'),
-        ]
\ No newline at end of file
+        ]

From 0b1ac482a5e01cc3cfbd0d8c2ce57cd015499a7d Mon Sep 17 00:00:00 2001
From: GRiker <griker@hotmail.com>
Date: Mon, 12 Jul 2010 09:53:52 -0600
Subject: [PATCH 14/19] GwR sorting key fix for floats

---
 src/calibre/devices/apple/driver.py | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py
index 3156542a92..618fc27545 100644
--- a/src/calibre/devices/apple/driver.py
+++ b/src/calibre/devices/apple/driver.py
@@ -2586,14 +2586,20 @@ class ITUNES(DriverBase):
             if metadata.series and self.settings().read_metadata:
                 if DEBUG:
                     self.log.info("   using Series name as Genre")
+
+                # Format the index as a sort key
+                index = metadata.series_index
+                integer = int(index)
+                fraction = index-integer
+                series_index = '%04d%s' % (integer, str('%0.4f' % fraction).lstrip('0'))
                 if lb_added:
-                    lb_added.sort_name.set("%s %04f" % (metadata.series, metadata.series_index))
+                    lb_added.sort_name.set("%s %s" % (metadata.series, series_index))
                     lb_added.genre.set(metadata.series)
                     lb_added.episode_ID.set(metadata.series)
                     lb_added.episode_number.set(metadata.series_index)
 
                 if db_added:
-                    db_added.sort_name.set("%s %04f" % (metadata.series, metadata.series_index))
+                    db_added.sort_name.set("%s %s" % (metadata.series, series_index))
                     db_added.genre.set(metadata.series)
                     db_added.episode_ID.set(metadata.series)
                     db_added.episode_number.set(metadata.series_index)
@@ -2658,8 +2664,13 @@ class ITUNES(DriverBase):
             if metadata.series and self.settings().read_metadata:
                 if DEBUG:
                     self.log.info("   using Series name as Genre")
+                # Format the index as a sort key
+                index = metadata.series_index
+                integer = int(index)
+                fraction = index-integer
+                series_index = '%04d%%s' % (integer, str('%0.4f' % fraction).lstrip('0'))
                 if lb_added:
-                    lb_added.SortName = "%s %04f" % (metadata.series, metadata.series_index)
+                    lb_added.SortName = "%s %s" % (metadata.series, series_index)
                     lb_added.Genre = metadata.series
                     lb_added.EpisodeID = metadata.series
                     try:
@@ -2667,7 +2678,7 @@ class ITUNES(DriverBase):
                     except:
                         pass
                 if db_added:
-                    db_added.SortName = "%s %04f" % (metadata.series, metadata.series_index)
+                    db_added.SortName = "%s %s" % (metadata.series, series_index)
                     db_added.Genre = metadata.series
                     db_added.EpisodeID = metadata.series
                     try:

From 6a4ff480599ef7aae33abea1aa9e7facffbd2c6e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 12 Jul 2010 16:55:01 -0600
Subject: [PATCH 15/19] Fix #6156 (Error running Calibre on Xen virtual machine
 with Ubuntu Lucid 10.04)

---
 src/calibre/devices/scanner.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/calibre/devices/scanner.py b/src/calibre/devices/scanner.py
index ceba5d37d0..dd789dd668 100644
--- a/src/calibre/devices/scanner.py
+++ b/src/calibre/devices/scanner.py
@@ -98,6 +98,9 @@ class LinuxScanner(object):
 
     def __call__(self):
         ans = set([])
+        if not self.ok:
+            raise RuntimeError('DeviceScanner requires the /sys filesystem to work.')
+
         for x in os.listdir(self.base):
             base = os.path.join(self.base, x)
             ven = os.path.join(base, 'idVendor')
@@ -145,8 +148,6 @@ class DeviceScanner(object):
     def __init__(self, *args):
         if isosx and osx_scanner is None:
             raise RuntimeError('The Python extension usbobserver must be available on OS X.')
-        if islinux and not linux_scanner.ok:
-            raise RuntimeError('DeviceScanner requires the /sys filesystem to work.')
         self.scanner = win_scanner if iswindows else osx_scanner if isosx else linux_scanner
         self.devices = []
 

From c56a4a5aaf6b6f3cd360808381aabfb7c0b6e574 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 13 Jul 2010 12:12:03 -0600
Subject: [PATCH 16/19] Fix #6165 (Error communicating with the device)

---
 resources/images/donate.svg                  |  53 ++---
 resources/images/lt.png                      | Bin 0 -> 30594 bytes
 src/calibre/devices/prs505/sony_cache.py     |  25 ++-
 src/calibre/gui2/device.py                   |   1 +
 src/calibre/gui2/dialogs/config/__init__.py  |   7 -
 src/calibre/gui2/dialogs/config/config.ui    |  48 -----
 src/calibre/gui2/init.py                     |   6 -
 src/calibre/gui2/layout.py                   | 214 +++++++++++--------
 src/calibre/gui2/search_restriction_mixin.py |   1 +
 src/calibre/gui2/ui.py                       |   9 +-
 10 files changed, 169 insertions(+), 195 deletions(-)
 create mode 100644 resources/images/lt.png

diff --git a/resources/images/donate.svg b/resources/images/donate.svg
index b17d0ec7a0..603e672f6f 100644
--- a/resources/images/donate.svg
+++ b/resources/images/donate.svg
@@ -1,24 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="128"
    height="128"
    id="svg1307"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.47 r22583"
    version="1.0"
-   sodipodi:docbase="/home/pinheiro/Documents/pics/new oxygen/svg"
-   sodipodi:docname="love.svg">
+   sodipodi:docname="donate.svg">
   <defs
      id="defs1309">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 64 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="128 : 64 : 1"
+       inkscape:persp3d-origin="64 : 42.666667 : 1"
+       id="perspective44" />
     <linearGradient
        inkscape:collect="always"
        id="linearGradient2231">
@@ -180,8 +187,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="7.851329"
-     inkscape:cx="92.691163"
-     inkscape:cy="92.473338"
+     inkscape:cx="60.937831"
+     inkscape:cy="61.488995"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:document-units="px"
@@ -189,10 +196,11 @@
      guidetolerance="0.1px"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:window-width="1106"
-     inkscape:window-height="958"
-     inkscape:window-x="597"
-     inkscape:window-y="25">
+     inkscape:window-width="1680"
+     inkscape:window-height="997"
+     inkscape:window-x="-4"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1">
     <sodipodi:guide
        orientation="horizontal"
        position="32.487481"
@@ -245,26 +253,19 @@
        id="path2276"
        d="M 50.892799,3.2812959 L 50.892799,0.48658747 L 50.892799,3.2812959 z "
        style="fill:#ffffff;fill-opacity:0.75688076;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.38139535;fill:url(#radialGradient3297);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1"
-       id="path3289"
-       sodipodi:cx="63.912209"
-       sodipodi:cy="115.70919"
-       sodipodi:rx="63.912209"
-       sodipodi:ry="12.641975"
-       d="M 127.82442 115.70919 A 63.912209 12.641975 0 1 1  0,115.70919 A 63.912209 12.641975 0 1 1  127.82442 115.70919 z"
-       transform="matrix(1,0,0,0.416667,0,74.87151)" />
     <path
        style="fill:url(#radialGradient2335);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="M 35.325021,6.2016208 C 32.278871,6.2210338 29.045555,6.6687791 25.645673,7.6089386 C 5.9380713,13.058619 0.404709,29.342113 5.3805953,48.506873 C 12.126047,74.487157 36.855395,101.02725 64.150803,115.92895 L 64.150803,116.02417 C 64.162016,116.00826 64.173539,115.99248 64.184766,115.97656 C 64.195995,115.99248 64.207516,116.00826 64.218732,116.02417 L 64.218732,115.92895 C 90.473794,101.59521 116.24349,74.487157 122.98895,48.506873 C 127.96481,29.342113 122.43148,13.058619 102.72386,7.6089386 C 83.422254,2.2715258 69.549778,12.840101 64.184766,27.183808 C 59.764775,15.366673 49.572303,6.1108179 35.325021,6.2016208 z "
        id="path2245"
        sodipodi:nodetypes="cssccsccsscc" />
-    <path
-       id="path2369"
-       d="M 35.325021,6.2016208 C 32.278871,6.2210338 29.045555,6.6687791 25.645673,7.6089386 C 5.9380713,13.058619 0.404709,29.342113 5.3805953,48.506873 C 12.126047,74.487157 37.113186,101.16799 64.150803,115.92895 L 64.150803,116.02417 C 64.162016,116.00826 64.173539,115.99248 64.184766,115.97656 C 64.195995,115.99248 64.207516,116.00826 64.218732,116.02417 L 64.218732,115.92895 C 90.398445,101.63635 116.24349,74.487157 122.98895,48.506873 C 127.96481,29.342113 122.43148,13.058619 102.72386,7.6089386 C 83.422254,2.2715258 69.549778,12.840101 64.184766,27.183808 C 59.764775,15.366673 49.572303,6.1108179 35.325021,6.2016208 z "
-       style="opacity:0.4713115;fill:url(#linearGradient2379);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       sodipodi:nodetypes="cssccsccsscc" />
+    <g
+       id="g2850">
+      <path
+         sodipodi:nodetypes="cssccsccsscc"
+         style="opacity:0.4713115;fill:url(#linearGradient2379);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 35.325021,6.2016208 C 32.278871,6.2210338 29.045555,6.6687791 25.645673,7.6089386 C 5.9380713,13.058619 0.404709,29.342113 5.3805953,48.506873 C 12.126047,74.487157 37.113186,101.16799 64.150803,115.92895 L 64.150803,116.02417 C 64.162016,116.00826 64.173539,115.99248 64.184766,115.97656 C 64.195995,115.99248 64.207516,116.00826 64.218732,116.02417 L 64.218732,115.92895 C 90.398445,101.63635 116.24349,74.487157 122.98895,48.506873 C 127.96481,29.342113 122.43148,13.058619 102.72386,7.6089386 C 83.422254,2.2715258 69.549778,12.840101 64.184766,27.183808 C 59.764775,15.366673 49.572303,6.1108179 35.325021,6.2016208 z "
+         id="path2369" />
+    </g>
     <path
        style="opacity:0.1762295;fill:url(#linearGradient2331);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.29999995;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 34.451605,6.2067207 C 31.659392,6.2976073 28.7301,6.7682297 25.648957,7.6202497 C 7.7889432,12.559022 1.5815371,26.389172 4.2759909,43.204304 C 27.13595,75.72273 65.297627,95.42612 91.41193,91.971053 C 105.43169,77.948778 119.04939,63.70497 122.99185,48.520401 C 127.96773,29.355639 122.42255,13.069929 102.71494,7.6202497 C 83.413331,2.2828362 69.546961,12.850845 64.181949,27.194552 C 59.761957,15.377418 49.555176,6.1159177 35.307894,6.2067207 C 35.022317,6.2085406 34.740456,6.1973187 34.451605,6.2067207 z "
diff --git a/resources/images/lt.png b/resources/images/lt.png
new file mode 100644
index 0000000000000000000000000000000000000000..c29efb9f88bccc9b73c7df9858e18cd981c237ed
GIT binary patch
literal 30594
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

literal 0
HcmV?d00001

diff --git a/src/calibre/devices/prs505/sony_cache.py b/src/calibre/devices/prs505/sony_cache.py
index b87ca937bc..3ac35df9b2 100644
--- a/src/calibre/devices/prs505/sony_cache.py
+++ b/src/calibre/devices/prs505/sony_cache.py
@@ -10,10 +10,10 @@ from base64 import b64decode
 from uuid import uuid4
 from lxml import etree
 
-from calibre import prints, guess_type
+from calibre import prints, guess_type, isbytestring
 from calibre.devices.errors import DeviceError
 from calibre.devices.usbms.driver import debug_print
-from calibre.constants import DEBUG
+from calibre.constants import DEBUG, preferred_encoding
 from calibre.ebooks.chardet import xml_to_unicode
 from calibre.ebooks.metadata import authors_to_string, title_sort
 
@@ -473,6 +473,13 @@ class XMLCache(object):
         # if the case of a tie, and hope it is right.
         timestamp = os.path.getmtime(path)
         rec_date = record.get('date', None)
+
+        def clean(x):
+            if isbytestring(x):
+                x = x.decode(preferred_encoding, 'replace')
+            x.replace(u'\0', '')
+            return x
+
         if not getattr(book, '_new_book', False): # book is not new
             if strftime(timestamp, zone=time.gmtime) == rec_date:
                 gtz_count += 1
@@ -486,19 +493,19 @@ class XMLCache(object):
                 tz = time.gmtime
                 debug_print("Using GMT TZ for new book", book.lpath)
             date = strftime(timestamp, zone=tz)
-            record.set('date', date)
+            record.set('date', clean(date))
 
-        record.set('size', str(os.stat(path).st_size))
+        record.set('size', clean(str(os.stat(path).st_size)))
         title = book.title if book.title else _('Unknown')
-        record.set('title', title)
+        record.set('title', clean(title))
         ts = book.title_sort
         if not ts:
             ts = title_sort(title)
-        record.set('titleSorter', ts)
+        record.set('titleSorter', clean(ts))
         if self.use_author_sort and book.author_sort is not None:
-            record.set('author', book.author_sort)
+            record.set('author', clean(book.author_sort))
         else:
-            record.set('author', authors_to_string(book.authors))
+            record.set('author', clean(authors_to_string(book.authors)))
         ext = os.path.splitext(path)[1]
         if ext:
             ext = ext[1:].lower()
@@ -506,7 +513,7 @@ class XMLCache(object):
             if mime is None:
                 mime = guess_type('a.'+ext)[0]
             if mime is not None:
-                record.set('mime', mime)
+                record.set('mime', clean(mime))
         if 'sourceid' not in record.attrib:
             record.set('sourceid', '1')
         if 'id' not in record.attrib:
diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index 91afac8aa2..d81918c307 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -765,6 +765,7 @@ class DeviceMixin(object): # {{{
                 self.book_details.reset_info()
                 self.location_view.setCurrentIndex(self.location_view.model().index(0))
             self.refresh_ondevice_info (device_connected = False)
+        self.tool_bar.device_status_changed(bool(connected))
 
     def info_read(self, job):
         '''
diff --git a/src/calibre/gui2/dialogs/config/__init__.py b/src/calibre/gui2/dialogs/config/__init__.py
index bf9dc0a623..b064dc53c2 100644
--- a/src/calibre/gui2/dialogs/config/__init__.py
+++ b/src/calibre/gui2/dialogs/config/__init__.py
@@ -334,7 +334,6 @@ class ConfigDialog(ResizableDialog, Ui_Dialog):
 
     def __init__(self, parent, library_view, server=None):
         ResizableDialog.__init__(self, parent)
-        self.ICON_SIZES = {0:QSize(48, 48), 1:QSize(32,32), 2:QSize(24,24)}
         self._category_model = CategoryModel()
 
         self.category_view.currentChanged = self.category_current_changed
@@ -389,10 +388,6 @@ class ConfigDialog(ResizableDialog, Ui_Dialog):
         self.add_custcol_button.clicked.connect(self.add_custcol)
         self.edit_custcol_button.clicked.connect(self.edit_custcol)
 
-        icons = config['toolbar_icon_size']
-        self.toolbar_button_size.setCurrentIndex(0 if icons == self.ICON_SIZES[0] else 1 if icons == self.ICON_SIZES[1] else 2)
-        self.show_toolbar_text.setChecked(config['show_text_in_toolbar'])
-
         output_formats = sorted(available_output_formats())
         output_formats.remove('oeb')
         for f in output_formats:
@@ -845,8 +840,6 @@ class ConfigDialog(ResizableDialog, Ui_Dialog):
 
         must_restart = self.apply_custom_column_changes()
 
-        config['toolbar_icon_size'] = self.ICON_SIZES[self.toolbar_button_size.currentIndex()]
-        config['show_text_in_toolbar'] = bool(self.show_toolbar_text.isChecked())
         config['separate_cover_flow'] = bool(self.separate_cover_flow.isChecked())
         config['disable_tray_notification'] = not self.systray_notifications.isChecked()
         p = {0:'normal', 1:'high', 2:'low'}[self.priority.currentIndex()]
diff --git a/src/calibre/gui2/dialogs/config/config.ui b/src/calibre/gui2/dialogs/config/config.ui
index b473ee7846..5f890631b2 100644
--- a/src/calibre/gui2/dialogs/config/config.ui
+++ b/src/calibre/gui2/dialogs/config/config.ui
@@ -422,54 +422,6 @@
               </layout>
              </item>
              <item row="10" column="0" colspan="2">
-              <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">
-                  <item>
-                   <property name="text">
-                    <string>Large</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Medium</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Small</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <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">
-                   <cstring>toolbar_button_size</cstring>
-                  </property>
-                 </widget>
-                </item>
-                <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">
-                   <bool>true</bool>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item row="11" column="0" colspan="2">
               <layout class="QHBoxLayout" name="horizontalLayout_7">
                <item>
                 <widget class="QGroupBox" name="groupBox">
diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py
index 2d038d9ddc..2474685522 100644
--- a/src/calibre/gui2/init.py
+++ b/src/calibre/gui2/init.py
@@ -176,12 +176,6 @@ class ToolbarMixin(object): # {{{
     def show_help(self, *args):
         open_url(QUrl('http://calibre-ebook.com/user_manual'))
 
-    def read_toolbar_settings(self):
-        self.tool_bar.setIconSize(config['toolbar_icon_size'])
-        self.tool_bar.setToolButtonStyle(
-                Qt.ToolButtonTextUnderIcon if \
-                    config['show_text_in_toolbar'] else \
-                    Qt.ToolButtonIconOnly)
 
 # }}}
 
diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py
index 1c853cbdff..0228249e8d 100644
--- a/src/calibre/gui2/layout.py
+++ b/src/calibre/gui2/layout.py
@@ -5,6 +5,8 @@ __license__   = 'GPL v3'
 __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
+from operator import attrgetter
+
 from PyQt4.Qt import QIcon, Qt, QWidget, QAction, QToolBar, QSize, QVariant, \
     QAbstractListModel, QFont, QApplication, QPalette, pyqtSignal, QToolButton, \
     QModelIndex, QListView, QAbstractButton, QPainter, QPixmap, QColor, \
@@ -13,41 +15,11 @@ from PyQt4.Qt import QIcon, Qt, QWidget, QAction, QToolBar, QSize, QVariant, \
 from calibre.constants import __appname__, filesystem_encoding
 from calibre.gui2.search_box import SearchBox2, SavedSearchBox
 from calibre.gui2.throbber import ThrobbingButton
-from calibre.gui2 import NONE
+from calibre.gui2 import NONE, config
 from calibre.gui2.widgets import ComboBoxWithHelp
 from calibre import human_readable
 
-class ToolBar(QToolBar): # {{{
-
-    def __init__(self, parent=None):
-        QToolBar.__init__(self, parent)
-        self.setContextMenuPolicy(Qt.PreventContextMenu)
-        self.setMovable(False)
-        self.setFloatable(False)
-        self.setOrientation(Qt.Horizontal)
-        self.setAllowedAreas(Qt.TopToolBarArea|Qt.BottomToolBarArea)
-        self.setIconSize(QSize(48, 48))
-        self.setToolButtonStyle(Qt.ToolButtonTextUnderIcon)
-
-    def add_actions(self, *args):
-        self.left_space = QWidget(self)
-        self.left_space.setSizePolicy(QSizePolicy.Expanding,
-                QSizePolicy.Minimum)
-        self.addWidget(self.left_space)
-        for action in args:
-            if action is None:
-                self.addSeparator()
-            else:
-                self.addAction(action)
-        self.right_space = QWidget(self)
-        self.right_space.setSizePolicy(QSizePolicy.Expanding,
-                QSizePolicy.Minimum)
-        self.addWidget(self.right_space)
-
-    def contextMenuEvent(self, *args):
-        pass
-
-# }}}
+ICON_SIZE = 48
 
 # Location View {{{
 
@@ -191,14 +163,15 @@ class LocationView(QListView):
         self.setTabKeyNavigation(True)
         self.setProperty("showDropIndicator", True)
         self.setSelectionMode(self.SingleSelection)
-        self.setIconSize(QSize(40, 40))
+        self.setIconSize(QSize(ICON_SIZE, ICON_SIZE))
         self.setMovement(self.Static)
         self.setFlow(self.LeftToRight)
-        self.setGridSize(QSize(175, 90))
+        self.setGridSize(QSize(175, ICON_SIZE))
         self.setViewMode(self.ListMode)
         self.setWordWrap(True)
         self.setObjectName("location_view")
-        self.setMaximumHeight(74)
+        self.setMaximumSize(QSize(600, ICON_SIZE+16))
+        self.setMinimumWidth(400)
 
     def eject_clicked(self, *args):
         self.unmount_device.emit()
@@ -207,6 +180,10 @@ class LocationView(QListView):
         self.model().count = new_count
         self.model().reset()
 
+    @property
+    def book_count(self):
+        return self.model().count
+
     def current_changed(self, current, previous):
         if current.isValid():
             i = current.row()
@@ -248,12 +225,15 @@ class EjectButton(QAbstractButton):
     def __init__(self, parent):
         QAbstractButton.__init__(self, parent)
         self.mouse_over = False
+        self.setMouseTracking(True)
 
     def enterEvent(self, event):
         self.mouse_over = True
+        QAbstractButton.enterEvent(self, event)
 
     def leaveEvent(self, event):
         self.mouse_over = False
+        QAbstractButton.leaveEvent(self, event)
 
     def paintEvent(self, event):
         painter = QPainter(self)
@@ -344,33 +324,84 @@ class SearchBar(QWidget): # {{{
 
 # }}}
 
-class LocationBar(ToolBar): # {{{
+class ToolBar(QToolBar): # {{{
 
     def __init__(self, actions, donate, location_view, parent=None):
-        ToolBar.__init__(self, parent)
-
-        for ac in actions:
-            self.addAction(ac)
-
-        self.addWidget(location_view)
-        self.w = QWidget()
-        self.w.setLayout(QVBoxLayout())
-        self.w.layout().addWidget(donate)
-        donate.setAutoRaise(True)
-        donate.setCursor(Qt.PointingHandCursor)
-        self.addWidget(self.w)
-        self.setIconSize(QSize(50, 50))
+        QToolBar.__init__(self, parent)
+        self.setContextMenuPolicy(Qt.PreventContextMenu)
+        self.setMovable(False)
+        self.setFloatable(False)
+        self.setOrientation(Qt.Horizontal)
+        self.setAllowedAreas(Qt.TopToolBarArea|Qt.BottomToolBarArea)
+        self.setIconSize(QSize(ICON_SIZE, ICON_SIZE))
         self.setToolButtonStyle(Qt.ToolButtonTextUnderIcon)
 
-    def button_for_action(self, ac):
-        b = QToolButton(self)
-        b.setDefaultAction(ac)
-        for x in ('ToolTip', 'StatusTip', 'WhatsThis'):
-            getattr(b, 'set'+x)(b.text())
+        self.showing_device = False
+        self.all_actions = actions
+        self.donate = donate
+        self.location_view = location_view
+        self.d_widget = QWidget()
+        self.d_widget.setLayout(QVBoxLayout())
+        self.d_widget.layout().addWidget(donate)
+        donate.setAutoRaise(True)
+        donate.setCursor(Qt.PointingHandCursor)
+        self.build_bar()
+
+    def contextMenuEvent(self, *args):
+        pass
+
+    def device_status_changed(self, connected):
+        self.showing_device = connected
+        self.build_bar()
+
+    def build_bar(self):
+        order_field = 'device' if self.showing_device else 'normal'
+        o = attrgetter(order_field+'_order')
+        sepvals = [2] if self.showing_device else [1]
+        sepvals += [3]
+        actions = [x for x in self.all_actions if o(x) > -1]
+        actions.sort(cmp=lambda x,y : cmp(o(x), o(y)))
+        self.clear()
+        for x in actions:
+            self.addAction(x)
+            ch = self.widgetForAction(x)
+            ch.setCursor(Qt.PointingHandCursor)
+            ch.setAutoRaise(True)
+
+            if x.action_name == 'choose_library':
+                self.location_action = self.addWidget(self.location_view)
+                self.choose_action = x
+                if config['show_donate_button']:
+                    self.addWidget(self.d_widget)
+            if x.action_name not in ('choose_library', 'help'):
+                ch.setPopupMode(ch.MenuButtonPopup)
+
+
+        for x in actions:
+            if x.separator_before in sepvals:
+                self.insertSeparator(x)
+
+
+        self.location_action.setVisible(self.showing_device)
+        self.choose_action.setVisible(not self.showing_device)
+
+    def count_changed(self, new_count):
+        text = _('%d books')%new_count
+        a = self.choose_action
+        a.setText(text)
+
+    def resizeEvent(self, ev):
+        style = Qt.ToolButtonTextUnderIcon
+        if self.size().width() < 1260:
+            style = Qt.ToolButtonIconOnly
+        self.setToolButtonStyle(style)
+        QToolBar.resizeEvent(self, ev)
 
-        return b
 # }}}
 
+class Action(QAction):
+    pass
+
 class MainWindowMixin(object):
 
     def __init__(self):
@@ -385,12 +416,19 @@ class MainWindowMixin(object):
         self.centralwidget.setLayout(self._central_widget_layout)
         self.resize(1012, 740)
         self.donate_button = ThrobbingButton(self.centralwidget)
-        self.donate_button.set_normal_icon_size(64, 64)
+        self.donate_button.set_normal_icon_size(ICON_SIZE, ICON_SIZE)
 
         # Actions {{{
 
-        def ac(name, text, icon, shortcut=None, tooltip=None):
-            action = QAction(QIcon(I(icon)), text, self)
+        all_actions = []
+
+        def ac(normal_order, device_order, separator_before,
+                name, text, icon, shortcut=None, tooltip=None):
+            action = Action(QIcon(I(icon)), text, self)
+            action.normal_order = normal_order
+            action.device_order = device_order
+            action.separator_before = separator_before
+            action.action_name = name
             text = tooltip if tooltip else text
             action.setToolTip(text)
             action.setStatusTip(text)
@@ -400,56 +438,46 @@ class MainWindowMixin(object):
             if shortcut:
                 action.setShortcut(shortcut)
             setattr(self, 'action_'+name, action)
+            all_actions.append(action)
 
-        ac('add', _('Add books'), 'add_book.svg', _('A'))
-        ac('del', _('Remove books'), 'trash.svg', _('Del'))
-        ac('edit', _('Edit metadata'), 'edit_input.svg', _('E'))
-        ac('merge', _('Merge book records'), 'merge_books.svg', _('M'))
-        ac('sync', _('Send to device'), 'sync.svg')
-        ac('save', _('Save to disk'), 'save.svg', _('S'))
-        ac('news', _('Fetch news'), 'news.svg', _('F'))
-        ac('convert', _('Convert books'), 'convert.svg', _('C'))
-        ac('view', _('View'), 'view.svg', _('V'))
-        ac('open_containing_folder', _('Open containing folder'),
+        ac(0,  7,  0, 'add', _('Add books'), 'add_book.svg', _('A'))
+        ac(1,  1,  0, 'edit', _('Edit metadata'), 'edit_input.svg', _('E'))
+        ac(2,  2,  3, 'convert', _('Convert books'), 'convert.svg', _('C'))
+        ac(3,  3,  0, 'view', _('View'), 'view.svg', _('V'))
+        ac(4,  4,  3, 'choose_library', _('%d books')%0, 'lt.png',
+                tooltip=_('Choose calibre library to work with'))
+        ac(5,  5,  3, 'news', _('Fetch news'), 'news.svg', _('F'))
+        ac(6,  6,  0, 'save', _('Save to disk'), 'save.svg', _('S'))
+        ac(7,  0,  0, 'sync', _('Send to device'), 'sync.svg')
+        ac(8,  8,  3, 'del', _('Remove books'), 'trash.svg', _('Del'))
+        ac(9,  9,  3, 'help', _('Help'), 'help.svg', _('F1'), _("Browse the calibre User Manual"))
+        ac(10, 10, 0, 'preferences', _('Preferences'), 'config.svg', _('Ctrl+P'))
+
+        ac(-1, -1, 0, 'merge', _('Merge book records'), 'merge_books.svg', _('M'))
+        ac(-1, -1, 0, 'open_containing_folder', _('Open containing folder'),
                 'document_open.svg')
-        ac('show_book_details', _('Show book details'),
+        ac(-1, -1, 0, 'show_book_details', _('Show book details'),
                 'dialog_information.svg')
-        ac('books_by_same_author', _('Books by same author'),
+        ac(-1, -1, 0, 'books_by_same_author', _('Books by same author'),
                 'user_profile.svg')
-        ac('books_in_this_series', _('Books in this series'),
+        ac(-1, -1, 0, 'books_in_this_series', _('Books in this series'),
                 'books_in_series.svg')
-        ac('books_by_this_publisher', _('Books by this publisher'),
+        ac(-1, -1, 0, 'books_by_this_publisher', _('Books by this publisher'),
                 'publisher.png')
-        ac('books_with_the_same_tags', _('Books with the same tags'),
+        ac(-1, -1, 0, 'books_with_the_same_tags', _('Books with the same tags'),
                 'tags.svg')
-        ac('preferences', _('Preferences'), 'config.svg', _('Ctrl+P'))
-        ac('help', _('Help'), 'help.svg', _('F1'), _("Browse the calibre User Manual"))
 
         # }}}
 
-        self.tool_bar = ToolBar(self)
-        self.addToolBar(Qt.BottomToolBarArea, self.tool_bar)
-        self.tool_bar.add_actions(self.action_convert, self.action_view,
-                None, self.action_edit, None,
-                self.action_save, self.action_del,
-                None,
-                self.action_help, None, self.action_preferences)
-
         self.location_view = LocationView(self.centralwidget)
         self.search_bar = SearchBar(self)
-        self.location_bar = LocationBar([self.action_add, self.action_sync,
-            self.action_news], self.donate_button, self.location_view, self)
-        self.addToolBar(Qt.TopToolBarArea, self.location_bar)
+        self.tool_bar = ToolBar(all_actions, self.donate_button, self.location_view, self)
+        self.addToolBar(Qt.TopToolBarArea, self.tool_bar)
 
         l = self.centralwidget.layout()
         l.addWidget(self.search_bar)
 
-        for ch in list(self.tool_bar.children()) + list(self.location_bar.children()):
-            if isinstance(ch, QToolButton):
-                ch.setCursor(Qt.PointingHandCursor)
-                ch.setAutoRaise(True)
-                if ch is not self.donate_button:
-                    ch.setPopupMode(ch.MenuButtonPopup)
-
 
+    def read_toolbar_settings(self):
+        pass
 
diff --git a/src/calibre/gui2/search_restriction_mixin.py b/src/calibre/gui2/search_restriction_mixin.py
index f677c839d8..a4186ad8d1 100644
--- a/src/calibre/gui2/search_restriction_mixin.py
+++ b/src/calibre/gui2/search_restriction_mixin.py
@@ -13,6 +13,7 @@ class SearchRestrictionMixin(object):
         self.search_restriction.setSizeAdjustPolicy(self.search_restriction.AdjustToMinimumContentsLengthWithIcon)
         self.search_restriction.setMinimumContentsLength(10)
         self.search_restriction.setStatusTip(self.search_restriction.toolTip())
+        self.search_count.setText(_("(all books)"))
 
     '''
     Adding and deleting books while restricted creates a complexity. When added,
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 6bd7b2b502..ba4c637932 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -167,8 +167,6 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, ToolbarMixin, # {{{
         self.eject_action = self.system_tray_menu.addAction(
                 QIcon(I('eject.svg')), _('&Eject connected device'))
         self.eject_action.setEnabled(False)
-        if not config['show_donate_button']:
-            self.donate_button.setVisible(False)
         self.addAction(self.quit_action)
         self.action_restart = QAction(_('&Restart'), self)
         self.addAction(self.action_restart)
@@ -220,8 +218,9 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, ToolbarMixin, # {{{
 
         if self.system_tray_icon.isVisible() and opts.start_in_tray:
             self.hide_windows()
-        self.library_view.model().count_changed_signal.connect \
-                                            (self.location_view.count_changed)
+        for t in (self.location_view, self.tool_bar):
+            self.library_view.model().count_changed_signal.connect \
+                                            (t.count_changed)
         if not gprefs.get('quick_start_guide_added', False):
             from calibre.ebooks.metadata import MetaInformation
             mi = MetaInformation(_('Calibre Quick Start Guide'), ['John Schember'])
@@ -274,8 +273,6 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, ToolbarMixin, # {{{
                 SIGNAL('start_recipe_fetch(PyQt_PyObject)'),
                 self.download_scheduled_recipe, Qt.QueuedConnection)
 
-        self.location_view.setCurrentIndex(self.location_view.model().index(0))
-
         self.keyboard_interrupt.connect(self.quit, type=Qt.QueuedConnection)
         AddAction.__init__(self)
 

From 9a4b661ac67c14c1b1aa6e576ea804f68cccc114 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 14 Jul 2010 08:57:56 -0600
Subject: [PATCH 17/19] Fix google reader recipes

---
 resources/recipes/greader.recipe      | 72 +++++++++++++-------------
 resources/recipes/greader_uber.recipe | 73 +++++++++++++--------------
 2 files changed, 70 insertions(+), 75 deletions(-)

diff --git a/resources/recipes/greader.recipe b/resources/recipes/greader.recipe
index cbf4c0226b..75c273b162 100644
--- a/resources/recipes/greader.recipe
+++ b/resources/recipes/greader.recipe
@@ -1,37 +1,35 @@
-import urllib, re, mechanize
-from calibre.web.feeds.recipes import BasicNewsRecipe
-from calibre import __appname__
-
-class GoogleReader(BasicNewsRecipe):
-    title   = 'Google Reader'
-    description = 'This recipe downloads feeds you have tagged from your Google Reader account.'
-    needs_subscription = True
-    __author__ = 'davec'
-    base_url = 'http://www.google.com/reader/atom/'
-    max_articles_per_feed = 50
-    get_options = '?n=%d&xt=user/-/state/com.google/read' % max_articles_per_feed
-    use_embedded_content = True
-
-    def get_browser(self):
-        br = BasicNewsRecipe.get_browser()
-
-        if self.username is not None and self.password is not None:
-            request = urllib.urlencode([('Email', self.username), ('Passwd', self.password),
-                                        ('service', 'reader'), ('source', __appname__)])
-            response = br.open('https://www.google.com/accounts/ClientLogin', request)
-            sid = re.search('SID=(\S*)', response.read()).group(1)
-
-            cookies = mechanize.CookieJar()
-            br = mechanize.build_opener(mechanize.HTTPCookieProcessor(cookies))
-            cookies.set_cookie(mechanize.Cookie(None, 'SID', sid, None, False, '.google.com', True, True, '/', True, False, None, True, '', '', None))
-        return br
-
-
-    def get_feeds(self):
-        feeds = []
-        soup = self.index_to_soup('http://www.google.com/reader/api/0/tag/list')
-        for id in soup.findAll(True, attrs={'name':['id']}):
-            url = id.contents[0]
-            feeds.append((re.search('/([^/]*)$', url).group(1),
-                          self.base_url + urllib.quote(url.encode('utf-8')) + self.get_options))
-        return feeds
+import urllib, re, mechanize
+from calibre.web.feeds.recipes import BasicNewsRecipe
+from calibre import __appname__
+
+class GoogleReader(BasicNewsRecipe):
+    title   = 'Google Reader'
+    description = 'This recipe fetches from your Google Reader account unread Starred items and unread Feeds you have placed in a folder via the manage subscriptions feature.'
+    needs_subscription = True
+    __author__ = 'davec, rollercoaster, Starson17'
+    base_url = 'http://www.google.com/reader/atom/'
+    oldest_article = 365
+    max_articles_per_feed = 250
+    get_options = '?n=%d&xt=user/-/state/com.google/read' % max_articles_per_feed
+    use_embedded_content = True
+
+    def get_browser(self):
+        br = BasicNewsRecipe.get_browser(self)
+        if self.username is not None and self.password is not None:
+            request = urllib.urlencode([('Email', self.username), ('Passwd', self.password),
+                                        ('service', 'reader'), ('accountType', 'HOSTED_OR_GOOGLE'), ('source', __appname__)])
+            response = br.open('https://www.google.com/accounts/ClientLogin', request)
+            auth = re.search('Auth=(\S*)', response.read()).group(1)
+            cookies = mechanize.CookieJar()
+            br = mechanize.build_opener(mechanize.HTTPCookieProcessor(cookies))
+            br.addheaders = [('Authorization', 'GoogleLogin auth='+auth)]
+        return br
+
+    def get_feeds(self):
+        feeds = []
+        soup = self.index_to_soup('http://www.google.com/reader/api/0/tag/list')
+        for id in soup.findAll(True, attrs={'name':['id']}):
+            url = id.contents[0]
+            feeds.append((re.search('/([^/]*)$', url).group(1),
+                          self.base_url + urllib.quote(url.encode('utf-8')) + self.get_options))
+        return feeds
diff --git a/resources/recipes/greader_uber.recipe b/resources/recipes/greader_uber.recipe
index ee48e7069d..c98762fe28 100644
--- a/resources/recipes/greader_uber.recipe
+++ b/resources/recipes/greader_uber.recipe
@@ -1,38 +1,35 @@
-import urllib, re, mechanize
-from calibre.web.feeds.recipes import BasicNewsRecipe
-from calibre import __appname__
-
-class GoogleReaderUber(BasicNewsRecipe):
-    title   = 'Google Reader Uber'
-    description = 'This recipe downloads all unread feedsfrom your Google Reader account.'
-    needs_subscription = True
-    __author__ = 'rollercoaster, davec'
-    base_url = 'http://www.google.com/reader/atom/'
-    oldest_article = 365
-    max_articles_per_feed = 250
-    get_options = '?n=%d&xt=user/-/state/com.google/read' % max_articles_per_feed
-    use_embedded_content = True
-
-    def get_browser(self):
-        br = BasicNewsRecipe.get_browser()
-
-        if self.username is not None and self.password is not None:
-            request = urllib.urlencode([('Email', self.username), ('Passwd', self.password),
-                                        ('service', 'reader'), ('source', __appname__)])
-            response = br.open('https://www.google.com/accounts/ClientLogin', request)
-            sid = re.search('SID=(\S*)', response.read()).group(1)
-
-            cookies = mechanize.CookieJar()
-            br = mechanize.build_opener(mechanize.HTTPCookieProcessor(cookies))
-            cookies.set_cookie(mechanize.Cookie(None, 'SID', sid, None, False, '.google.com', True, True, '/', True, False, None, True, '', '', None))
-        return br
-
-
-    def get_feeds(self):
-        feeds = []
-        soup = self.index_to_soup('http://www.google.com/reader/api/0/tag/list')
-        for id in soup.findAll(True, attrs={'name':['id']}):
-            url = id.contents[0].replace('broadcast','reading-list')
-            feeds.append((re.search('/([^/]*)$', url).group(1),
-                          self.base_url + urllib.quote(url.encode('utf-8')) + self.get_options))
-        return feeds
+import urllib, re, mechanize
+from calibre.web.feeds.recipes import BasicNewsRecipe
+from calibre import __appname__
+
+class GoogleReaderUber(BasicNewsRecipe):
+    title   = 'Google Reader uber'
+    description = 'Fetches all feeds from your Google Reader account including the uncategorized items.'
+    needs_subscription = True
+    __author__ = 'davec, rollercoaster, Starson17'
+    base_url = 'http://www.google.com/reader/atom/'
+    oldest_article = 365
+    max_articles_per_feed = 250
+    get_options = '?n=%d&xt=user/-/state/com.google/read' % max_articles_per_feed
+    use_embedded_content = True
+
+    def get_browser(self):
+        br = BasicNewsRecipe.get_browser(self)
+        if self.username is not None and self.password is not None:
+            request = urllib.urlencode([('Email', self.username), ('Passwd', self.password),
+                                        ('service', 'reader'), ('accountType', 'HOSTED_OR_GOOGLE'), ('source', __appname__)])
+            response = br.open('https://www.google.com/accounts/ClientLogin', request)
+            auth = re.search('Auth=(\S*)', response.read()).group(1)
+            cookies = mechanize.CookieJar()
+            br = mechanize.build_opener(mechanize.HTTPCookieProcessor(cookies))
+            br.addheaders = [('Authorization', 'GoogleLogin auth='+auth)]
+        return br
+
+    def get_feeds(self):
+        feeds = []
+        soup = self.index_to_soup('http://www.google.com/reader/api/0/tag/list')
+        for id in soup.findAll(True, attrs={'name':['id']}):
+            url = id.contents[0].replace('broadcast','reading-list')
+            feeds.append((re.search('/([^/]*)$', url).group(1),
+                          self.base_url + urllib.quote(url.encode('utf-8')) + self.get_options))
+        return feeds

From 8a5a5e2ad13d1285afb6f9ed6a6d58787ddbb7e0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 14 Jul 2010 09:01:01 -0600
Subject: [PATCH 18/19] Waco Tribune Herald by rty

---
 resources/recipes/greader.recipe      | 70 +++++++++++++--------------
 resources/recipes/greader_uber.recipe | 70 +++++++++++++--------------
 resources/recipes/waco_tribune.recipe | 34 +++++++++++++
 3 files changed, 104 insertions(+), 70 deletions(-)
 create mode 100644 resources/recipes/waco_tribune.recipe

diff --git a/resources/recipes/greader.recipe b/resources/recipes/greader.recipe
index 75c273b162..2c9d5aa015 100644
--- a/resources/recipes/greader.recipe
+++ b/resources/recipes/greader.recipe
@@ -1,35 +1,35 @@
-import urllib, re, mechanize
-from calibre.web.feeds.recipes import BasicNewsRecipe
-from calibre import __appname__
-
-class GoogleReader(BasicNewsRecipe):
-    title   = 'Google Reader'
-    description = 'This recipe fetches from your Google Reader account unread Starred items and unread Feeds you have placed in a folder via the manage subscriptions feature.'
-    needs_subscription = True
-    __author__ = 'davec, rollercoaster, Starson17'
-    base_url = 'http://www.google.com/reader/atom/'
-    oldest_article = 365
-    max_articles_per_feed = 250
-    get_options = '?n=%d&xt=user/-/state/com.google/read' % max_articles_per_feed
-    use_embedded_content = True
-
-    def get_browser(self):
-        br = BasicNewsRecipe.get_browser(self)
-        if self.username is not None and self.password is not None:
-            request = urllib.urlencode([('Email', self.username), ('Passwd', self.password),
-                                        ('service', 'reader'), ('accountType', 'HOSTED_OR_GOOGLE'), ('source', __appname__)])
-            response = br.open('https://www.google.com/accounts/ClientLogin', request)
-            auth = re.search('Auth=(\S*)', response.read()).group(1)
-            cookies = mechanize.CookieJar()
-            br = mechanize.build_opener(mechanize.HTTPCookieProcessor(cookies))
-            br.addheaders = [('Authorization', 'GoogleLogin auth='+auth)]
-        return br
-
-    def get_feeds(self):
-        feeds = []
-        soup = self.index_to_soup('http://www.google.com/reader/api/0/tag/list')
-        for id in soup.findAll(True, attrs={'name':['id']}):
-            url = id.contents[0]
-            feeds.append((re.search('/([^/]*)$', url).group(1),
-                          self.base_url + urllib.quote(url.encode('utf-8')) + self.get_options))
-        return feeds
+import urllib, re, mechanize
+from calibre.web.feeds.recipes import BasicNewsRecipe
+from calibre import __appname__
+
+class GoogleReader(BasicNewsRecipe):
+    title   = 'Google Reader'
+    description = 'This recipe fetches from your Google Reader account unread Starred items and unread Feeds you have placed in a folder via the manage subscriptions feature.'
+    needs_subscription = True
+    __author__ = 'davec, rollercoaster, Starson17'
+    base_url = 'http://www.google.com/reader/atom/'
+    oldest_article = 365
+    max_articles_per_feed = 250
+    get_options = '?n=%d&xt=user/-/state/com.google/read' % max_articles_per_feed
+    use_embedded_content = True
+
+    def get_browser(self):
+        br = BasicNewsRecipe.get_browser(self)
+        if self.username is not None and self.password is not None:
+            request = urllib.urlencode([('Email', self.username), ('Passwd', self.password),
+                                        ('service', 'reader'), ('accountType', 'HOSTED_OR_GOOGLE'), ('source', __appname__)])
+            response = br.open('https://www.google.com/accounts/ClientLogin', request)
+            auth = re.search('Auth=(\S*)', response.read()).group(1)
+            cookies = mechanize.CookieJar()
+            br = mechanize.build_opener(mechanize.HTTPCookieProcessor(cookies))
+            br.addheaders = [('Authorization', 'GoogleLogin auth='+auth)]
+        return br
+
+    def get_feeds(self):
+        feeds = []
+        soup = self.index_to_soup('http://www.google.com/reader/api/0/tag/list')
+        for id in soup.findAll(True, attrs={'name':['id']}):
+            url = id.contents[0]
+            feeds.append((re.search('/([^/]*)$', url).group(1),
+                          self.base_url + urllib.quote(url.encode('utf-8')) + self.get_options))
+        return feeds
diff --git a/resources/recipes/greader_uber.recipe b/resources/recipes/greader_uber.recipe
index c98762fe28..5e02cdef5d 100644
--- a/resources/recipes/greader_uber.recipe
+++ b/resources/recipes/greader_uber.recipe
@@ -1,35 +1,35 @@
-import urllib, re, mechanize
-from calibre.web.feeds.recipes import BasicNewsRecipe
-from calibre import __appname__
-
-class GoogleReaderUber(BasicNewsRecipe):
-    title   = 'Google Reader uber'
-    description = 'Fetches all feeds from your Google Reader account including the uncategorized items.'
-    needs_subscription = True
-    __author__ = 'davec, rollercoaster, Starson17'
-    base_url = 'http://www.google.com/reader/atom/'
-    oldest_article = 365
-    max_articles_per_feed = 250
-    get_options = '?n=%d&xt=user/-/state/com.google/read' % max_articles_per_feed
-    use_embedded_content = True
-
-    def get_browser(self):
-        br = BasicNewsRecipe.get_browser(self)
-        if self.username is not None and self.password is not None:
-            request = urllib.urlencode([('Email', self.username), ('Passwd', self.password),
-                                        ('service', 'reader'), ('accountType', 'HOSTED_OR_GOOGLE'), ('source', __appname__)])
-            response = br.open('https://www.google.com/accounts/ClientLogin', request)
-            auth = re.search('Auth=(\S*)', response.read()).group(1)
-            cookies = mechanize.CookieJar()
-            br = mechanize.build_opener(mechanize.HTTPCookieProcessor(cookies))
-            br.addheaders = [('Authorization', 'GoogleLogin auth='+auth)]
-        return br
-
-    def get_feeds(self):
-        feeds = []
-        soup = self.index_to_soup('http://www.google.com/reader/api/0/tag/list')
-        for id in soup.findAll(True, attrs={'name':['id']}):
-            url = id.contents[0].replace('broadcast','reading-list')
-            feeds.append((re.search('/([^/]*)$', url).group(1),
-                          self.base_url + urllib.quote(url.encode('utf-8')) + self.get_options))
-        return feeds
+import urllib, re, mechanize
+from calibre.web.feeds.recipes import BasicNewsRecipe
+from calibre import __appname__
+
+class GoogleReaderUber(BasicNewsRecipe):
+    title   = 'Google Reader uber'
+    description = 'Fetches all feeds from your Google Reader account including the uncategorized items.'
+    needs_subscription = True
+    __author__ = 'davec, rollercoaster, Starson17'
+    base_url = 'http://www.google.com/reader/atom/'
+    oldest_article = 365
+    max_articles_per_feed = 250
+    get_options = '?n=%d&xt=user/-/state/com.google/read' % max_articles_per_feed
+    use_embedded_content = True
+
+    def get_browser(self):
+        br = BasicNewsRecipe.get_browser(self)
+        if self.username is not None and self.password is not None:
+            request = urllib.urlencode([('Email', self.username), ('Passwd', self.password),
+                                        ('service', 'reader'), ('accountType', 'HOSTED_OR_GOOGLE'), ('source', __appname__)])
+            response = br.open('https://www.google.com/accounts/ClientLogin', request)
+            auth = re.search('Auth=(\S*)', response.read()).group(1)
+            cookies = mechanize.CookieJar()
+            br = mechanize.build_opener(mechanize.HTTPCookieProcessor(cookies))
+            br.addheaders = [('Authorization', 'GoogleLogin auth='+auth)]
+        return br
+
+    def get_feeds(self):
+        feeds = []
+        soup = self.index_to_soup('http://www.google.com/reader/api/0/tag/list')
+        for id in soup.findAll(True, attrs={'name':['id']}):
+            url = id.contents[0].replace('broadcast','reading-list')
+            feeds.append((re.search('/([^/]*)$', url).group(1),
+                          self.base_url + urllib.quote(url.encode('utf-8')) + self.get_options))
+        return feeds
diff --git a/resources/recipes/waco_tribune.recipe b/resources/recipes/waco_tribune.recipe
new file mode 100644
index 0000000000..18eb61fb26
--- /dev/null
+++ b/resources/recipes/waco_tribune.recipe
@@ -0,0 +1,34 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1278773519(BasicNewsRecipe):
+    title          = u'Waco Tribune Herald'
+    __author__ = 'rty'
+    pubisher  = 'A Robinson Media Company'
+    description           = 'Waco, Texas, Newspaper'
+    category              = 'News, Texas, Waco'
+    oldest_article = 7
+    max_articles_per_feed = 100
+
+    feeds          = [
+	(u'News', u'http://www.wacotrib.com/news/index.rss2'),
+	(u'Sports', u'http://www.wacotrib.com/sports/index.rss2'),
+	(u'AccessWaco', u'http://www.wacotrib.com/accesswaco/index.rss2'),
+	(u'Opinions', u'http://www.wacotrib.com/opinion/index.rss2')
+	]
+
+    remove_javascript = True
+    use_embedded_content   = False
+    no_stylesheets = True
+    language = 'en'
+    encoding               = 'utf-8'
+    conversion_options = {'linearize_tables':True}
+    masthead_url = 'http://media.wacotrib.com/designimages/wacotrib_logo.jpg'
+    keep_only_tags = [
+                              dict(name='div', attrs={'class':'twoColumn left'}),
+                               ]
+    remove_tags = [
+                    dict(name='div', attrs={'class':'right blueLinks'}),
+                         ]
+    remove_tags_after = [
+                  dict(name='div', attrs={'class':'dottedRule'}),
+                         ]

From 01d5dcff6fbeeb1bb24bce807962743cdf8d9e9c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 14 Jul 2010 09:03:20 -0600
Subject: [PATCH 19/19] Support for another variant of the Samsung Galaxy

---
 src/calibre/devices/android/driver.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py
index 9951dc57ad..5d9d094b26 100644
--- a/src/calibre/devices/android/driver.py
+++ b/src/calibre/devices/android/driver.py
@@ -30,7 +30,8 @@ class ANDROID(USBMS):
             0x18d1 : { 0x4e11 : [0x0100, 0x226], 0x4e12: [0x0100, 0x226]},
 
             # Samsung
-            0x04e8 : { 0x681d : [0x0222, 0x0400], 0x681c : [0x0222, 0x0224]},
+            0x04e8 : { 0x681d : [0x0222, 0x0400],
+                       0x681c : [0x0222, 0x0224, 0x0400]},
 
             # Acer
             0x502 : { 0x3203 : [0x0100]},