diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2014-06-26 16:53:42 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-06-26 15:42:03 -0700 |
| commit | 8131a1cee8bdd154818c5a76b5551644350b1660 (patch) | |
| tree | 5db15c5e2216c9ded8affa3895da0a7e73840533 /qt-ui/plannerSettings.ui | |
| parent | d2a834b0cdcf9adae750192dbb04f8a3efeeb74a (diff) | |
| download | subsurface-8131a1cee8bdd154818c5a76b5551644350b1660.tar.gz | |
Make the dive planner dialog prettier.
It was too much vertical and cluttered, making the usage of the
application a bit strange.
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/plannerSettings.ui')
| -rw-r--r-- | qt-ui/plannerSettings.ui | 624 |
1 files changed, 363 insertions, 261 deletions
diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui index 271906e70..9cb802848 100644 --- a/qt-ui/plannerSettings.ui +++ b/qt-ui/plannerSettings.ui @@ -6,331 +6,444 @@ <rect> <x>0</x> <y>0</y> - <width>537</width> - <height>435</height> + <width>1116</width> + <height>292</height> </rect> </property> <property name="windowTitle"> <string>Form</string> </property> <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="spacing"> + <number>2</number> + </property> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> + <number>2</number> + </property> <item> - <widget class="QFrame" name="frame_3"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> + <string>Rates</string> </property> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Raised</enum> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="6" column="0"> - <widget class="QLabel" name="label_9"> - <property name="text"> - <string>surface to the bottom</string> - </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="spacing"> + <number>2</number> + </property> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> + <number>2</number> + </property> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Ascent</string> + </property> + <layout class="QGridLayout" name="gridLayout_3"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> + <number>2</number> + </property> + <property name="horizontalSpacing"> + <number>2</number> + </property> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>75%-50% avg. depth</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="ascRate75"> + <property name="suffix"> + <string>m/min</string> + </property> + <property name="minimum"> + <number>1</number> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>below 75% avg. depth</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QSpinBox" name="ascRateStops"> + <property name="suffix"> + <string>m/min</string> + </property> + <property name="minimum"> + <number>1</number> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>6m/20ft to surface</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QSpinBox" name="ascRate50"> + <property name="suffix"> + <string>m/min</string> + </property> + <property name="minimum"> + <number>1</number> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QSpinBox" name="ascRateLast6m"> + <property name="suffix"> + <string>m/min</string> + </property> + <property name="minimum"> + <number>1</number> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>50% avg. depth - 6m/20ft</string> + </property> + </widget> + </item> + </layout> </widget> </item> - <item row="10" column="1"> - <widget class="QDoubleSpinBox" name="bottompo2"> - <property name="suffix"> - <string>bar</string> - </property> - <property name="maximum"> - <double>2.000000000000000</double> - </property> - <property name="singleStep"> - <double>0.100000000000000</double> - </property> - <property name="value"> - <double>1.400000000000000</double> - </property> + <item> + <widget class="QGroupBox" name="groupBox_3"> + <property name="title"> + <string>Descent</string> + </property> + <layout class="QGridLayout" name="gridLayout_4"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> + <number>2</number> + </property> + <property name="spacing"> + <number>2</number> + </property> + <item row="0" column="1"> + <widget class="QSpinBox" name="descRate"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>16777215</height> + </size> + </property> + <property name="suffix"> + <string>m/min</string> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="value"> + <number>18</number> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label_9"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>surface to the bottom</string> + </property> + </widget> + </item> + </layout> </widget> </item> - <item row="6" column="1"> - <widget class="QSpinBox" name="descRate"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maximumSize"> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> <size> - <width>16777215</width> - <height>20</height> + <width>20</width> + <height>40</height> </size> </property> - <property name="suffix"> - <string>m/min</string> - </property> - <property name="minimum"> - <number>1</number> - </property> - <property name="value"> - <number>18</number> - </property> - </widget> - </item> - <item row="11" column="1"> - <widget class="QDoubleSpinBox" name="decopo2"> - <property name="suffix"> - <string>bar</string> - </property> - <property name="maximum"> - <double>2.000000000000000</double> - </property> - <property name="singleStep"> - <double>0.100000000000000</double> - </property> - <property name="value"> - <double>1.600000000000000</double> - </property> - </widget> + </spacer> </item> - <item row="1" column="1"> - <widget class="QSpinBox" name="ascRate75"> - <property name="suffix"> - <string>m/min</string> - </property> - <property name="minimum"> - <number>1</number> - </property> - </widget> - </item> - <item row="10" column="0"> - <widget class="QLabel" name="label_6"> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_5"> + <property name="title"> + <string>Planning</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> + <number>2</number> + </property> + <property name="spacing"> + <number>2</number> + </property> + <item row="4" column="0" colspan="2"> + <widget class="QCheckBox" name="backgasBreaks"> <property name="text"> - <string>bottom pO₂</string> + <string>plan backgas breaks</string> </property> </widget> </item> - <item row="5" column="0"> - <widget class="QLabel" name="label_8"> + <item row="0" column="0"> + <widget class="QLabel" name="label_15"> <property name="text"> - <string><html><head/><body><p><span style=" font-weight:600;">Descent rate</span></p></body></html></string> + <string>GF low</string> </property> </widget> </item> - <item row="4" column="0"> - <widget class="QLabel" name="label_4"> + <item row="3" column="0" colspan="2"> + <widget class="QCheckBox" name="lastStop"> <property name="text"> - <string>6m/20ft to surface</string> + <string>Last Stop at 6m/20ft</string> </property> </widget> </item> - <item row="11" column="0"> - <widget class="QLabel" name="label_7"> + <item row="1" column="0"> + <widget class="QLabel" name="label_16"> <property name="text"> - <string>deco pO₂</string> + <string>GF high</string> </property> </widget> </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>75%-50% avg. depth</string> + <item row="1" column="1"> + <widget class="QSpinBox" name="gfhigh"> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>150</number> </property> </widget> </item> - <item row="1" column="0"> - <widget class="QLabel" name="label"> + <item row="2" column="0" colspan="2"> + <widget class="QCheckBox" name="drop_stone_mode"> <property name="text"> - <string>below 75% avg. depth</string> + <string>Drop to first depth</string> </property> </widget> </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>50% avg. depth - 6m/20ft</string> + <item row="0" column="1"> + <widget class="QSpinBox" name="gflow"> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>150</number> </property> </widget> </item> - <item row="0" column="0"> - <widget class="QLabel" name="label_5"> - <property name="text"> - <string><html><head/><body><p><span style=" font-weight:600;">Ascent rates</span></p></body></html></string> + <item row="5" column="0"> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> </property> - </widget> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_4"> + <property name="title"> + <string>Gas Options</string> + </property> + <layout class="QGridLayout" name="gridLayout_5"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> + <number>2</number> + </property> + <property name="spacing"> + <number>2</number> + </property> <item row="3" column="1"> - <widget class="QSpinBox" name="ascRateStops"> + <widget class="QDoubleSpinBox" name="decopo2"> <property name="suffix"> - <string>m/min</string> + <string>bar</string> </property> - <property name="minimum"> - <number>1</number> + <property name="maximum"> + <double>2.000000000000000</double> + </property> + <property name="singleStep"> + <double>0.100000000000000</double> + </property> + <property name="value"> + <double>1.600000000000000</double> </property> </widget> </item> - <item row="4" column="1"> - <widget class="QSpinBox" name="ascRateLast6m"> + <item row="2" column="1"> + <widget class="QDoubleSpinBox" name="bottompo2"> <property name="suffix"> - <string>m/min</string> + <string>bar</string> </property> - <property name="minimum"> - <number>1</number> + <property name="maximum"> + <double>2.000000000000000</double> + </property> + <property name="singleStep"> + <double>0.100000000000000</double> + </property> + <property name="value"> + <double>1.400000000000000</double> </property> </widget> </item> - <item row="7" column="0"> - <widget class="QLabel" name="label_12"> + <item row="3" column="0"> + <widget class="QLabel" name="label_7"> <property name="text"> - <string><html><head/><body><p><span style=" font-weight:600;">Gas options</span></p></body></html></string> + <string>deco pO₂</string> </property> </widget> </item> - <item row="2" column="1"> - <widget class="QSpinBox" name="ascRate50"> - <property name="suffix"> - <string>m/min</string> - </property> - <property name="minimum"> - <number>1</number> + <item row="2" column="0"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>bottom pO₂</string> </property> </widget> </item> - <item row="8" column="1"> - <widget class="QSpinBox" name="bottomSAC"/> + <item row="1" column="1"> + <widget class="QSpinBox" name="decoStopSAC"/> </item> - <item row="8" column="0"> + <item row="0" column="0"> <widget class="QLabel" name="label_13"> <property name="text"> <string>bottom SAC</string> </property> </widget> </item> - <item row="9" column="0"> + <item row="0" column="1"> + <widget class="QSpinBox" name="bottomSAC"/> + </item> + <item row="1" column="0"> <widget class="QLabel" name="label_14"> <property name="text"> <string>deco SAC</string> </property> </widget> </item> - <item row="9" column="1"> - <widget class="QSpinBox" name="decoStopSAC"/> + <item row="4" column="0"> + <spacer name="verticalSpacer_3"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> </item> </layout> </widget> </item> <item> - <widget class="QFrame" name="frame_2"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Raised</enum> + <widget class="QGroupBox" name="groupBox_6"> + <property name="title"> + <string>Dive Notes</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <property name="sizeConstraint"> - <enum>QLayout::SetNoConstraint</enum> + <layout class="QGridLayout" name="gridLayout_6"> + <property name="leftMargin"> + <number>2</number> </property> - <item> - <widget class="QLabel" name="label_10"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string><html><head/><body><p><span style=" font-weight:600;">Planning options</span></p></body></html></string> - </property> - </widget> - </item> - <item> - <widget class="QFrame" name="frame"> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Raised</enum> - </property> - <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0"> - <widget class="QLabel" name="label_15"> - <property name="text"> - <string>GF low</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QSpinBox" name="gflow"> - <property name="minimum"> - <number>1</number> - </property> - <property name="maximum"> - <number>150</number> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_16"> - <property name="text"> - <string>GF high</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QSpinBox" name="gfhigh"> - <property name="minimum"> - <number>1</number> - </property> - <property name="maximum"> - <number>150</number> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QCheckBox" name="drop_stone_mode"> - <property name="text"> - <string>Drop to first depth</string> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="lastStop"> - <property name="text"> - <string>Last Stop at 6m/20ft</string> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="backgasBreaks"> - <property name="text"> - <string>plan backgas breaks</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="label_11"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> + <number>2</number> + </property> + <property name="spacing"> + <number>2</number> + </property> + <item row="3" column="0"> + <widget class="QCheckBox" name="verbatim_plan"> <property name="text"> - <string><html><head/><body><p><span style=" font-weight:600;">Dive note options</span></p></body></html></string> + <string>verbatim diveplan</string> </property> </widget> </item> - <item> + <item row="0" column="0"> <widget class="QCheckBox" name="display_runtime"> <property name="toolTip"> <string>In dive plan, show runtime (absolute time) of stops</string> @@ -343,7 +456,7 @@ </property> </widget> </item> - <item> + <item row="1" column="0"> <widget class="QCheckBox" name="display_duration"> <property name="enabled"> <bool>true</bool> @@ -359,7 +472,7 @@ </property> </widget> </item> - <item> + <item row="2" column="0"> <widget class="QCheckBox" name="display_transitions"> <property name="toolTip"> <string>In diveplan, list transitions or treat them as implicit</string> @@ -369,35 +482,24 @@ </property> </widget> </item> - <item> - <widget class="Line" name="line"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>20</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> + <item row="4" column="0"> + <spacer name="verticalSpacer_4"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Vertical</enum> </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="verbatim_plan"> - <property name="text"> - <string>verbatim diveplan</string> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> </property> - </widget> + </spacer> </item> </layout> </widget> </item> </layout> </widget> - <tabstops> - <tabstop>lastStop</tabstop> - <tabstop>backgasBreaks</tabstop> - </tabstops> <resources/> <connections/> </ui> |