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 #1946559 [[Enhancement] Add a separator to the context menu shown when right clicking on a sub category in the Tag browser](https://bugs.launchpad.net/calibre/+bug/1946559) Fixes #1946560 [[Enhancement] Search for sub category in Tag brower](https://bugs.launchpad.net/calibre/+bug/1946560)
This commit is contained in:
commit
188e9fb4ca
@ -884,12 +884,29 @@ class TagsView(QTreeView): # {{{
|
|||||||
partial(self.context_menu_handler,
|
partial(self.context_menu_handler,
|
||||||
action='delete_user_category', key=key))
|
action='delete_user_category', key=key))
|
||||||
self.context_menu.addSeparator()
|
self.context_menu.addSeparator()
|
||||||
|
# Add searches for temporary first letter nodes
|
||||||
|
if self._model.collapse_model == 'first letter' and \
|
||||||
|
tag_item.temporary and not key.startswith('@'):
|
||||||
|
self.context_menu.addSeparator()
|
||||||
|
search_submenu = self.context_menu.addMenu(_('Search'))
|
||||||
|
search_submenu.addAction(self.search_icon,
|
||||||
|
_('Search for %s')%display_name(tag_item.tag),
|
||||||
|
partial(self.context_menu_handler, action='search',
|
||||||
|
search_state=TAG_SEARCH_STATES['mark_plus'],
|
||||||
|
index=index))
|
||||||
|
search_submenu.addAction(self.search_icon,
|
||||||
|
_('Search for everything but %s')%display_name(tag_item.tag),
|
||||||
|
partial(self.context_menu_handler, action='search',
|
||||||
|
search_state=TAG_SEARCH_STATES['mark_minus'],
|
||||||
|
index=index))
|
||||||
# search by category. Some categories are not searchable, such
|
# search by category. Some categories are not searchable, such
|
||||||
# as search and news
|
# as search and news
|
||||||
if item.tag.is_searchable:
|
if item.tag.is_searchable:
|
||||||
if search_submenu is None:
|
if search_submenu is None:
|
||||||
search_submenu = self.context_menu.addMenu(_('Search'))
|
search_submenu = self.context_menu.addMenu(_('Search'))
|
||||||
self.context_menu.addSeparator()
|
self.context_menu.addSeparator()
|
||||||
|
else:
|
||||||
|
search_submenu.addSeparator()
|
||||||
search_submenu.addAction(self.search_icon,
|
search_submenu.addAction(self.search_icon,
|
||||||
_('Search for books in category %s')%category,
|
_('Search for books in category %s')%category,
|
||||||
partial(self.context_menu_handler,
|
partial(self.context_menu_handler,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user