From f735cdb78873d021cf7c2f13cf6bc41fe9316cf1 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 30 Oct 2017 08:54:35 +0530 Subject: [PATCH] Make the clear button in search fields visible only when there is text --- src/calibre/gui2/search_box.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py index f244677eb2..ec9134c9e0 100644 --- a/src/calibre/gui2/search_box.py +++ b/src/calibre/gui2/search_box.py @@ -109,8 +109,7 @@ class SearchBox2(QComboBox): # {{{ self.line_edit = SearchLineEdit(self) self.setLineEdit(self.line_edit) if add_clear_action: - self.clear_action = self.add_action('clear_left.png') - self.clear_action.triggered.connect(self.clear_clicked) + self.lineEdit().setClearButtonEnabled(True) c = self.line_edit.completer() c.setCompletionMode(c.PopupCompletion) @@ -537,7 +536,9 @@ class SavedSearchBoxMixin(object): # {{{ def init_saved_seach_box_mixin(self): self.saved_search.changed.connect(self.saved_searches_changed) - self.search.clear_action.triggered.connect(self.saved_search.clear) + ac = self.findChild(QAction, '_q_qlineeditclearaction') + if ac is not None: + ac.triggered.connect(self.saved_search.clear) self.save_search_button.clicked.connect( self.saved_search.save_search_button_clicked) self.copy_search_button.clicked.connect(