summaryrefslogtreecommitdiffstats
path: root/qt-ui/maintab.ui
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-07-14 15:33:28 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-07-14 15:33:28 -0700
commit9d622996bae40bf94feaa603282af973d48eeab1 (patch)
treee3d1f8a9e817b96a18979b88f6ba69bf3b797b2b /qt-ui/maintab.ui
parent70656cddead4eaf3382d16af7be4898a34cbdec1 (diff)
parent536469107d94f265a03e44fcc755b92b9016cbca (diff)
downloadsubsurface-9d622996bae40bf94feaa603282af973d48eeab1.tar.gz
Merge branch 'tomaz'
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/maintab.ui')
-rw-r--r--qt-ui/maintab.ui27
1 files changed, 8 insertions, 19 deletions
diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui
index 3318bf788..c83d12ec3 100644
--- a/qt-ui/maintab.ui
+++ b/qt-ui/maintab.ui
@@ -56,7 +56,7 @@
<x>0</x>
<y>0</y>
<width>449</width>
- <height>751</height>
+ <height>758</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
@@ -167,15 +167,15 @@
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
<property name="leftMargin">
<number>5</number>
</property>
<property name="rightMargin">
<number>5</number>
</property>
- <property name="spacing">
- <number>0</number>
- </property>
<item>
<layout class="QHBoxLayout" name="LocationLayout" stretch="0,1">
<item>
@@ -209,17 +209,6 @@
<widget class="QLineEdit" name="location"/>
</item>
<item>
- <widget class="QToolButton" name="addDiveSite">
- <property name="text">
- <string>...</string>
- </property>
- <property name="icon">
- <iconset resource="../subsurface.qrc">
- <normaloff>:/edit</normaloff>:/edit</iconset>
- </property>
- </widget>
- </item>
- <item>
<widget class="QToolButton" name="geocodeButton">
<property name="text">
<string>...</string>
@@ -658,8 +647,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>286</width>
- <height>300</height>
+ <width>317</width>
+ <height>365</height>
</rect>
</property>
<layout class="QGridLayout" name="diveInfoScrollAreaLayout">
@@ -999,8 +988,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>297</width>
- <height>177</height>
+ <width>331</width>
+ <height>220</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">