Merge branch 'fix-icon_rules-initialize-fail' of https://github.com/u…

…n-pogaz/calibre
kovidgoyal · Jan 29, 2025 · fb58ebd · fb58ebd
2 parents ea4aebf + c4d25cd
commit fb58ebd
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/calibre/gui2/preferences/look_feel_tabs/tb_icon_rules.py b/src/calibre/gui2/preferences/look_feel_tabs/tb_icon_rules.py
@@ -51,13 +51,13 @@ def setText(self, txt):
 
 class CategoryTableWidgetItem(QTableWidgetItem):
 
-    def __init__(self, lookup_name, category_icons, field_metadata, table):
-        txt = field_metadata[lookup_name]['name'] + f' ({lookup_name})'
+    def __init__(self, lookup_name, category_icons, display_name, table):
+        txt = display_name + f' ({lookup_name})'
         super().__init__(txt)
         self._lookup_name = lookup_name
         self._table = table
         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.setFlags(self.flags() & ~Qt.ItemFlag.ItemIsEditable)
 
@@ -351,12 +351,16 @@ def lazy_initialize(self):
                                    ChildrenColumnDelegate(self, self.rules_table, self.changed_signal))
 
         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:
                 t.setRowCount(row + 1)
                 d = v[category][item_value]
                 t.setItem(row, DELETED_COLUMN, StateTableWidgetItem(''))
                 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, VALUE_COLUMN, ValueTableWidgetItem(item_value, t))
                 t.setItem(row, ICON_COLUMN, IconFileTableWidgetItem(d[0], item_value, t))