From df8f2d88d08d1370009f1b3bd59afc3c1ac0c5f1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 5 Feb 2008 23:02:30 +0000
Subject: [PATCH] Fix "match any" not working in the search dialog.

---
 src/libprs500/gui2/dialogs/search.py | 5 ++++-
 src/libprs500/gui2/dialogs/search.ui | 4 ++--
 src/libprs500/gui2/library.py        | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/libprs500/gui2/dialogs/search.py b/src/libprs500/gui2/dialogs/search.py
index 3437a3abc4..4a4c943bfd 100644
--- a/src/libprs500/gui2/dialogs/search.py
+++ b/src/libprs500/gui2/dialogs/search.py
@@ -84,5 +84,8 @@ class SearchDialog(Ui_Dialog, QDialog):
             token = tok.token()
             if token:
                 ans.append(token)
-        return ' '.join(ans)
+        ans = ' '.join(ans)
+        if self.match_any.isChecked():
+            ans = '['+ans+']'
+        return ans
             
\ No newline at end of file
diff --git a/src/libprs500/gui2/dialogs/search.ui b/src/libprs500/gui2/dialogs/search.ui
index b208d98c8f..38fb8bd67d 100644
--- a/src/libprs500/gui2/dialogs/search.ui
+++ b/src/libprs500/gui2/dialogs/search.ui
@@ -21,7 +21,7 @@
      <item>
       <layout class="QVBoxLayout" >
        <item>
-        <widget class="QRadioButton" name="radioButton" >
+        <widget class="QRadioButton" name="match_all" >
          <property name="text" >
           <string>Match a&amp;ll of the following criteria</string>
          </property>
@@ -31,7 +31,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QRadioButton" name="radioButton_2" >
+        <widget class="QRadioButton" name="match_any" >
          <property name="text" >
           <string>Match a&amp;ny of the following criteria</string>
          </property>
diff --git a/src/libprs500/gui2/library.py b/src/libprs500/gui2/library.py
index fe65dfcab2..ff5e0aa57d 100644
--- a/src/libprs500/gui2/library.py
+++ b/src/libprs500/gui2/library.py
@@ -754,4 +754,5 @@ class SearchBox(QLineEdit):
         self.normalize_state()
         self.setText(txt)
         self.emit(SIGNAL('search(PyQt_PyObject, PyQt_PyObject)'), txt, False)
-        self.end(False)
\ No newline at end of file
+        self.end(False)
+        self.initial_state = False
\ No newline at end of file