Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from custcol trunk

Browse Source
This commit is contained in:
Charles Haley 2010-05-09 22:45:34 +01:00
commit 144d018b91
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/devices/usbms/books.py
View File

@ -49,7 +49,7 @@ class Book(object):
@property @property
def db_id(self): def db_id(self):
'''The database id in the application database that this file corresponds to''' '''The database id in the application database that this file corresponds to'''
match = re.search(r'_(\d+)$', self.rpath.rpartition('.')[0]) match = re.search(r'_(\d+)$', self.path.rpartition('.')[0])
if match: if match:
return int(match.group(1)) return int(match.group(1))

23
src/calibre/gui2/library.py
View File

@ -788,6 +788,12 @@ class BooksModel(QAbstractTableModel):
return self.bool_blank_icon return self.bool_blank_icon
return self.bool_no_icon return self.bool_no_icon
def ondevice_decorator(r, idx=-1):
text = self.db.data[r][idx]
if text:
return self.bool_yes_icon
return self.bool_blank_icon
def text_type(r, mult=False, idx=-1): def text_type(r, mult=False, idx=-1):
text = self.db.data[r][idx] text = self.db.data[r][idx]
if text and mult: if text and mult:
@ -820,7 +826,11 @@ class BooksModel(QAbstractTableModel):
'ondevice' : functools.partial(text_type, 'ondevice' : functools.partial(text_type,
idx=self.db.FIELD_MAP['ondevice'], mult=False), idx=self.db.FIELD_MAP['ondevice'], mult=False),
} }
self.dc_decorator = {}
self.dc_decorator = {
'ondevice':functools.partial(ondevice_decorator,
idx=self.db.FIELD_MAP['ondevice']),
}
# Add the custom columns to the data converters # Add the custom columns to the data converters
for col in self.custom_columns: for col in self.custom_columns:
@ -1420,11 +1430,11 @@ class DeviceBooksModel(BooksModel):
''' '''
Return indices into underlying database from rows Return indices into underlying database from rows
''' '''
return [ self.map[r.row()] for r in rows] return [self.map[r.row()] for r in rows]
def data(self, index, role): def data(self, index, role):
row, col = index.row(), index.column()
if role == Qt.DisplayRole or role == Qt.EditRole: if role == Qt.DisplayRole or role == Qt.EditRole:
row, col = index.row(), index.column()
if col == 0: if col == 0:
text = self.db[self.map[row]].title text = self.db[self.map[row]].title
if not text: if not text:
@ -1449,9 +1459,6 @@ class DeviceBooksModel(BooksModel):
tags = self.db[self.map[row]].tags tags = self.db[self.map[row]].tags
if tags: if tags:
return QVariant(', '.join(tags)) return QVariant(', '.join(tags))
elif col == 5:
return QVariant(_('Yes')) \
if self.db[self.map[row]].in_library else QVariant(_('No'))
elif role == Qt.TextAlignmentRole and index.column() in [2, 3]: elif role == Qt.TextAlignmentRole and index.column() in [2, 3]:
return QVariant(Qt.AlignRight | Qt.AlignVCenter) return QVariant(Qt.AlignRight | Qt.AlignVCenter)
elif role == Qt.ToolTipRole and index.isValid(): elif role == Qt.ToolTipRole and index.isValid():
@ -1460,6 +1467,10 @@ class DeviceBooksModel(BooksModel):
col = index.column() col = index.column()
if col in [0, 1] or (col == 4 and self.db.supports_tags()): if col in [0, 1] or (col == 4 and self.db.supports_tags()):
return QVariant(_("Double click to <b>edit</b> me<br><br>")) return QVariant(_("Double click to <b>edit</b> me<br><br>"))
elif role == Qt.DecorationRole and col == 5:
if self.db[self.map[row]].in_library:
return QVariant(self.bool_yes_icon)
return NONE return NONE
def headerData(self, section, orientation, role): def headerData(self, section, orientation, role):