Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes #1902582 [[Enhancement] Add a submenu to the Search for books action in the Tag browser context menu](https://bugs.launchpad.net/calibre/+bug/1902582)
This commit is contained in:
Kovid Goyal 2020-11-03 15:22:49 +05:30
commit 6fc7d62f38
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/calibre/gui2/tag_browser/view.py
View File

@ -634,6 +634,7 @@ class TagsView(QTreeView): # {{{
m.addAction(_('All categories'), m.addAction(_('All categories'),
partial(self.context_menu_handler, action='defaults')) partial(self.context_menu_handler, action='defaults'))
search_submenu = None
if index.isValid(): if index.isValid():
item = index.data(Qt.UserRole) item = index.data(Qt.UserRole)
tag = None tag = None
@ -748,17 +749,18 @@ class TagsView(QTreeView): # {{{
if tag.is_searchable: if tag.is_searchable:
# Add the search for value items. All leaf nodes are searchable # Add the search for value items. All leaf nodes are searchable
self.context_menu.addSeparator() self.context_menu.addSeparator()
self.context_menu.addAction(self.search_icon, search_submenu = self.context_menu.addMenu(_('Search'))
search_submenu.addAction(self.search_icon,
_('Search for %s')%display_name(tag), _('Search for %s')%display_name(tag),
partial(self.context_menu_handler, action='search', partial(self.context_menu_handler, action='search',
search_state=TAG_SEARCH_STATES['mark_plus'], search_state=TAG_SEARCH_STATES['mark_plus'],
index=index)) index=index))
self.context_menu.addAction(self.search_icon, search_submenu.addAction(self.search_icon,
_('Search for everything but %s')%display_name(tag), _('Search for everything but %s')%display_name(tag),
partial(self.context_menu_handler, action='search', partial(self.context_menu_handler, action='search',
search_state=TAG_SEARCH_STATES['mark_minus'], search_state=TAG_SEARCH_STATES['mark_minus'],
index=index)) index=index))
self.context_menu.addAction(self.search_copy_icon, search_submenu.addAction(self.search_copy_icon,
_('Search using saved search expression'), _('Search using saved search expression'),
partial(self.context_menu_handler, action='raw_search', partial(self.context_menu_handler, action='raw_search',
key=tag.name)) key=tag.name))
@ -779,27 +781,25 @@ 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()
# Hide/Show/Restore categories
self.context_menu.addAction(_('Hide category %s') % category,
partial(self.context_menu_handler, action='hide',
category=key))
add_show_hidden_categories()
# 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:
self.context_menu.addAction(self.search_icon, if search_submenu is None:
search_submenu = self.context_menu.addMenu(_('Search'))
self.context_menu.addSeparator()
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,
action='search_category', action='search_category',
index=self._model.createIndex(item.row(), 0, item), index=self._model.createIndex(item.row(), 0, item),
search_state=TAG_SEARCH_STATES['mark_plus'])) search_state=TAG_SEARCH_STATES['mark_plus']))
self.context_menu.addAction(self.search_icon, search_submenu.addAction(self.search_icon,
_('Search for books not in category %s')%category, _('Search for books not in category %s')%category,
partial(self.context_menu_handler, partial(self.context_menu_handler,
action='search_category', action='search_category',
index=self._model.createIndex(item.row(), 0, item), index=self._model.createIndex(item.row(), 0, item),
search_state=TAG_SEARCH_STATES['mark_minus'])) search_state=TAG_SEARCH_STATES['mark_minus']))
# Offer specific editors for tags/series/publishers/saved searches # Offer specific editors for tags/series/publishers/saved searches
self.context_menu.addSeparator() self.context_menu.addSeparator()
if key in ['tags', 'publisher', 'series'] or ( if key in ['tags', 'publisher', 'series'] or (
@ -836,6 +836,13 @@ class TagsView(QTreeView): # {{{
partial(self.context_menu_handler, action='manage_searches', partial(self.context_menu_handler, action='manage_searches',
category=tag.name if tag else None)) category=tag.name if tag else None))
# Hide/Show/Restore categories
self.context_menu.addSeparator()
self.context_menu.addAction(_('Hide category %s') % category,
partial(self.context_menu_handler, action='hide',
category=key))
add_show_hidden_categories()
if tag is None: if tag is None:
self.context_menu.addSeparator() self.context_menu.addSeparator()
self.context_menu.addAction(_('Change category icon'), self.context_menu.addAction(_('Change category icon'),