filter: add fulltext field to filter widget

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

1 files changed, 283 insertions, 254 deletions

diff --git a/desktop-widgets/filterwidget2.ui b/desktop-widgets/filterwidget2.ui
index c38e651b3..5efadd4c4 100644
--- a/desktop-widgets/filterwidget2.ui
+++ b/desktop-widgets/filterwidget2.ui
@@ -35,109 +35,95 @@
        </rect>
       </property>
       <layout class="QGridLayout" name="gridLayout">
-       <item row="3" column="2">
-        <widget class="QDoubleSpinBox" name="minWaterTemp"/>
-       </item>
-       <item row="8" column="0">
-        <widget class="QLabel" name="label_7">
-         <property name="text">
-          <string>Tags</string>
-         </property>
+       <item row="13" column="2">
+        <widget class="QComboBox" name="suitStringMode">
+         <item>
+          <property name="text">
+           <string>Substring</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Starts with</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Exact</string>
+          </property>
+         </item>
         </widget>
        </item>
-       <item row="8" column="4" colspan="2">
-        <widget class="QLineEdit" name="tags"/>
-       </item>
-       <item row="9" column="4" colspan="2">
-        <widget class="QLineEdit" name="people"/>
+       <item row="6" column="4">
+        <widget class="QTimeEdit" name="fromTime"/>
        </item>
-       <item row="11" column="0">
+       <item row="13" column="0">
         <widget class="QLabel" name="label_10">
          <property name="text">
           <string>Suit</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="0">
-        <widget class="QLabel" name="label_8">
+       <item row="5" column="4">
+        <widget class="QLabel" name="label_18">
          <property name="text">
-          <string>People</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="2">
-        <widget class="QToolButton" name="close">
-         <property name="toolTip">
-          <string>Close filters</string>
-         </property>
-         <property name="icon">
-          <iconset>
-           <normaloff>:filter-close</normaloff>:filter-close</iconset>
-         </property>
-         <property name="autoRaise">
-          <bool>true</bool>
+          <string>Max</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="4">
-        <widget class="QLabel" name="label_15">
+       <item row="4" column="4">
+        <widget class="QLabel" name="label_13">
          <property name="text">
           <string>Max</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="1">
-        <widget class="QLabel" name="label_12">
+       <item row="5" column="1">
+        <widget class="QLabel" name="label_17">
          <property name="text">
           <string>Min</string>
          </property>
         </widget>
        </item>
-       <item row="7" column="4">
-        <widget class="QCheckBox" name="planned">
-         <property name="text">
-          <string>Planned</string>
+       <item row="2" column="5">
+        <widget class="StarWidget" name="maxRating" native="true">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
          </property>
-         <property name="checked">
-          <bool>true</bool>
+         <property name="focusPolicy">
+          <enum>Qt::TabFocus</enum>
          </property>
         </widget>
        </item>
-       <item row="11" column="4" colspan="2">
-        <widget class="QLineEdit" name="equipment"/>
+       <item row="7" column="4">
+        <widget class="QTimeEdit" name="toTime"/>
        </item>
-       <item row="13" column="0">
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
+       <item row="5" column="0">
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Air Temp</string>
          </property>
-        </spacer>
+        </widget>
        </item>
        <item row="2" column="1">
-        <widget class="QLabel" name="label_14">
+        <widget class="QLabel" name="label_3">
          <property name="text">
           <string>Min</string>
          </property>
         </widget>
        </item>
-       <item row="10" column="4" colspan="2">
-        <widget class="QLineEdit" name="location"/>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label">
+       <item row="15" column="0">
+        <widget class="QLabel" name="labelEquipment">
          <property name="text">
-          <string>Rating</string>
+          <string>Equipment</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="5">
-        <widget class="StarWidget" name="maxRating" native="true">
+       <item row="2" column="2">
+        <widget class="StarWidget" name="minRating" native="true">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
@@ -149,7 +135,26 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="5">
+       <item row="12" column="2">
+        <widget class="QComboBox" name="locationStringMode">
+         <item>
+          <property name="text">
+           <string>Substring</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Starts with</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Exact</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="3" column="5">
         <widget class="StarWidget" name="maxVisibility" native="true">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -162,144 +167,147 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="QLabel" name="label_3">
