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

Viewer: Fix repeating a search after clearing search results not working

Browse Source
This commit is contained in:
Kovid Goyal 2020-06-03 13:58:02 +05:30
parent 6ed197b08f
commit 4d69c20fac
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/gui2/viewer/search.py
View File

@ -658,10 +658,10 @@ class SearchPanel(QWidget): # {{{
self.search_tasks = Queue() self.search_tasks = Queue()
self.results_found.connect(self.on_result_found, type=Qt.QueuedConnection) self.results_found.connect(self.on_result_found, type=Qt.QueuedConnection)
si.do_search.connect(self.search_requested) si.do_search.connect(self.search_requested)
si.cleared.connect(self.search_cleared)
l.addWidget(si) l.addWidget(si)
self.results = r = Results(self) self.results = r = Results(self)
r.count_changed.connect(self.count_changed) r.count_changed.connect(self.count_changed)
si.cleared.connect(r.clear_all_results)
r.show_search_result.connect(self.do_show_search_result, type=Qt.QueuedConnection) r.show_search_result.connect(self.do_show_search_result, type=Qt.QueuedConnection)
r.current_result_changed.connect(self.update_hidden_message) r.current_result_changed.connect(self.update_hidden_message)
l.addWidget(r, 100) l.addWidget(r, 100)
@ -680,6 +680,10 @@ class SearchPanel(QWidget): # {{{
def focus_input(self, text=None): def focus_input(self, text=None):
self.search_input.focus_input(text) self.search_input.focus_input(text)
def search_cleared(self):
self.results.clear_all_results()
self.current_search = None
def start_search(self, search_query, current_name): def start_search(self, search_query, current_name):
if self.current_search is not None and search_query == self.current_search: if self.current_search is not None and search_query == self.current_search:
self.find_next_requested(search_query.backwards) self.find_next_requested(search_query.backwards)