Make 0.6.x work with db and settings from 0.7.x

This commit is contained in:
Kovid Goyal 2010-05-06 09:47:42 -06:00
parent 1d2043815b
commit 440eb3f438

View File

@ -186,6 +186,7 @@ class BooksModel(QAbstractTableModel):
QAbstractTableModel.__init__(self, parent) QAbstractTableModel.__init__(self, parent)
self.db = None self.db = None
self.column_map = config['column_map'] self.column_map = config['column_map']
self.column_map = [x for x in self.column_map if x in self.headers]
self.editable_cols = ['title', 'authors', 'rating', 'publisher', self.editable_cols = ['title', 'authors', 'rating', 'publisher',
'tags', 'series', 'timestamp', 'pubdate'] 'tags', 'series', 'timestamp', 'pubdate']
self.default_image = QImage(I('book.svg')) self.default_image = QImage(I('book.svg'))
@ -202,6 +203,7 @@ class BooksModel(QAbstractTableModel):
def read_config(self): def read_config(self):
self.use_roman_numbers = config['use_roman_numerals_for_series_number'] self.use_roman_numbers = config['use_roman_numerals_for_series_number']
cols = config['column_map'] cols = config['column_map']
cols = [x for x in cols if x in self.headers]
if cols != self.column_map: if cols != self.column_map:
self.column_map = cols self.column_map = cols
self.reset() self.reset()