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

fix exception in icon rulers for custom columns

Browse Source 
if their don't exist in the current library, fail to initialize the contents
This commit is contained in:
un-pogaz 2025-01-29 13:25:16 +01:00
parent ea4aebf878
commit c4d25cdaa7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/gui2/preferences/look_feel_tabs/tb_icon_rules.py
View File

@ -51,13 +51,13 @@ class StateTableWidgetItem(QTableWidgetItem):
class CategoryTableWidgetItem(QTableWidgetItem): class CategoryTableWidgetItem(QTableWidgetItem):
def __init__(self, lookup_name, category_icons, field_metadata, table): def __init__(self, lookup_name, category_icons, display_name, table):
txt = field_metadata[lookup_name]['name'] + f' ({lookup_name})' txt = display_name + f' ({lookup_name})'
super().__init__(txt) super().__init__(txt)
self._lookup_name = lookup_name self._lookup_name = lookup_name
self._table = table self._table = table
self._is_modified = False self._is_modified = False
self.setIcon(category_icons[lookup_name]) self.setIcon(category_icons.get(lookup_name) or QIcon.cached_icon('column.png'))
self._txt = txt self._txt = txt
self.setFlags(self.flags() & ~Qt.ItemFlag.ItemIsEditable) self.setFlags(self.flags() & ~Qt.ItemFlag.ItemIsEditable)
@ -351,12 +351,16 @@ class TbIconRulesTab(LazyConfigWidgetBase, Ui_Form):
ChildrenColumnDelegate(self, self.rules_table, self.changed_signal)) ChildrenColumnDelegate(self, self.rules_table, self.changed_signal))
for category,vdict in v.items(): for category,vdict in v.items():
if category in field_metadata:
display_name = field_metadata[category]['name']
else:
display_name = category.removeprefix('#')
for item_value in vdict: for item_value in vdict:
t.setRowCount(row + 1) t.setRowCount(row + 1)
d = v[category][item_value] d = v[category][item_value]
t.setItem(row, DELETED_COLUMN, StateTableWidgetItem('')) t.setItem(row, DELETED_COLUMN, StateTableWidgetItem(''))
t.setItem(row, CATEGORY_COLUMN, t.setItem(row, CATEGORY_COLUMN,
CategoryTableWidgetItem(category, category_icons, field_metadata, t)) CategoryTableWidgetItem(category, category_icons, display_name, t))
t.setItem(row, ICON_MODIFIED_COLUMN, StateTableWidgetItem('')) t.setItem(row, ICON_MODIFIED_COLUMN, StateTableWidgetItem(''))
t.setItem(row, VALUE_COLUMN, ValueTableWidgetItem(item_value, t)) t.setItem(row, VALUE_COLUMN, ValueTableWidgetItem(item_value, t))
t.setItem(row, ICON_COLUMN, IconFileTableWidgetItem(d[0], item_value, t)) t.setItem(row, ICON_COLUMN, IconFileTableWidgetItem(d[0], item_value, t))