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

Allow column icon rules on decorated columns such as yes/no. Enhancement #1721374

Browse Source
This commit is contained in:
Charles Haley 2017-10-05 08:44:57 +02:00
parent 96e91d2515
commit f4f586a211
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/gui2/library/models.py
View File

@ -934,11 +934,9 @@ class BooksModel(QAbstractTableModel): # {{{
self.column_color.mi = None self.column_color.mi = None
return None return None
elif role == Qt.DecorationRole: elif role == Qt.DecorationRole:
default_icon = None
if self.column_to_dc_decorator_map[col] is not None: if self.column_to_dc_decorator_map[col] is not None:
ccicon = self.column_to_dc_decorator_map[index.column()](index.row()) default_icon = self.column_to_dc_decorator_map[index.column()](index.row())
if ccicon is not None:
return ccicon
rules = self.db.prefs['column_icon_rules'] rules = self.db.prefs['column_icon_rules']
if rules: if rules:
key = self.column_map[col] key = self.column_map[col]
@ -960,10 +958,11 @@ class BooksModel(QAbstractTableModel): # {{{
self.icon_template_cache) self.icon_template_cache)
if ccicon is not None: if ccicon is not None:
return ccicon return ccicon
if need_icon_with_text: if need_icon_with_text and default_icon is None:
self.icon_cache[id_][cache_index] = self.bool_blank_icon self.icon_cache[id_][cache_index] = self.bool_blank_icon
return self.bool_blank_icon return self.bool_blank_icon
self.icon_cache[id_][cache_index] = None self.icon_cache[id_][cache_index] = None
return default_icon
elif role == Qt.TextAlignmentRole: elif role == Qt.TextAlignmentRole:
cname = self.column_map[index.column()] cname = self.column_map[index.column()]
ans = Qt.AlignVCenter | ALIGNMENT_MAP[self.alignment_map.get(cname, ans = Qt.AlignVCenter | ALIGNMENT_MAP[self.alignment_map.get(cname,