+       <item row="3" column="4">
+        <widget class="QLabel" name="label_16">
          <property name="text">
-          <string>Min</string>
+          <string>Max</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="1">
-        <widget class="QToolButton" name="clear">
-         <property name="toolTip">
-          <string>Reset filters</string>
-         </property>
-         <property name="icon">
-          <iconset>
-           <normaloff>:edit-clear-icon</normaloff>:edit-clear-icon</iconset>
-         </property>
-         <property name="autoRaise">
-          <bool>true</bool>
+       <item row="10" column="0">
+        <widget class="QLabel" name="label_7">
+         <property name="text">
+          <string>Tags</string>
          </property>
         </widget>
        </item>
-       <item row="13" column="0">
-        <widget class="QLabel" name="labelEquipment">
+       <item row="4" column="0">
+        <widget class="QLabel" name="label_11">
          <property name="text">
-          <string>Equipment</string>
+          <string>Water Temp</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_5">
-         <property name="text">
-          <string>Visibility</string>
-         </property>
+       <item row="15" column="1">
+        <widget class="QComboBox" name="equipmentMode">
+         <item>
+          <property name="text">
+           <string>All of</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Any of</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>None of</string>
+          </property>
+         </item>
         </widget>
        </item>
        <item row="2" column="4">
-        <widget class="QLabel" name="label_16">
+        <widget class="QLabel" name="label_15">
          <property name="text">
           <string>Max</string>
          </property>
         </widget>
        </item>
-       <item row="10" column="0">
-        <widget class="QLabel" name="label_9">
+       <item row="11" column="0">
+        <widget class="QLabel" name="label_8">
          <property name="text">
-          <string>Location</string>
+          <string>People</string>
          </property>
         </widget>
        </item>
-       <item row="6" column="0">
-        <widget class="QLabel" name="label_6">
-         <property name="text">
-          <string>To</string>
-         </property>
-        </widget>
+       <item row="5" column="5">
+        <widget class="QDoubleSpinBox" name="maxAirTemp"/>
        </item>
-       <item row="4" column="1">
-        <widget class="QLabel" name="label_17">
+       <item row="5" column="2">
+        <widget class="QDoubleSpinBox" name="minAirTemp"/>
+       </item>
+       <item row="3" column="1">
+        <widget class="QLabel" name="label_14">
          <property name="text">
           <string>Min</string>
          </property>
         </widget>
        </item>
-       <item row="7" column="1">
-        <widget class="QCheckBox" name="logged">
-         <property name="text">
-          <string>Logged</string>
+       <item row="15" column="0">
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
          </property>
-         <property name="checked">
-          <bool>true</bool>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
          </property>
-        </widget>
+        </spacer>
        </item>
-       <item row="5" column="1" colspan="2">
-        <widget class="QDateTimeEdit" name="fromDate">
-         <property name="calendarPopup">
-          <bool>true</bool>
-         </property>
-        </widget>
+       <item row="13" column="4" colspan="2">
+        <widget class="QLineEdit" name="equipment"/>
        </item>
-       <item row="12" column="0">
-        <widget class="QLabel" name="label_19">
+       <item row="8" column="4">
+        <widget class="QCheckBox" name="planned">
          <property name="text">
-          <string>Notes</string>
+          <string>Planned</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
          </property>
         </widget>
        </item>
-       <item row="11" column="4" colspan="2">
-        <widget class="QLineEdit" name="suit"/>
-       </item>
-       <item row="4" column="2">
-        <widget class="QDoubleSpinBox" name="minAirTemp"/>
+       <item row="14" column="1">
+        <widget class="QComboBox" name="dnotesMode">
+         <item>
+          <property name="text">
+           <string>All of</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Any of</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>None of</string>
+          </property>
+         </item>
+        </widget>
        </item>
-       <item row="5" column="4">
-        <widget class="QTimeEdit" name="fromTime"/>
+       <item row="10" column="4" colspan="2">
+        <widget class="QLineEdit" name="tags"/>
        </item>
-       <item row="3" column="4">
-        <widget class="QLabel" name="label_13">
+       <item row="12" column="0">
+        <widget class="QLabel" name="label_9">
          <property name="text">
