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

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

Browse Source
This commit is contained in:
Kovid Goyal 2017-06-09 22:22:26 +05:30
commit 02a26d89e8
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/calibre/gui2/search_box.py
View File

@ -560,12 +560,14 @@ class SavedSearchBoxMixin(object): # {{{
def populate_add_saved_search_menu(self): def populate_add_saved_search_menu(self):
m = self.add_saved_search_button.menu() m = self.add_saved_search_button.menu()
m.clear() m.clear()
m.addAction(QIcon(I('plus.png')), _('Add Saved search'), self.add_saved_search)
m.addAction(QIcon(I("search_copy_saved.png")), _('Get Saved search text'),
self.get_saved_search_text)
m.addActions(list(self.save_search_button.menu().actions())[-1:])
m.addSeparator()
db = self.current_db db = self.current_db
for name in sorted(db.saved_search_names(), key=lambda x: primary_sort_key(x.strip())): for name in sorted(db.saved_search_names(), key=lambda x: primary_sort_key(x.strip())):
m.addAction(name.strip(), partial(self.saved_search.saved_search_selected, name)) m.addAction(name.strip(), partial(self.saved_search.saved_search_selected, name))
m.addSeparator()
m.addAction(QIcon(I('plus.png')), _('Add Saved search'), self.add_saved_search)
m.addActions(list(self.save_search_button.menu().actions())[-1:])
def saved_searches_changed(self, set_restriction=None, recount=True): def saved_searches_changed(self, set_restriction=None, recount=True):
self.build_search_restriction_list() self.build_search_restriction_list()
@ -590,4 +592,18 @@ class SavedSearchBoxMixin(object): # {{{
if d.exec_() == d.Accepted: if d.exec_() == d.Accepted:
self.do_rebuild_saved_searches() self.do_rebuild_saved_searches()
def get_saved_search_text(self):
db = self.current_db
try:
current_search = self.search.currentText()
if not current_search.startswith('search:"'):
raise ValueError()
current_search = current_search[8:-1]
current_search = db.saved_search_lookup(current_search)
if not current_search:
raise ValueError()
self.search.set_search_string(current_search)
except:
from calibre.gui2.ui import get_gui
get_gui().status_bar.show_message(_('Current search is not a saved search'), 3000)
# }}} # }}}