Merge from trunk

This commit is contained in:
Charles Haley 2011-02-14 05:14:20 +00:00
commit 515be68c2c
2 changed files with 2 additions and 2 deletions

View File

@ -105,7 +105,7 @@ bool_custom_columns_are_tristate = 'yes'
# title within authors. # title within authors.
sort_columns_at_startup = None sort_columns_at_startup = None
#; Control how dates are displayed #: Control how dates are displayed
# Format to be used for publication date and the timestamp (date). # Format to be used for publication date and the timestamp (date).
# A string controlling how the publication date is displayed in the GUI # A string controlling how the publication date is displayed in the GUI
# d the day as number without a leading zero (1 to 31) # d the day as number without a leading zero (1 to 31)

View File

@ -123,7 +123,7 @@ class BooksModel(QAbstractTableModel): # {{{
def refresh_ondevice(self): def refresh_ondevice(self):
self.db.refresh_ondevice() self.db.refresh_ondevice()
self.resort() #self.refresh() # does a resort() self.resort()
self.research() self.research()
def set_book_on_device_func(self, func): def set_book_on_device_func(self, func):