diff options
author | Maximilian Güntner <maximilian.guentner@gmail.com> | 2013-11-02 02:20:02 +0100 |
---|---|---|
committer | Maximilian Güntner <maximilian.guentner@gmail.com> | 2013-11-02 03:37:31 +0100 |
commit | 04cdfce782f2a104ab5d0ee92de67c7b6271835b (patch) | |
tree | f937c8c8a005ef00f880bbcd3d7c56fd043ddfeb /qt-ui/maintab.ui | |
parent | 6fe8cb652191728586f3731dcf6688b5a5b3efbb (diff) | |
download | subsurface-04cdfce782f2a104ab5d0ee92de67c7b6271835b.tar.gz |
Added a custom widget for tagging dives
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>
Diffstat (limited to 'qt-ui/maintab.ui')
-rw-r--r-- | qt-ui/maintab.ui | 121 |
1 files changed, 79 insertions, 42 deletions
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/> |