mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Moved the DivePlanner to the MainWindow.

Browse source 
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>
This commit is contained in:
Tomaz Canabrava 2013-06-27 14:48:03 -03:00
parent de7506b44d
commit 1244438b01
5 changed files with 53 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

50
qt-ui/mainwindow.ui
View file

@ -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/>