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

Fix #1879834 [[Enhancement - Viewer] Clearing the search will not clear the search results](https://bugs.launchpad.net/calibre/+bug/1879834)

Browse Source
This commit is contained in:
Kovid Goyal 2020-05-21 12:30:58 +05:30
parent 5378316da0
commit b0e427621a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/gui2/__init__.py
View File

@ -199,7 +199,7 @@ del create_defs
# }}} # }}}
UNDEFINED_QDATETIME = QDateTime(UNDEFINED_DATE) UNDEFINED_QDATETIME = QDateTime(UNDEFINED_DATE)
QT_HIDDEN_CLEAR_ACTION = '_q_qlineeditclearaction'
ALL_COLUMNS = ['title', 'ondevice', 'authors', 'size', 'timestamp', 'rating', 'publisher', ALL_COLUMNS = ['title', 'ondevice', 'authors', 'size', 'timestamp', 'rating', 'publisher',
'tags', 'series', 'pubdate'] 'tags', 'series', 'pubdate']

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

@ -15,15 +15,13 @@ from PyQt5.Qt import (
pyqtSignal, QCompleter, QAction, QKeySequence, QTimer, pyqtSignal, QCompleter, QAction, QKeySequence, QTimer,
QIcon, QMenu, QApplication, QKeyEvent) QIcon, QMenu, QApplication, QKeyEvent)
from calibre.gui2 import config, error_dialog, question_dialog, gprefs from calibre.gui2 import config, error_dialog, question_dialog, gprefs, QT_HIDDEN_CLEAR_ACTION
from calibre.gui2.dialogs.confirm_delete import confirm from calibre.gui2.dialogs.confirm_delete import confirm
from calibre.gui2.dialogs.saved_search_editor import SavedSearchEditor from calibre.gui2.dialogs.saved_search_editor import SavedSearchEditor
from calibre.gui2.dialogs.search import SearchDialog from calibre.gui2.dialogs.search import SearchDialog
from calibre.utils.icu import primary_sort_key from calibre.utils.icu import primary_sort_key
from polyglot.builtins import native_string_type, unicode_type, string_or_bytes, map, range from polyglot.builtins import native_string_type, unicode_type, string_or_bytes, map, range
QT_HIDDEN_CLEAR_ACTION = '_q_qlineeditclearaction'
class AsYouType(unicode_type): class AsYouType(unicode_type):

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

@ -10,13 +10,13 @@ from threading import Thread
import regex import regex
from PyQt5.Qt import ( from PyQt5.Qt import (
QCheckBox, QComboBox, QFont, QHBoxLayout, QIcon, QLabel, QStaticText, QStyle, QAction, QCheckBox, QComboBox, QFont, QHBoxLayout, QIcon, QLabel, QStaticText,
QStyledItemDelegate, Qt, QToolButton, QTreeWidget, QTreeWidgetItem, QVBoxLayout, QStyle, QStyledItemDelegate, Qt, QToolButton, QTreeWidget, QTreeWidgetItem,
QWidget, pyqtSignal QVBoxLayout, QWidget, pyqtSignal
) )
from calibre.ebooks.conversion.search_replace import REGEX_FLAGS from calibre.ebooks.conversion.search_replace import REGEX_FLAGS
from calibre.gui2 import warning_dialog from calibre.gui2 import QT_HIDDEN_CLEAR_ACTION, warning_dialog
from calibre.gui2.progress_indicator import ProgressIndicator from calibre.gui2.progress_indicator import ProgressIndicator
from calibre.gui2.viewer.web_view import get_data, get_manifest, vprefs from calibre.gui2.viewer.web_view import get_data, get_manifest, vprefs
from calibre.gui2.widgets2 import HistoryComboBox from calibre.gui2.widgets2 import HistoryComboBox
@ -333,6 +333,7 @@ class SearchBox(HistoryComboBox):
class SearchInput(QWidget): # {{{ class SearchInput(QWidget): # {{{
do_search = pyqtSignal(object) do_search = pyqtSignal(object)
cleared = pyqtSignal()
def __init__(self, parent=None, panel_name='search'): def __init__(self, parent=None, panel_name='search'):
QWidget.__init__(self, parent) QWidget.__init__(self, parent)
@ -350,6 +351,9 @@ class SearchInput(QWidget): # {{{
sb.history_saved.connect(self.history_saved) sb.history_saved.connect(self.history_saved)
sb.lineEdit().setPlaceholderText(_('Search')) sb.lineEdit().setPlaceholderText(_('Search'))
sb.lineEdit().setClearButtonEnabled(True) sb.lineEdit().setClearButtonEnabled(True)
ac = sb.lineEdit().findChild(QAction, QT_HIDDEN_CLEAR_ACTION)
if ac is not None:
ac.triggered.connect(self.cleared)
sb.lineEdit().returnPressed.connect(self.find_next) sb.lineEdit().returnPressed.connect(self.find_next)
h.addWidget(sb) h.addWidget(sb)
@ -503,6 +507,7 @@ class Results(QTreeWidget): # {{{
self.item_map = {} self.item_map = {}
def current_item_changed(self, current, previous): def current_item_changed(self, current, previous):
if current is not None:
r = current.data(0, Qt.UserRole) r = current.data(0, Qt.UserRole)
if isinstance(r, SearchResult): if isinstance(r, SearchResult):
self.current_result_changed.emit(r) self.current_result_changed.emit(r)
@ -614,6 +619,7 @@ class SearchPanel(QWidget): # {{{
si.do_search.connect(self.search_requested) si.do_search.connect(self.search_requested)
l.addWidget(si) l.addWidget(si)
self.results = r = Results(self) self.results = r = Results(self)
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)