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

Merge from trunk

Browse Source
This commit is contained in:
Charles Haley 2010-11-30 18:04:52 +00:00
commit 4ef2487480
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,7 +107,6 @@ class SearchBox2(QComboBox):
return self.currentText()
def clear(self, emit_search=True):
print 'in clear', emit_search
self.normalize_state()
self.setEditText('')
if emit_search:
@ -115,6 +114,9 @@ class SearchBox2(QComboBox):
self._in_a_search = False
self.cleared.emit()
def clear_clicked(self, *args):
self.clear()
def search_done(self, ok):
if isinstance(ok, basestring):
self.setToolTip(ok)
@ -319,7 +321,7 @@ class SearchBoxMixin(object):
self.search.cleared.connect(self.search_box_cleared)
self.search.changed.connect(self.search_box_changed)
self.search.focus_to_library.connect(self.focus_to_library)
self.clear_button.clicked.connect(lambda:self.search.clear(True))
self.clear_button.clicked.connect(self.search.clear_clicked)
self.advanced_search_button.clicked[bool].connect(self.do_advanced_search)
self.search.clear()