diff options
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..05a59524e 100644 --- a/qt-ui/mainwindow.ui +++ b/qt-ui/mainwindow.ui @@ -24,7 +24,25 @@ <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <widget class="MainTab" name="InfoWidget" native="true"/> + <widget class="QStackedWidget" name="infoPane"> + <property name="currentIndex"> + <number>0</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> @@ -34,7 +52,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> @@ -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"> @@ -419,7 +452,7 @@ <customwidget> <class>MainTab</class> <extends>QWidget</extends> - <header>maintab.h</header> + <header>qt-ui/maintab.h</header> <container>1</container> </customwidget> <customwidget> @@ -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/> |