diff options
| author |  Tomaz Canabrava <tcanabrava@kde.org> | 2013-06-27 14:48:03 -0300 |
|---|---|---|
| committer | Tomaz Canabrava <tcanabrava@kde.org> | 2013-06-27 14:48:03 -0300 |
| commit | 1244438b017f71be466ace7df9cad9462287fd30 (patch) | |
| tree | aa7dcb8f0e52f54d01918f54e3ffd617eea4f9ea /qt-ui/mainwindow.ui | |
| parent | de7506b44d03b4190d3a0205398d047e8303f75a (diff) | |
| download | subsurface-1244438b017f71be466ace7df9cad9462287fd30.tar.gz | |
Moved the DivePlanner to the MainWindow.
Now, activating the dive planner will hide the profile
and show the planner on the same place. we still need
a way to 'cancel' or 'accept' the profile created.
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Diffstat (limited to 'qt-ui/mainwindow.ui')
| -rw-r--r-- | qt-ui/mainwindow.ui | 50 |
1 files changed, 44 insertions, 6 deletions
diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui index b1274b8ea..731013538 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> @@ -25,7 +25,37 @@ <enum>Qt::Horizontal</enum> </property> <widget class="MainTab" name="InfoWidget" native="true"/> - <widget class="ProfileGraphicsView" name="ProfileWidget"/> + <widget class="QStackedWidget" name="stackedWidget"> + <property name="currentIndex"> + <number>0</number> + </property> + <widget class="QWidget" name="page_5"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="spacing"> + <number>0</number> + </property> + <property name="margin"> + <number>0</number> + </property> + <item> + <widget class="ProfileGraphicsView" name="ProfileWidget"/> + </item> + </layout> + </widget> + <widget class="QWidget" name="page_6"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="spacing"> + <number>0</number> + </property> + <property name="margin"> + <number>0</number> + </property> + <item> + <widget class="DivePlannerGraphics" name="divePlanner"/> + </item> + </layout> + </widget> + </widget> </widget> <widget class="QSplitter" name="listGlobeSplitter"> <property name="orientation"> @@ -92,8 +122,11 @@ </widget> </widget> </item> - <item row="1" column="0"> - <widget class="KMessageWidget" name="mainErrorMessage" native="true"/> + <item> + <widget class="KMessageWidget" name="mainErrorMessage" native="true"> + <zorder>mainSplitter</zorder> + <zorder>mainSplitter</zorder> + </widget> </item> </layout> </widget> @@ -103,7 +136,7 @@ <x>0</x> <y>0</y> <width>763</width> - <height>18</height> + <height>20</height> </rect> </property> <widget class="QMenu" name="menuFile"> @@ -405,6 +438,11 @@ <header>globe.h</header> <container>1</container> </customwidget> + <customwidget> + <class>DivePlannerGraphics</class> + <extends>QGraphicsView</extends> + <header>diveplanner.h</header> + </customwidget> </customwidgets> <resources/> <connections/> |