Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2025-02-14 19:32:21 +05:30
commit a925de679c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ from qt.core import QAbstractItemView, QApplication, QDialog, QIcon, QMenu, QSiz
from calibre.constants import config_dir from calibre.constants import config_dir
from calibre.db.constants import TEMPLATE_ICON_INDICATOR from calibre.db.constants import TEMPLATE_ICON_INDICATOR
from calibre.gui2 import choose_files, error_dialog, gprefs, pixmap_to_data from calibre.gui2 import choose_files, gprefs, pixmap_to_data
from calibre.gui2.dialogs.tag_list_editor import block_signals from calibre.gui2.dialogs.tag_list_editor import block_signals
from calibre.gui2.dialogs.template_dialog import TemplateDialog from calibre.gui2.dialogs.template_dialog import TemplateDialog
from calibre.gui2.library.delegates import DelegateCB from calibre.gui2.library.delegates import DelegateCB
@ -53,13 +53,19 @@ class StateTableWidgetItem(QTableWidgetItem):
class CategoryTableWidgetItem(QTableWidgetItem): class CategoryTableWidgetItem(QTableWidgetItem):
def __init__(self, lookup_name, category_icons, display_name, table): def __init__(self, lookup_name, category_icons, display_name, field_metadata, table):
txt = display_name + f' ({lookup_name})' if in_library := (lookup_name in field_metadata):
txt = display_name + f' ({lookup_name})'
else:
txt = display_name + ' (' + _('Not in library') + ')'
super().__init__(txt) super().__init__(txt)
self._lookup_name = lookup_name self._lookup_name = lookup_name
self._table = table self._table = table
self._is_deleted = False self._is_deleted = False
self.setIcon(category_icons.get(lookup_name) or QIcon.cached_icon('column.png')) if in_library:
self.setIcon(category_icons.get(lookup_name) or QIcon.cached_icon('column.png'))
else:
self.setIcon(QIcon.cached_icon('dialog_error.png'))
self._txt = txt self._txt = txt
self.setFlags(self.flags() & ~Qt.ItemFlag.ItemIsEditable) self.setFlags(self.flags() & ~Qt.ItemFlag.ItemIsEditable)
@ -446,22 +452,14 @@ class TbIconRulesTab(LazyConfigWidgetBase, Ui_Form):
t = self.rules_table t = self.rules_table
t.clearContents() t.clearContents()
all_values = {} all_values = {}
all_field_keys = field_metadata.all_field_keys()
for category,vdict in v.items(): for category,vdict in v.items():
if category in field_metadata: if category in field_metadata:
display_name = field_metadata[category]['name'] display_name = field_metadata[category]['name']
try: try:
all_values[category] = set(self.gui.current_db.new_api.all_field_names(category)) all_values[category] = set(self.gui.current_db.new_api.all_field_names(category))
except ValueError: except ValueError:
error_dialog(self.gui, _("Invalid column '{}' in the rule set").format(category), all_values[category] = set()
'<p>' +_("The column '{}' is in the rule set but shouldn't be. It is "
"probably a column 'built from other columns' that reused the "
"lookup name of some previously deleted custom column. "
"The invalid rule has been removed.").format(category) + '</p>',
show=True)
prf = gprefs['tags_browser_value_icons']
prf.pop(category, None)
gprefs['tags_browser_value_icons'] = prf
continue
if is_hierarchical_category(category): if is_hierarchical_category(category):
for value in all_values: for value in all_values:
idx = 0 idx = 0
@ -473,7 +471,7 @@ class TbIconRulesTab(LazyConfigWidgetBase, Ui_Form):
continue continue
else: else:
display_name = category.removeprefix('#') display_name = category.removeprefix('#')
all_values = {category: set()} all_values[category] = set()
self.all_values = all_values self.all_values = all_values
with block_signals(self.rules_table): with block_signals(self.rules_table):
@ -485,7 +483,7 @@ class TbIconRulesTab(LazyConfigWidgetBase, Ui_Form):
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, display_name, t)) CategoryTableWidgetItem(category, category_icons, display_name, field_metadata, t))
t.setItem(row, ICON_MODIFIED_COLUMN, StateTableWidgetItem('')) t.setItem(row, ICON_MODIFIED_COLUMN, StateTableWidgetItem(''))
t.setItem(row, VALUE_COLUMN, ValueTableWidgetItem(item_value, t, all_values[category])) t.setItem(row, VALUE_COLUMN, ValueTableWidgetItem(item_value, t, all_values[category]))
t.setItem(row, ICON_COLUMN, IconFileTableWidgetItem(d[0], item_value, t)) t.setItem(row, ICON_COLUMN, IconFileTableWidgetItem(d[0], item_value, t))