-          <string>Max</string>
+          <string>Location</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="0">
-        <widget class="QLabel" name="label_2">
+       <item row="14" column="0">
+        <widget class="QLabel" name="label_19">
          <property name="text">
-          <string>Air Temp</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="2">
-        <widget class="StarWidget" name="minVisibility" native="true">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="focusPolicy">
-          <enum>Qt::TabFocus</enum>
+          <string>Notes</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="5">
-        <widget class="QDoubleSpinBox" name="maxAirTemp"/>
-       </item>
        <item row="3" column="0">
-        <widget class="QLabel" name="label_11">
+        <widget class="QLabel" name="label_5">
          <property name="text">
-          <string>Water Temp</string>
+          <string>Visibility</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="5">
-        <widget class="QDoubleSpinBox" name="maxWaterTemp"/>
+       <item row="13" column="4" colspan="2">
+        <widget class="QLineEdit" name="suit"/>
        </item>
-       <item row="1" column="2">
-        <widget class="StarWidget" name="minRating" native="true">
+       <item row="3" column="2">
+        <widget class="StarWidget" name="minVisibility" native="true">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
@@ -311,22 +319,27 @@
          </property>
         </widget>
        </item>
-       <item row="12" column="4" colspan="2">
-        <widget class="QLineEdit" name="dnotes"/>
-       </item>
-       <item row="6" column="1" colspan="2">
-        <widget class="QDateTimeEdit" name="toDate">
-         <property name="calendarPopup">
-          <bool>true</bool>
-         </property>
+       <item row="14" column="2">
+        <widget class="QComboBox" name="dnotesStringMode">
+         <item>
+          <property name="text">
+           <string>Substring</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Starts with</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Exact</string>
+          </property>
+         </item>
         </widget>
        </item>
-       <item row="4" column="4">
-        <widget class="QLabel" name="label_18">
-         <property name="text">
-          <string>Max</string>
-         </property>
-        </widget>
+       <item row="12" column="4" colspan="2">
+        <widget class="QLineEdit" name="location"/>
        </item>
        <item row="0" column="0">
         <widget class="QLabel" name="filterButtonExplanation">
@@ -335,37 +348,35 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="4">
-        <widget class="QTimeEdit" name="toTime"/>
-       </item>
-       <item row="5" column="0">
-        <widget class="QLabel" name="label_4">
+       <item row="2" column="0">
+        <widget class="QLabel" name="label">
          <property name="text">
-          <string>From</string>
+          <string>Rating</string>
          </property>
         </widget>
        </item>
-       <item row="8" column="1">
-        <widget class="QComboBox" name="tagsMode">
-         <item>
-          <property name="text">
-           <string>All of</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>Any of</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>None of</string>
-          </property>
-         </item>
+       <item row="14" column="4" colspan="2">
+        <widget class="QLineEdit" name="dnotes"/>
+       </item>
+       <item row="11" column="4" colspan="2">
+        <widget class="QLineEdit" name="people"/>
+       </item>
+       <item row="0" column="1">
+        <widget class="QToolButton" name="clear">
+         <property name="toolTip">
+          <string>Reset filters</string>
+         </property>
+         <property name="icon">
+          <iconset>
+           <normaloff>:edit-clear-icon</normaloff>:edit-clear-icon</iconset>
+         </property>
+         <property name="autoRaise">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
-       <item row="8" column="2">
-        <widget class="QComboBox" name="tagsStringMode">
+       <item row="11" column="2">
+        <widget class="QComboBox" name="peopleStringMode">
          <item>
           <property name="text">
            <string>Substring</string>
@@ -383,8 +394,18 @@
          </item>
         </widget>
        </item>
-       <item row="9" column="1">
-        <widget class="QComboBox" name="peopleMode">
+       <item row="4" column="2">
+        <widget class="QDoubleSpinBox" name="minWaterTemp"/>
+       </item>
+       <item row="6" column="1" colspan="2">
+        <widget class="QDateTimeEdit" name="fromDate">
+         <property name="calendarPopup">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="13" column="1">
+        <widget class="QComboBox" name="suitMode">
          <item>
           <property name="text">
            <string>All of</string>
