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

Layout issues: Major rework on the MainTab

Browse source 
This seems almost perfect now.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-05-25 14:49:34 -03:00 • committed by Dirk Hohndel
parent d5013a7883
commit 946615b8d7
2 changed files with 114 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
qt-ui/locationInformation.ui
View file

@ -17,14 +17,23 @@
<string>Dive Site</string> <string>Dive Site</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="bottomMargin"> <property name="leftMargin">
<number>12</number> <number>12</number>
</property> </property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>2</number> <number>2</number>
</property> </property>
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>-1</number> <number>5</number>
</property> </property>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">

169
qt-ui/maintab.ui
View file

@ -513,6 +513,18 @@
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="equipmentTabScrollAreaLayout"> <layout class="QGridLayout" name="equipmentTabScrollAreaLayout">
<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>
<property name="spacing"> <property name="spacing">
<number>2</number> <number>2</number>
</property> </property>
@ -522,6 +534,18 @@
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<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> <item>
<widget class="QSplitter" name="splitter"> <widget class="QSplitter" name="splitter">
<property name="orientation"> <property name="orientation">
@ -584,6 +608,18 @@
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="diveInfoScrollAreaLayout"> <layout class="QGridLayout" name="diveInfoScrollAreaLayout">
<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>
<property name="spacing"> <property name="spacing">
<number>2</number> <number>2</number>
</property> </property>
@ -892,9 +928,6 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>5</number> <number>5</number>
</property> </property>
<item row="0" column="1">
<widget class="KMessageWidget" name="diveStatisticsMessage" native="true"/>
</item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QScrollArea" name="scrollArea_4"> <widget class="QScrollArea" name="scrollArea_4">
<property name="frameShape"> <property name="frameShape">
@ -915,48 +948,33 @@
<height>750</height> <height>750</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="statsScrollAreaLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing"> <property name="leftMargin">
<number>2</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <property name="topMargin">
<widget class="QGroupBox" name="groupBoxb"> <number>0</number>
<property name="title"> </property>
<string>Depth</string> <property name="rightMargin">
</property> <number>0</number>
<layout class="QHBoxLayout" name="statsDepthLayout"> </property>
<item> <property name="bottomMargin">
<widget class="MinMaxAvgWidget" name="depthLimits" native="true"/> <number>0</number>
</item> </property>
</layout> <item>
</widget> <layout class="QVBoxLayout" name="verticalLayout_5">
</item> <item>
<item row="0" column="1"> <widget class="QGroupBox" name="groupBoxb">
<widget class="QGroupBox" name="groupBox_8b"> <property name="title">
<property name="title"> <string>Depth</string>
<string>Temperature</string> </property>
</property> <layout class="QHBoxLayout" name="statsDepthLayout">
<layout class="QHBoxLayout" name="statsTempLayout"> <item>
<item> <widget class="MinMaxAvgWidget" name="depthLimits" native="true"/>
<widget class="MinMaxAvgWidget" name="tempLimits" native="true"/> </item>
</item> </layout>
</layout> </widget>
</widget> </item>
</item>
<item row="0" column="2">
<widget class="QGroupBox" name="groupBox_4b">
<property name="title">
<string>SAC</string>
</property>
<layout class="QHBoxLayout" name="statsSacLayout">
<item>
<widget class="MinMaxAvgWidget" name="sacLimits" native="true"/>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<layout class="QVBoxLayout" name="statsOuterDurationLayout">
<item> <item>
<widget class="QGroupBox" name="groupBox_14"> <widget class="QGroupBox" name="groupBox_14">
<property name="title"> <property name="title">
@ -970,25 +988,34 @@
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="innerSpacer0"> <spacer name="verticalSpacer_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>0</width> <width>20</width>
<height>0</height> <height>40</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="1"> <item>
<layout class="QVBoxLayout" name="statsOuterTotalTimeDivesLayout"> <layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<widget class="QGroupBox" name="groupBox_8b">
<property name="title">
<string>Temperature</string>
</property>
<layout class="QHBoxLayout" name="statsTempLayout">
<item>
<widget class="MinMaxAvgWidget" name="tempLimits" native="true"/>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QGroupBox" name="groupBox_11b"> <widget class="QGroupBox" name="groupBox_11b">
<property name="title"> <property name="title">
@ -1028,25 +1055,34 @@
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="innerSpacer1"> <spacer name="verticalSpacer_3">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>0</width> <width>20</width>
<height>0</height> <height>40</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="2"> <item>
<layout class="QVBoxLayout" name="statsOuterGasConsumptionLayout"> <layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<widget class="QGroupBox" name="groupBox_4b">
<property name="title">
<string>SAC</string>
</property>
<layout class="QHBoxLayout" name="statsSacLayout">
<item>
<widget class="MinMaxAvgWidget" name="sacLimits" native="true"/>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QGroupBox" name="groupBox_13"> <widget class="QGroupBox" name="groupBox_13">
<property name="title"> <property name="title">
@ -1067,17 +1103,14 @@
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="innerSpacer2"> <spacer name="verticalSpacer_4">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>0</width> <width>20</width>
<height>0</height> <height>40</height>
</size> </size>
</property> </property>
</spacer> </spacer>
@ -1088,9 +1121,13 @@
<zorder>groupBox_8b</zorder> <zorder>groupBox_8b</zorder>
<zorder>groupBox_4b</zorder> <zorder>groupBox_4b</zorder>
<zorder>groupBoxb</zorder> <zorder>groupBoxb</zorder>
<zorder>diveStatisticsMessage</zorder>
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="0" column="1">
<widget class="KMessageWidget" name="diveStatisticsMessage" native="true"/>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">