mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge branch 'master' of https://github.com/cbhaley/calibre
This commit is contained in:
commit
e3dc567edd
@ -704,7 +704,7 @@ class TagsView(QTreeView): # {{{
|
|||||||
self._model.set_value_icon(key, TEMPLATE_ICON_INDICATOR, d.rule[2], False)
|
self._model.set_value_icon(key, TEMPLATE_ICON_INDICATOR, d.rule[2], False)
|
||||||
self.recount()
|
self.recount()
|
||||||
return
|
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)
|
item_val, desired_file_name = make_icon_name(key, index)
|
||||||
if icon_file_name is None:
|
if icon_file_name is None:
|
||||||
# User wants to specify a specific icon
|
# User wants to specify a specific icon
|
||||||
@ -1259,7 +1259,7 @@ class TagsView(QTreeView): # {{{
|
|||||||
return name, icon_name, for_child
|
return name, icon_name, for_child
|
||||||
|
|
||||||
name, icon_name, for_child = get_rule_data(tag, key)
|
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))
|
im = cm.addMenu(_('Manage icon for {}').format(for_name))
|
||||||
if name is not None:
|
if name is not None:
|
||||||
im.addSection(_('Current value: {}').format(name))
|
im.addSection(_('Current value: {}').format(name))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user