diff options
| author |  Tomaz Canabrava <tcanabrava@kde.org> | 2013-08-26 08:43:37 -0300 |
|---|---|---|
| committer | Tomaz Canabrava <tcanabrava@kde.org> | 2013-08-26 08:43:37 -0300 |
| commit | 0a043528f72a47b14cfe3708a8f133a29ad17d55 (patch) | |
| tree | 80f88141bd2f9a9264ce48735f26c74446040074 /qt-ui/mainwindow.ui | |
| parent | 2fb2918607ffb857543b9060fd9f18f0d07ab780 (diff) | |
| download | subsurface-0a043528f72a47b14cfe3708a8f133a29ad17d55.tar.gz | |
Added a new widget to control the Planner
Added a new widget to control the DivePlanner, now we
have two widgets, a graphics one and a qt sidget based one.
the Technical divers will most likely use the QtWidget one
while the hobbists will most likely use the QGraphicsView
one. there's not a option to choose one, they both will
appear at the same time.
Next step: make the screens to work.
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Diffstat (limited to 'qt-ui/mainwindow.ui')
| -rw-r--r-- | qt-ui/mainwindow.ui | 57 |
1 files changed, 48 insertions, 9 deletions
diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui index 731013538..445d121df 100644 --- a/qt-ui/mainwindow.ui +++ b/qt-ui/mainwindow.ui @@ -24,17 +24,44 @@ <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <widget class="MainTab" name="InfoWidget" native="true"/> + <widget class="QStackedWidget" name="infoPane"> + <property name="currentIndex"> + <number>1</number> + </property> + <widget class="QWidget" name="page"> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="MainTab" name="InfoWidget" native="true"/> + </item> + </layout> + </widget> + <widget class="QWidget" name="page_2"> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <item> + <widget class="DivePlannerWidget" name="widget" native="true"/> + </item> + </layout> + </widget> + </widget> <widget class="QStackedWidget" name="stackedWidget"> <property name="currentIndex"> - <number>0</number> + <number>1</number> </property> <widget class="QWidget" name="page_5"> <layout class="QHBoxLayout" name="horizontalLayout"> <property name="spacing"> <number>0</number> </property> - <property name="margin"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> <number>0</number> </property> <item> @@ -47,7 +74,16 @@ <property name="spacing"> <number>0</number> </property> - <property name="margin"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> <number>0</number> </property> <item> @@ -123,10 +159,7 @@ </widget> </item> <item> - <widget class="KMessageWidget" name="mainErrorMessage" native="true"> - <zorder>mainSplitter</zorder> - <zorder>mainSplitter</zorder> - </widget> + <widget class="KMessageWidget" name="mainErrorMessage" native="true"/> </item> </layout> </widget> @@ -136,7 +169,7 @@ <x>0</x> <y>0</y> <width>763</width> - <height>20</height> + <height>19</height> </rect> </property> <widget class="QMenu" name="menuFile"> @@ -443,6 +476,12 @@ <extends>QGraphicsView</extends> <header>diveplanner.h</header> </customwidget> + <customwidget> + <class>DivePlannerWidget</class> + <extends>QWidget</extends> + <header>diveplanner.h</header> + <container>1</container> + </customwidget> </customwidgets> <resources/> <connections/> |