diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-05-17 22:18:07 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-05-17 22:18:07 -0700 |
| commit | ce786bb8b3d1ede51533e1a42c05edce59e3210f (patch) | |
| tree | 895ca43141464de82abb0bac36add878c1df4720 /qt-ui/mainwindow.ui | |
| parent | f3f7bf51fa1dbe9cdb859e1a45b20c108613275b (diff) | |
| parent | cffc66f45a9532076b9001825c51818df4688e3c (diff) | |
| download | subsurface-ce786bb8b3d1ede51533e1a42c05edce59e3210f.tar.gz | |
Merge branch 'Globe' of https://github.com/tcanabrava/subsurface
Diffstat (limited to 'qt-ui/mainwindow.ui')
| -rw-r--r-- | qt-ui/mainwindow.ui | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui index ab0cd5f49..36f594d2d 100644 --- a/qt-ui/mainwindow.ui +++ b/qt-ui/mainwindow.ui @@ -14,8 +14,8 @@ <string>MainWindow</string> </property> <widget class="QWidget" name="centralwidget"> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> <widget class="QSplitter" name="mainSplitter"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -27,7 +27,7 @@ <widget class="MainTab" name="InfoWidget" native="true"/> <widget class="ProfileGraphicsView" name="ProfileWidget"/> </widget> - <widget class="QSplitter" name="globeListSplitter"> + <widget class="QSplitter" name="listGlobeSplitter"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> @@ -82,7 +82,16 @@ <bool>true</bool> </property> </widget> - <widget class="GlobeGPS" name="widget" native="true"/> + <widget class="QWidget" name="layoutWidget"> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="KMessageWidget" name="globeMessage" native="true"/> + </item> + <item> + <widget class="GlobeGPS" name="globe" native="true"/> + </item> + </layout> + </widget> </widget> </widget> </item> @@ -377,6 +386,12 @@ <header>globe.h</header> <container>1</container> </customwidget> + <customwidget> + <class>KMessageWidget</class> + <extends>QWidget</extends> + <header>kmessagewidget.h</header> + <container>1</container> + </customwidget> </customwidgets> <resources/> <connections/> |