diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-07-02 07:03:03 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-07-02 07:03:03 -0700 |
| commit | f554c2d16cb5816b6b1a97b0349488bc70b512b0 (patch) | |
| tree | 60811b1d64c2f37378ed20147f829cf74849d1dd /qt-ui/maintab.ui | |
| parent | 1d59b028c91ab7943cfece4a113948c61110dfc3 (diff) | |
| parent | 0a0a6f07d5dbb2c24184d22c3c2cedf89ffdc7ac (diff) | |
| download | subsurface-f554c2d16cb5816b6b1a97b0349488bc70b512b0.tar.gz | |
Merge branch 'taxonomy'
Diffstat (limited to 'qt-ui/maintab.ui')
| -rw-r--r-- | qt-ui/maintab.ui | 66 |
1 files changed, 45 insertions, 21 deletions
diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui index 7ac703076..3318bf788 100644 --- a/qt-ui/maintab.ui +++ b/qt-ui/maintab.ui @@ -167,25 +167,38 @@ </item> <item> <layout class="QVBoxLayout" name="verticalLayout"> + <property name="leftMargin"> + <number>5</number> + </property> + <property name="rightMargin"> + <number>5</number> + </property> <property name="spacing"> <number>0</number> </property> <item> - <widget class="QLabel" name="LocationLabel"> - <property name="text"> - <string>Location</string> - </property> - <property name="alignment"> - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="locationTags"> - <property name="text"> - <string/> - </property> - </widget> + <layout class="QHBoxLayout" name="LocationLayout" stretch="0,1"> + <item> + <widget class="QLabel" name="LocationLabel"> + <property name="text"> + <string>Location</string> + </property> + <property name="alignment"> + <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="locationTags"> + <property name="text"> + <string/> + </property> + <property name="textFormat"> + <enum>Qt::RichText</enum> + </property> + </widget> + </item> + </layout> </item> <item> <layout class="QHBoxLayout" name="horizontalLayout_2"> @@ -207,6 +220,17 @@ </widget> </item> <item> + <widget class="QToolButton" name="geocodeButton"> + <property name="text"> + <string>...</string> + </property> + <property name="icon"> + <iconset resource="../subsurface.qrc"> + <normaloff>:/geocode</normaloff>:/geocode</iconset> + </property> + </widget> + </item> + <item> <widget class="QtWaitingSpinner" name="waitingSpinner" native="true"/> </item> </layout> @@ -539,8 +563,8 @@ <rect> <x>0</x> <y>0</y> - <width>449</width> - <height>743</height> + <width>100</width> + <height>30</height> </rect> </property> <layout class="QGridLayout" name="equipmentTabScrollAreaLayout"> @@ -634,8 +658,8 @@ <rect> <x>0</x> <y>0</y> - <width>449</width> - <height>743</height> + <width>286</width> + <height>300</height> </rect> </property> <layout class="QGridLayout" name="diveInfoScrollAreaLayout"> @@ -975,8 +999,8 @@ <rect> <x>0</x> <y>0</y> - <width>449</width> - <height>743</height> + <width>297</width> + <height>177</height> </rect> </property> <layout class="QHBoxLayout" name="horizontalLayout"> |