@@ -402,8 +423,11 @@
          </item>
         </widget>
        </item>
-       <item row="9" column="2">
-        <widget class="QComboBox" name="peopleStringMode">
+       <item row="4" column="5">
+        <widget class="QDoubleSpinBox" name="maxWaterTemp"/>
+       </item>
+       <item row="10" column="2">
+        <widget class="QComboBox" name="tagsStringMode">
          <item>
           <property name="text">
            <string>Substring</string>
@@ -421,27 +445,15 @@
          </item>
         </widget>
        </item>
-       <item row="10" column="1">
-        <widget class="QComboBox" name="locationMode">
-         <item>
-          <property name="text">
-           <string>All of</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>Any of</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>None of</string>
-          </property>
-         </item>
+       <item row="6" column="0">
+        <widget class="QLabel" name="label_4">
+         <property name="text">
+          <string>From</string>
+         </property>
         </widget>
        </item>
-       <item row="10" column="2">
-        <widget class="QComboBox" name="locationStringMode">
+       <item row="15" column="2">
+        <widget class="QComboBox" name="equipmentStringMode">
          <item>
           <property name="text">
            <string>Substring</string>
@@ -459,8 +471,15 @@
          </item>
         </widget>
        </item>
-       <item row="11" column="1">
-        <widget class="QComboBox" name="suitMode">
+       <item row="4" column="1">
+        <widget class="QLabel" name="label_12">
+         <property name="text">
+          <string>Min</string>
+         </property>
+        </widget>
+       </item>
+       <item row="12" column="1">
+        <widget class="QComboBox" name="locationMode">
          <item>
           <property name="text">
            <string>All of</string>
@@ -478,8 +497,25 @@
          </item>
         </widget>
        </item>
-       <item row="12" column="1">
-        <widget class="QComboBox" name="dnotesMode">
+       <item row="8" column="1">
+        <widget class="QCheckBox" name="logged">
+         <property name="text">
+          <string>Logged</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="1" colspan="2">
+        <widget class="QDateTimeEdit" name="toDate">
+         <property name="calendarPopup">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="11" column="1">
+        <widget class="QComboBox" name="peopleMode">
          <item>
           <property name="text">
            <string>All of</string>
@@ -497,8 +533,8 @@
          </item>
         </widget>
        </item>
-       <item row="13" column="1">
-        <widget class="QComboBox" name="equipmentMode">
+       <item row="10" column="1">
+        <widget class="QComboBox" name="tagsMode">
          <item>
           <property name="text">
            <string>All of</string>
@@ -516,46 +552,36 @@
          </item>
         </widget>
        </item>
-       <item row="11" column="2">
-        <widget class="QComboBox" name="suitStringMode">
-         <item>
-          <property name="text">
-           <string>Substring</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>Starts with</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>Exact</string>
-          </property>
-         </item>
+       <item row="7" column="0">
+        <widget class="QLabel" name="label_6">
+         <property name="text">
+          <string>To</string>
+         </property>
         </widget>
        </item>
-       <item row="12" column="2">
-        <widget class="QComboBox" name="dnotesStringMode">
-         <item>
-          <property name="text">
-           <string>Substring</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>Starts with</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>Exact</string>
-          </property>
-         </item>
+       <item row="0" column="2">
+        <widget class="QToolButton" name="close">
+         <property name="toolTip">
+          <string>Close filters</string>
+         </property>
+         <property name="icon">
+          <iconset>
+           <normaloff>:filter-close</normaloff>:filter-close</iconset>
+         </property>
+         <property name="autoRaise">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
-       <item row="13" column="2">
-        <widget class="QComboBox" name="equipmentStringMode">
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_20">
+         <property name="text">
+          <string>Fulltext</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QComboBox" name="fulltextStringMode">
          <item>
           <property name="text">
            <string>Substring</string>
@@ -568,11 +594,14 @@
          </item>
          <item>
           <property name="text">
-           <string>Exact</string>
+           <string>Full word</string>
           </property>
          </item>
         </widget>
        </item>
+       <item row="1" column="2" colspan="4">
+        <widget class="QLineEdit" name="fullText"/>
+       </item>
       </layout>
      </widget>
     </widget>