From c7b54fccf236d0cd2ba41b1baf9f4b39000fe858 Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Thu, 16 Jan 2025 20:42:32 +0000 Subject: [PATCH 1/2] Escape ampersands in tag browser icon value strings. --- src/calibre/gui2/tag_browser/view.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/tag_browser/view.py b/src/calibre/gui2/tag_browser/view.py index 6d8a5f7cb8..865524f1eb 100644 --- a/src/calibre/gui2/tag_browser/view.py +++ b/src/calibre/gui2/tag_browser/view.py @@ -1259,7 +1259,7 @@ class TagsView(QTreeView): # {{{ return name, icon_name, for_child name, icon_name, for_child = get_rule_data(tag, key) - for_name = name or _('this value') + for_name = (name or _('this value')).replace('&', '&&') im = cm.addMenu(_('Manage icon for {}').format(for_name)) if name is not None: im.addSection(_('Current value: {}').format(name)) From 9e1faa14750e116724470c5c153ffe63e8f67af6 Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Thu, 16 Jan 2025 21:26:41 +0000 Subject: [PATCH 2/2] Fix regression setting the default category icon --- src/calibre/gui2/tag_browser/view.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/tag_browser/view.py b/src/calibre/gui2/tag_browser/view.py index 865524f1eb..d691cbcd70 100644 --- a/src/calibre/gui2/tag_browser/view.py +++ b/src/calibre/gui2/tag_browser/view.py @@ -704,7 +704,7 @@ class TagsView(QTreeView): # {{{ self._model.set_value_icon(key, TEMPLATE_ICON_INDICATOR, d.rule[2], False) self.recount() return - (icon_file_name, for_children) = extra + (icon_file_name, for_children) = extra if extra is not None else (None, None) item_val, desired_file_name = make_icon_name(key, index) if icon_file_name is None: # User wants to specify a specific icon