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

Fixes #1899881 [[Enhancement] Show User categories symbol for the Manage User categories action at Tag browser context menu](https://bugs.launchpad.net/calibre/+bug/1899881)
This commit is contained in:
Kovid Goyal
2020-10-15 15:05:54 +05:30
+4 -2
View File
@@ -796,11 +796,13 @@ class TagsView(QTreeView): # {{{
self.context_menu.addSeparator()
if key.startswith('@') and \
key[1:] in self.db.new_api.pref('user_categories', {}).keys():
self.context_menu.addAction(_('Manage User categories'),
self.context_menu.addAction(self.user_category_icon,
_('Manage User categories'),
partial(self.context_menu_handler, action='manage_categories',
category=key[1:]))
else:
self.context_menu.addAction(_('Manage User categories'),
self.context_menu.addAction(self.user_category_icon,
_('Manage User categories'),
partial(self.context_menu_handler, action='manage_categories',
category=None))