From 04cdfce782f2a104ab5d0ee92de67c7b6271835b Mon Sep 17 00:00:00 2001
From: Maximilian Güntner <maximilian.guentner@gmail.com>
Date: Sat, 2 Nov 2013 02:20:02 +0100
Subject: Added a custom widget for tagging dives
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A custom tag widget has been added to MainTab.
Tags are seperated by a comma ",". The implementation
supports escaping a comma by using "\,".
While typing, the widget supports the user by suggesting
tags using a QCompleter.

Signed-off-by: Maximilian Güntner <maximilian.guentner@gmail.com>
---
 qt-ui/maintab.ui | 121 ++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 79 insertions(+), 42 deletions(-)

(limited to 'qt-ui/maintab.ui')

diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui
index 3685f19ac..3e12d4c47 100644
--- a/qt-ui/maintab.ui
+++ b/qt-ui/maintab.ui
@@ -37,8 +37,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>513</width>
-         <height>468</height>
+         <width>501</width>
+         <height>535</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_2">
@@ -102,13 +102,6 @@
           </item>
          </layout>
         </item>
-        <item row="3" column="0">
-         <widget class="QLabel" name="LocationLabel">
-          <property name="text">
-           <string>Location</string>
-          </property>
-         </widget>
-        </item>
         <item row="4" column="0" colspan="2">
          <widget class="QLineEdit" name="location">
           <property name="readOnly">
@@ -116,10 +109,17 @@
           </property>
          </widget>
         </item>
-        <item row="5" column="0">
-         <widget class="QLabel" name="CoordinatedLabel">
+        <item row="3" column="0">
+         <widget class="QLabel" name="LocationLabel">
           <property name="text">
-           <string>Coordinates</string>
+           <string>Location</string>
+          </property>
+         </widget>
+        </item>
+        <item row="11" column="0">
+         <widget class="QLabel" name="TagLabel">
+          <property name="text">
+           <string>Tags</string>
           </property>
          </widget>
         </item>
@@ -130,10 +130,17 @@
           </property>
          </widget>
         </item>
-        <item row="7" column="0">
-         <widget class="QLabel" name="DivemasterLabel">
+        <item row="8" column="0">
+         <widget class="QLineEdit" name="divemaster">
+          <property name="readOnly">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="0">
+         <widget class="QLabel" name="CoordinatedLabel">
           <property name="text">
-           <string>Divemaster</string>
+           <string>Coordinates</string>
           </property>
          </widget>
         </item>
@@ -144,15 +151,22 @@
           </property>
          </widget>
         </item>
-        <item row="8" column="0">
-         <widget class="QLineEdit" name="divemaster">
+        <item row="8" column="1">
+         <widget class="QLineEdit" name="buddy">
           <property name="readOnly">
            <bool>false</bool>
           </property>
          </widget>
         </item>
-        <item row="8" column="1">
-         <widget class="QLineEdit" name="buddy">
+        <item row="7" column="0">
+         <widget class="QLabel" name="DivemasterLabel">
+          <property name="text">
+           <string>Divemaster</string>
+          </property>
+         </widget>
+        </item>
+        <item row="10" column="1">
+         <widget class="QLineEdit" name="suit">
           <property name="readOnly">
            <bool>false</bool>
           </property>
@@ -176,6 +190,13 @@
           </item>
          </layout>
         </item>
+        <item row="14" column="0" colspan="2">
+         <widget class="QTextEdit" name="notes">
+          <property name="readOnly">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
         <item row="9" column="1">
          <widget class="QLabel" name="SuitLabel">
           <property name="text">
@@ -193,34 +214,45 @@
           </item>
          </layout>
         </item>
-        <item row="10" column="1">
-         <widget class="QLineEdit" name="suit">
-          <property name="readOnly">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="11" column="0">
+        <item row="13" column="0">
          <widget class="QLabel" name="NotesLabel">
           <property name="text">
            <string>Notes</string>
           </property>
          </widget>
         </item>
-        <item row="12" column="0" colspan="2">
-         <widget class="QTextEdit" name="notes">
-          <property name="readOnly">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="13" column="0" colspan="2">
+        <item row="15" column="0" colspan="2">
          <widget class="QDialogButtonBox" name="notesButtonBox">
           <property name="standardButtons">
            <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
           </property>
          </widget>
         </item>
+        <item row="12" column="0" colspan="2">
+         <widget class="TagWidget" name="tagWidget">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="verticalScrollBarPolicy">
+           <enum>Qt::ScrollBarAlwaysOff</enum>
+          </property>
+          <property name="horizontalScrollBarPolicy">
+           <enum>Qt::ScrollBarAlwaysOff</enum>
+          </property>
+          <property name="lineWrapMode">
+           <enum>QPlainTextEdit::NoWrap</enum>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </widget>
@@ -248,8 +280,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>513</width>
-         <height>468</height>
+         <width>515</width>
+         <height>473</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_5">
@@ -335,8 +367,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>513</width>
-         <height>468</height>
+         <width>515</width>
+         <height>473</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_6">
@@ -584,7 +616,7 @@
          </widget>
         </item>
         <item row="4" column="0">
-         <widget class="QGroupBox">
+         <widget class="QGroupBox" name="groupBox">
           <property name="title">
            <string>Salinity</string>
           </property>
@@ -642,8 +674,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>513</width>
-         <height>468</height>
+         <width>515</width>
+         <height>473</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_7">
@@ -802,6 +834,11 @@
    <header>tableview.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>TagWidget</class>
+   <extends>QPlainTextEdit</extends>
+   <header>qt-ui/tagwidget.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
-- 
cgit v1.2.3-70-g09d2