diff options
author | Tomaz Canabrava <tomaz.canabrava@intel.com> | 2014-08-04 13:18:20 -0300 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2014-08-04 09:49:51 -0700 |
commit | 116608201dae69e68f4366746e1a2de2adcfe1b2 (patch) | |
tree | 692828ae445e513ed0835b79d756bcce35276fed | |
parent | e95fa6c6dc0940bc62073b3c7c8e145933069883 (diff) | |
download | subsurface-116608201dae69e68f4366746e1a2de2adcfe1b2.tar.gz |
Fix unresizable DiveList
The issue with the dive list was actually the Planner Settings widget
that was in the same space as the dive list but hidden, but since it
had a minimum width we couldn't resize the dive list to be below the
planner settings minimum.
Fixed by inserting the contents of the Planner Settings into a QScroll
Area.
Fixes #679
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r-- | qt-ui/plannerSettings.ui | 981 |
1 files changed, 503 insertions, 478 deletions
diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui index e94dc88d8..0ad0f5b70 100644 --- a/qt-ui/plannerSettings.ui +++ b/qt-ui/plannerSettings.ui @@ -6,496 +6,521 @@ <rect> <x>0</x> <y>0</y> - <width>1116</width> - <height>292</height> + <width>1102</width> + <height>442</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> + <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> - <widget class="QGroupBox" name="groupBox_2"> - <property name="title"> - <string>Rates</string> + <widget class="QScrollArea" name="scrollArea"> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> </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 name="frameShadow"> + <enum>QFrame::Plain</enum> + </property> + <property name="widgetResizable"> + <bool>true</bool> + </property> + <widget class="QWidget" name="scrollAreaWidgetContents"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>1089</width> + <height>404</height> + </rect> </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> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="spacing"> + <number>0</number> + </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> + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> + <string>Rates</string> </property> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>below 75% 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="1" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>75% to 50% avg. depth</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="2" column="0"> - <widget class="QLabel" name="asc50to6"> - <property name="text"> - <string>50% avg. depth to 6m</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="asc6toSurf"> - <property name="text"> - <string>6m to surface</string> - </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> - </layout> - </widget> - </item> - <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> + <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="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>below 75% 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="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>75% to 50% avg. depth</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="2" column="0"> + <widget class="QLabel" name="asc50to6"> + <property name="text"> + <string>50% avg. depth to 6m</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="asc6toSurf"> + <property name="text"> + <string>6m to surface</string> + </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> + </layout> + </widget> + </item> + <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> + <spacer name="verticalSpacer"> + <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="QGroupBox" name="groupBox_5"> + <property name="title"> + <string>Planning</string> </property> - <property name="topMargin"> - <number>2</number> + <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="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> + <item row="2" column="0" colspan="2"> + <widget class="QCheckBox" name="drop_stone_mode"> + <property name="text"> + <string>Drop to first depth</string> + </property> + </widget> + </item> + <item row="3" column="0" colspan="2"> + <widget class="QCheckBox" name="lastStop"> + <property name="text"> + <string>Last stop at 6m</string> + </property> + </widget> + </item> + <item row="4" column="0" colspan="2"> + <widget class="QCheckBox" name="backgasBreaks"> + <property name="text"> + <string>Plan backgas breaks</string> + </property> + </widget> + </item> + <item row="5" column="0"> + <spacer name="verticalSpacer_2"> + <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="QGroupBox" name="groupBox_4"> + <property name="title"> + <string>Gas options</string> </property> - <property name="rightMargin"> - <number>2</number> + <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="0" column="0"> + <widget class="QLabel" name="label_13"> + <property name="text"> + <string>Bottom SAC</string> + </property> + </widget> + </item> + <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="1" column="1"> + <widget class="QSpinBox" name="decoStopSAC"/> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>Bottom pO₂</string> + </property> + </widget> + </item> + <item row="2" 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> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>Deco pO₂</string> + </property> + </widget> + </item> + <item row="3" 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> + </item> + <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="QGroupBox" name="groupBox_6"> + <property name="title"> + <string>Dive notes</string> </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> - <spacer name="verticalSpacer"> - <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="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="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> - <item row="2" column="0" colspan="2"> - <widget class="QCheckBox" name="drop_stone_mode"> - <property name="text"> - <string>Drop to first depth</string> - </property> - </widget> - </item> - <item row="3" column="0" colspan="2"> - <widget class="QCheckBox" name="lastStop"> - <property name="text"> - <string>Last stop at 6m</string> - </property> - </widget> - </item> - <item row="4" column="0" colspan="2"> - <widget class="QCheckBox" name="backgasBreaks"> - <property name="text"> - <string>Plan backgas breaks</string> - </property> - </widget> - </item> - <item row="5" column="0"> - <spacer name="verticalSpacer_2"> - <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="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="0" column="0"> - <widget class="QLabel" name="label_13"> - <property name="text"> - <string>Bottom SAC</string> - </property> - </widget> - </item> - <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="1" column="1"> - <widget class="QSpinBox" name="decoStopSAC"/> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_6"> - <property name="text"> - <string>Bottom pO₂</string> - </property> - </widget> - </item> - <item row="2" 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> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_7"> - <property name="text"> - <string>Deco pO₂</string> - </property> - </widget> - </item> - <item row="3" 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> - </item> - <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="QGroupBox" name="groupBox_6"> - <property name="title"> - <string>Dive notes</string> - </property> - <layout class="QGridLayout" name="gridLayout_6"> - <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="0"> - <widget class="QCheckBox" name="display_runtime"> - <property name="toolTip"> - <string>In dive plan, show runtime (absolute time) of stops</string> - </property> - <property name="text"> - <string>Display runtime</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="display_duration"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="toolTip"> - <string>In dive plan, show duration (relative time) of stops</string> - </property> - <property name="text"> - <string>Display segment duration</string> - </property> - <property name="checked"> - <bool>false</bool> - </property> - </widget> - </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> - </property> - <property name="text"> - <string>Display transitions in deco</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QCheckBox" name="verbatim_plan"> - <property name="text"> - <string>Verbatim diveplan</string> - </property> - </widget> - </item> - <item row="4" column="0"> - <spacer name="verticalSpacer_4"> - <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> + <layout class="QGridLayout" name="gridLayout_6"> + <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="0"> + <widget class="QCheckBox" name="display_runtime"> + <property name="toolTip"> + <string>In dive plan, show runtime (absolute time) of stops</string> + </property> + <property name="text"> + <string>Display runtime</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="display_duration"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="toolTip"> + <string>In dive plan, show duration (relative time) of stops</string> + </property> + <property name="text"> + <string>Display segment duration</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + </widget> + </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> + </property> + <property name="text"> + <string>Display transitions in deco</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QCheckBox" name="verbatim_plan"> + <property name="text"> + <string>Verbatim diveplan</string> + </property> + </widget> + </item> + <item row="4" column="0"> + <spacer name="verticalSpacer_4"> + <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> + </layout> + </widget> </widget> </item> </layout> |