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 "match any" not working in the search dialog.

Browse Source
This commit is contained in:
Kovid Goyal 2008-02-05 23:02:30 +00:00
parent 0da16c5640
commit df8f2d88d0
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libprs500/gui2/dialogs/search.py
View File

@ -84,5 +84,8 @@ class SearchDialog(Ui_Dialog, QDialog):
token = tok.token() token = tok.token()
if token: if token:
ans.append(token) ans.append(token)
return ' '.join(ans) ans = ' '.join(ans)
if self.match_any.isChecked():
ans = '['+ans+']'
return ans

4
src/libprs500/gui2/dialogs/search.ui
View File

@ -21,7 +21,7 @@
<item> <item>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<item> <item>
<widget class="QRadioButton" name="radioButton" > <widget class="QRadioButton" name="match_all" >
<property name="text" > <property name="text" >
<string>Match a&amp;ll of the following criteria</string> <string>Match a&amp;ll of the following criteria</string>
</property> </property>
@ -31,7 +31,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QRadioButton" name="radioButton_2" > <widget class="QRadioButton" name="match_any" >
<property name="text" > <property name="text" >
<string>Match a&amp;ny of the following criteria</string> <string>Match a&amp;ny of the following criteria</string>
</property> </property>

1
src/libprs500/gui2/library.py
View File

@ -755,3 +755,4 @@ class SearchBox(QLineEdit):
self.setText(txt) self.setText(txt)
self.emit(SIGNAL('search(PyQt_PyObject, PyQt_PyObject)'), txt, False) self.emit(SIGNAL('search(PyQt_PyObject, PyQt_PyObject)'), txt, False)
self.end(False) self.end(False)
self.initial_state = False