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

Clear button should clear results and details panel

Browse Source
This commit is contained in:
Kovid Goyal 2022-06-09 18:43:10 +05:30
parent c93c10f16d
commit 6111955dc6
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/calibre/gui2/fts/search.py
View File

@ -147,6 +147,16 @@ class ResultsModel(QAbstractItemModel):
self.result_found.connect(self.result_with_text_found, type=Qt.ConnectionType.QueuedConnection) self.result_found.connect(self.result_with_text_found, type=Qt.ConnectionType.QueuedConnection)
self.all_results_found.connect(self.signal_search_complete, type=Qt.ConnectionType.QueuedConnection) self.all_results_found.connect(self.signal_search_complete, type=Qt.ConnectionType.QueuedConnection)
def clear_results(self):
self.current_query_id = -1
self.current_thread_abort.set()
self.search_started.emit()
self.matches_found.emit(-1)
self.beginResetModel()
self.results = []
self.endResetModel()
self.search_complete.emit()
def search(self, fts_engine_query, use_stemming=True, restrict_to_book_ids=None): def search(self, fts_engine_query, use_stemming=True, restrict_to_book_ids=None):
db = get_db() db = get_db()
failure = [] failure = []
@ -359,6 +369,7 @@ class Spinner(ProgressIndicator):
class SearchInputPanel(QWidget): class SearchInputPanel(QWidget):
search_signal = pyqtSignal(object) search_signal = pyqtSignal(object)
clear_search = pyqtSignal()
def __init__(self, parent=None): def __init__(self, parent=None):
super().__init__(parent) super().__init__(parent)
@ -368,6 +379,7 @@ class SearchInputPanel(QWidget):
v1.setAlignment(Qt.AlignmentFlag.AlignTop) v1.setAlignment(Qt.AlignmentFlag.AlignTop)
self.layout().addLayout(v1) self.layout().addLayout(v1)
self.search_box = sb = SearchBox(self) self.search_box = sb = SearchBox(self)
sb.cleared.connect(self.clear_search)
sb.initialize('library-fts-search-box') sb.initialize('library-fts-search-box')
sb.lineEdit().returnPressed.connect(self.search_requested) sb.lineEdit().returnPressed.connect(self.search_requested)
sb.lineEdit().setPlaceholderText(_('Enter words to search for')) sb.lineEdit().setPlaceholderText(_('Enter words to search for'))
@ -522,6 +534,10 @@ p { margin: 0; }
self.setCurrentIndex(1) self.setCurrentIndex(1)
self.result_details.show_result(results, individual_match) self.result_details.show_result(results, individual_match)
def clear(self):
self.setCurrentIndex(0)
self.currently_showing = None, None
class LeftPanel(QWidget): class LeftPanel(QWidget):
@ -555,9 +571,11 @@ class ResultsPanel(QWidget):
rv.matches_found.connect(self.sip.matches_found) rv.matches_found.connect(self.sip.matches_found)
rv.search_complete.connect(self.sip.stop) rv.search_complete.connect(self.sip.stop)
sip.search_signal.connect(self.search) sip.search_signal.connect(self.search)
sip.clear_search.connect(rv.model().clear_results)
self.details = d = DetailsPanel(self) self.details = d = DetailsPanel(self)
rv.current_changed.connect(d.show_result) rv.current_changed.connect(d.show_result)
rv.search_started.connect(d.clear)
s.addWidget(d) s.addWidget(d)