Merge from trunk

src/calibre/gui2/device.py

@@ -800,7 +800,7 @@ class DeviceMixin(object): # {{{
         # if set_books_in_library did not.
         if not self.set_books_in_library(self.booklists(), reset=True):
             self.upload_booklists()
-        self.book_on_device(None, None, reset=True)
+        self.book_on_device(None, reset=True)
         # We need to reset the ondevice flags in the library. Use a big hammer,
         # so we don't need to worry about whether some succeeded or not.
         self.refresh_ondevice_info(device_connected=True, reset_only=False)
@@ -1309,7 +1309,7 @@ class DeviceMixin(object): # {{{
         for f in files:
             getattr(f, 'close', lambda : True)()
 
-    def book_on_device(self, id, format=None, reset=False):
+    def book_on_device(self, id, reset=False):
         '''
         Return an indication of whether the given book represented by its db id
         is on the currently connected device. It returns a 5 element list. The
@@ -1338,8 +1338,6 @@ class DeviceMixin(object): # {{{
                 self.book_db_id_cache.append(set())
                 for book in l:
                     db_id = getattr(book, 'application_id', None)
-                    if db_id is None:
-                        db_id = book.db_id
                     if db_id is not None:
                         # increment the count of books on the device with this
                         # db_id.

src/calibre/gui2/preferences/create_custom_column.py

@@ -39,7 +39,7 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
                     8:{'datatype':'bool',
                         'text':_('Yes/No'), 'is_multiple':False},
                     8:{'datatype':'composite',
-                        'text':_('Field built from other fields'), 'is_multiple':False},
+                        'text':_('Column built from other columns'), 'is_multiple':False},
                 }
 
     def __init__(self, parent, editing, standard_colheads, standard_colnames):
@@ -153,7 +153,8 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
 
         if col_type == 'composite':
             if not self.composite_box.text():
-                return self.simple_error('', _('You must enter a template for composite fields'))
+                return self.simple_error('', _('You must enter a template for'
+                    ' composite columns'))
             display_dict = {'composite_template':unicode(self.composite_box.text())}
             is_editable = False
         else:

src/calibre/library/database2.py

@@ -522,7 +522,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
 
     def get_metadata(self, idx, index_is_id=False, get_cover=False):
         '''
-        Convenience method to return metadata as a L{Metadata} object.
+        Convenience method to return metadata as a :class:`Metadata` object.
         '''
         mi = self.data.get(idx, self.FIELD_MAP['all_metadata'],
                            row_is_id = index_is_id)

src/calibre/library/server/mobile.py

@@ -17,7 +17,7 @@ from calibre.library.server.utils import strftime, format_tag_string
 from calibre.ebooks.metadata import fmt_sidx
 from calibre.constants import __appname__
 from calibre import human_readable
-from calibre.utils.date import utcfromtimestamp, format_date
+from calibre.utils.date import utcfromtimestamp
 
 def CLASS(*args, **kwargs): # class is a reserved word in Python
     kwargs['class'] = ' '.join(args)

src/calibre/library/server/xml.py

@@ -15,7 +15,6 @@ from calibre.library.server.utils import strftime, format_tag_string
 from calibre.ebooks.metadata import fmt_sidx
 from calibre.constants import preferred_encoding
 from calibre import isbytestring
-from calibre.utils.date import format_date
 
 E = ElementMaker()
 

src/calibre/manual/faq.rst

@@ -280,6 +280,13 @@ Why doesn't |app| have a column for foo?
 |app| is designed to have columns for the most frequently and widely used fields. In addition, you can add any columns you like. Columns can be added via :guilabel:`Preferences->Interface->Add your own columns`.
 Watch the tutorial `UI Power tips <http://calibre-ebook.com/demo#tutorials>`_ to learn how to create your own columns.
 
+You can also create "virtual columns" that contain combinations of the metadata from other columns. In the add column dialog choose the option "Column from other columns" and in the template enter the other column names. For example to create a virtual column containing formats or ISBN, enter ``{formats}`` for formats or ``{isbn}`` for ISBN.
+
+
+Can I have a column showing the formats or the ISBN?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Yes, you can. Follow the instructions in the answer above for adding custom columns. 
+
 How do I move my |app| library from one computer to another?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Simply copy the |app| library folder from the old to the new computer. You can find out what the library folder is by clicking the calibre icon in the toolbar. The very first item is the path to the library folder. Now on the new computer, start |app| for the first time. It will run the Welcome Wizard asking you for the location of the |app| library. Point it to the previously copied folder.