Filter for logged/planned dives

Add filter for dives having a planned dive computer or
a logged dive computer.

Signed-off-by: Robert C. Helling <helling@atdotde.de>

1 files changed, 140 insertions, 120 deletions

diff --git a/desktop-widgets/filterwidget2.ui b/desktop-widgets/filterwidget2.ui
index 978dafc6e..b8d5af48a 100644
--- a/desktop-widgets/filterwidget2.ui
+++ b/desktop-widgets/filterwidget2.ui
@@ -7,53 +7,34 @@
     <x>0</x>
     <y>0</y>
     <width>510</width>
-    <height>320</height>
+    <height>349</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="3" column="1">
-    <widget class="QLabel" name="label_12">
+   <item row="8" column="1" colspan="4">
+    <widget class="QLineEdit" name="tags"/>
+   </item>
+   <item row="1" column="1">
+    <widget class="QLabel" name="label_3">
      <property name="text">
       <string>Min</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="4">
-    <widget class="StarWidget" name="maxVisibility" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="focusPolicy">
-      <enum>Qt::TabFocus</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="2">
-    <widget class="QDoubleSpinBox" name="minWaterTemp"/>
-   </item>
-   <item row="2" column="2">
-    <widget class="StarWidget" name="minVisibility" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="focusPolicy">
-      <enum>Qt::TabFocus</enum>
+   <item row="9" column="0">
+    <widget class="QLabel" name="label_8">
+     <property name="text">
+      <string>People</string>
      </property>
     </widget>
    </item>
-   <item row="7" column="0">
-    <widget class="QLabel" name="label_7">
+   <item row="3" column="3">
+    <widget class="QLabel" name="label_13">
      <property name="text">
-      <string>Tags</string>
+      <string>Max</string>
      </property>
     </widget>
    </item>
@@ -64,44 +45,17 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="2">
-    <widget class="StarWidget" name="minRating" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="focusPolicy">
-      <enum>Qt::TabFocus</enum>
-     </property>
-    </widget>
-   </item>
    <item row="8" column="0">
-    <widget class="QLabel" name="label_8">
-     <property name="text">
-      <string>People</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="3">
-    <widget class="QLabel" name="label_13">
-     <property name="text">
-      <string>Max</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QLabel" name="label_3">
+    <widget class="QLabel" name="label_7">
      <property name="text">
-      <string>Min</string>
+      <string>Tags</string>
      </property>
     </widget>
    </item>
-   <item row="7" column="1" colspan="4">
-    <widget class="QLineEdit" name="tags"/>
+   <item row="3" column="2">
+    <widget class="QDoubleSpinBox" name="minWaterTemp"/>
    </item>
-   <item row="11" column="1" colspan="4">
+   <item row="12" column="1" colspan="4">
     <widget class="QCheckBox" name="invertFilter">
      <property name="toolTip">
       <string>Display dives that will not match the search, only applies to tags, people, location and equipment</string>
@@ -118,32 +72,48 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="1" colspan="4">
-    <widget class="QDateTimeEdit" name="from"/>
+   <item row="3" column="1">
+    <widget class="QLabel" name="label_12">
+     <property name="text">
+      <string>Min</string>
+     </property>
+    </widget>
    </item>
-   <item row="8" column="1" colspan="4">
-    <widget class="QLineEdit" name="people"/>
+   <item row="5" column="0">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>From</string>
+     </property>
+    </widget>
    </item>
-   <item row="1" column="4">
-    <widget class="StarWidget" name="maxRating" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+   <item row="6" column="0">
+    <widget class="QLabel" name="label_6">
+     <property name="text">
+      <string>To</string>
      </property>
-     <property name="focusPolicy">
-      <enum>Qt::TabFocus</enum>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="QLabel" name="label_17">
+     <property name="text">
+      <string>Min</string>
      </property>
     </widget>
    </item>
    <item row="3" column="4">
     <widget class="QDoubleSpinBox" name="maxWaterTemp"/>
    </item>
-   <item row="10" column="0">
-    <widget class="QLabel" name="labelEquipment">
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_5">
      <property name="text">
-      <string>Equipment</string>
+      <string>Visibility</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QLabel" name="label_14">
+     <property name="text">
+      <string>Min</string>
      </property>
     </widget>
    </item>
@@ -154,83 +124,133 @@
      </property>
     </widget>
    </item>
-   <item row="9" column="0">
-    <widget class="QLabel" name="label_9">
+   <item row="10" column="1" colspan="4">
+    <widget class="QLineEdit" name="location"/>
+   </item>
+   <item row="11" column="0">
+    <widget class="QLabel" name="labelEquipment">
      <property name="text">
-      <string>Location</string>
+      <string>Equipment</string>
      </property>
     </widget>
    </item>
-   <item row="9" column="1" colspan="4">
-    <widget class="QLineEdit" name="location"/>
+   <item row="4" column="2">
+    <widget class="QDoubleSpinBox" name="minAirTemp"/>
    </item>
-   <item row="6" column="1" colspan="4">
-    <widget class="QDateTimeEdit" name="to"/>
+   <item row="4" column="4">
+    <widget class="QDoubleSpinBox" name="maxAirTemp"/>
    </item>
-   <item row="10" column="1" colspan="4">
+   <item row="11" column="1" colspan="4">
     <widget class="QLineEdit" name="equipment"/>
    </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="label_4">
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_11">
      <property name="text">
-      <string>From</string>
+      <string>Water Temp</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="0">
-    <widget class="QLabel" name="label_6">
+   <item row="9" column="1" colspan="4">
+    <widget class="QLineEdit" name="people"/>
+   </item>
+   <item row="4" column="3">
+    <widget class="QLabel" name="label_18">
      <property name="text">
-      <string>To</string>
+      <string>Max</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_5">
+   <item row="5" column="1" colspan="4">
+    <widget class="QDateTimeEdit" name="from"/>
+   </item>
+   <item row="10" column="0">
+    <widget class="QLabel" name="label_9">
      <property name="text">
-      <string>Visibility</string>
+      <string>Location</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="label_11">
+   <item row="6" column="1" colspan="4">
+    <widget class="QDateTimeEdit" name="to"/>
+   </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="label_2">
      <property name="text">
-      <string>Water Temp</string>
+      <string>Air Temp</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
-    <widget class="QLabel" name="label_14">
-     <property name="text">
-      <string>Min</string>
+   <item row="2" column="4">
+    <widget class="StarWidget" name="maxVisibility" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::TabFocus</enum>
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Air Temp</string>
+   <item row="2" column="2">
+    <widget class="StarWidget" name="minVisibility" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::TabFocus</enum>
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
-    <widget class="QLabel" name="label_17">
-     <property name="text">
-      <string>Min</string>
+   <item row="1" column="2">
+    <widget class="StarWidget" name="minRating" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::TabFocus</enum>
      </property>
     </widget>
    </item>
-   <item row="4" column="3">
-    <widget class="QLabel" name="label_18">
-     <property name="text">
-      <string>Max</string>
+   <item row="1" column="4">
+    <widget class="StarWidget" name="maxRating" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::TabFocus</enum>
      </property>
     </widget>
    </item>
-   <item row="4" column="2">
-    <widget class="QDoubleSpinBox" name="minAirTemp"/>
+   <item row="7" 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="4" column="4">
-    <widget class="QDoubleSpinBox" name="maxAirTemp"/>
+   <item row="7" column="2">
+    <widget class="QCheckBox" name="planned">
+     <property name="text">
+      <string>Planned</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>