From e550a788f01275b04c95e8a8eb9f390b1d5ffe7b Mon Sep 17 00:00:00 2001
From: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Date: Tue, 19 Feb 2019 16:31:21 +0100
Subject: Filter: implement any-of mode

Add an additional mode to the tags, people and location filters: any_of.
Replace the original invert-bool by an enum.
Move the common code into a distinct function.

Reported-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
---
 desktop-widgets/filterwidget2.ui | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'desktop-widgets/filterwidget2.ui')

diff --git a/desktop-widgets/filterwidget2.ui b/desktop-widgets/filterwidget2.ui
index 0b95f7bae..92b61ba80 100644
--- a/desktop-widgets/filterwidget2.ui
+++ b/desktop-widgets/filterwidget2.ui
@@ -298,6 +298,11 @@
        <string>All of</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>Any of</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>None of</string>
@@ -312,6 +317,11 @@
        <string>All of</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>Any of</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>None of</string>
@@ -323,12 +333,17 @@
     <widget class="QComboBox" name="locationMode">
      <item>
       <property name="text">
-       <string>Matches</string>
+       <string>All of</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Any of</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>Doesn't match</string>
+       <string>None of</string>
       </property>
      </item>
     </widget>
@@ -340,6 +355,11 @@
        <string>All of</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>Any of</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>None of</string>
-- 
cgit v1.2.3-70-g09d2