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
Fixes #2098133 [Setting custom icon for category doesn't work](https://bugs.launchpad.net/calibre/+bug/2098133)
This commit is contained in:
commit
e485c2a50d
@ -66,7 +66,8 @@ class DefaultAuthorLink(QWidget):
|
||||
u.setToolTip(_(
|
||||
'Enter the URL to search. It should contain the string {0}'
|
||||
'\nwhich will be replaced by the author name. For example,'
|
||||
'\n{1}').format('{author}', 'https://en.wikipedia.org/w/index.php?search={author}'))
|
||||
'\n{1}. Note: the author name is already URL-encoded.').format(
|
||||
'{author}', 'https://en.wikipedia.org/w/index.php?search={author}'))
|
||||
u.textChanged.connect(self.changed_signal)
|
||||
u.setPlaceholderText(_('Enter the URL'))
|
||||
ul.addWidget(u)
|
||||
|
@ -713,7 +713,8 @@ class TagsView(QTreeView): # {{{
|
||||
self.recount()
|
||||
return
|
||||
icon_file_name, for_children = extra if extra is not None else (None, None)
|
||||
item_val, desired_file_name = make_icon_name(key, index, self._model.get_node(index).tag.id)
|
||||
item_val, desired_file_name = make_icon_name(key, index,
|
||||
None if index is None else self._model.get_node(index).tag.id)
|
||||
if icon_file_name is None:
|
||||
# User wants to specify a specific icon
|
||||
try:
|
||||
|
Loading…
x
Reference in New Issue
Block a user