Fix "match any" not working in the search dialog.

src/libprs500/gui2/dialogs/search.py

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

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>

src/libprs500/gui2/library.py

@@ -754,4 +754,5 @@ def set_search_string(self, txt):
         self.normalize_state()
         self.setText(txt)
         self.emit(SIGNAL('search(PyQt_PyObject, PyQt_PyObject)'), txt, False)
-        self.end(False)
+        self.end(False)
+        self.initial_state = False