summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Joakim Bygdell <j.bygdell@gmail.com>2014-07-01 09:35:34 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-07-01 07:01:44 -0700
commit2766ed8093947c6993477a98a1bd25fc53b2d14d (patch)
tree840b44bbc3f39785a592dde9bb765b61fd7cc6ac
parent37ee0baf5875f34b53af7c2333388b8998c00ef4 (diff)
downloadsubsurface-2766ed8093947c6993477a98a1bd25fc53b2d14d.tar.gz
fix tab step order in planner settings.
--f46d04426a604016a404fd1cd218 Content-Type: text/plain; charset=UTF-8 Tab step order should follow a logical order, top to bottom, left to right and not jump around. -- //Jocke <div dir="ltr">Tab step order should follow a logical order, top to bottom, left to right and not jump around.<br><br clear="all"><div><br>-- <br><div>//Jocke</div> </div></div> From e8ff7986f858403fb4f5277741c9fa528962f9bc Mon Sep 17 00:00:00 2001 From: Joakim Bygdell <j.bygdell@gmail.com> Date: Tue, 1 Jul 2014 09:28:23 +0200 Subject: [PATCH] Fix tab step order in planner settings. Tab step order should follow a logical order, top to bottom left to right. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--qt-ui/plannerSettings.ui154
1 files changed, 77 insertions, 77 deletions
diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui
index 9cb802848..8bfcb18d3 100644
--- a/qt-ui/plannerSettings.ui
+++ b/qt-ui/plannerSettings.ui
@@ -71,10 +71,10 @@
<property name="horizontalSpacing">
<number>2</number>
</property>
- <item row="1" column="0">
- <widget class="QLabel" name="label_2">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
<property name="text">
- <string>75%-50% avg. depth</string>
+ <string>below 75% avg. depth</string>
</property>
</widget>
</item>
@@ -88,15 +88,15 @@
</property>
</widget>
</item>
- <item row="0" column="0">
- <widget class="QLabel" name="label">
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
<property name="text">
- <string>below 75% avg. depth</string>
+ <string>75%-50% avg. depth</string>
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QSpinBox" name="ascRateStops">
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="ascRate50">
<property name="suffix">
<string>m/min</string>
</property>
@@ -105,15 +105,15 @@
</property>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_4">
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_3">
<property name="text">
- <string>6m/20ft to surface</string>
+ <string>50% avg. depth - 6m/20ft</string>
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="ascRate50">
+ <item row="2" column="1">
+ <widget class="QSpinBox" name="ascRateStops">
<property name="suffix">
<string>m/min</string>
</property>
@@ -122,6 +122,13 @@
</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="3" column="1">
<widget class="QSpinBox" name="ascRateLast6m">
<property name="suffix">
@@ -132,13 +139,6 @@
</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>
@@ -241,13 +241,6 @@
<property name="spacing">
<number>2</number>
</property>
- <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="0" column="0">
<widget class="QLabel" name="label_15">
<property name="text">
@@ -255,10 +248,13 @@
</property>
</widget>
</item>
- <item row="3" column="0" colspan="2">
- <widget class="QCheckBox" name="lastStop">
- <property name="text">
- <string>Last Stop at 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>
@@ -286,13 +282,17 @@
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="gflow">
- <property name="minimum">
- <number>1</number>
+ <item row="3" column="0" colspan="2">
+ <widget class="QCheckBox" name="lastStop">
+ <property name="text">
+ <string>Last Stop at 6m/20ft</string>
</property>
- <property name="maximum">
- <number>150</number>
+ </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>
@@ -333,19 +333,30 @@
<property name="spacing">
<number>2</number>
</property>
- <item row="3" column="1">
- <widget class="QDoubleSpinBox" name="decopo2">
- <property name="suffix">
- <string>bar</string>
- </property>
- <property name="maximum">
- <double>2.000000000000000</double>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_13">
+ <property name="text">
+ <string>bottom SAC</string>
</property>
- <property name="singleStep">
- <double>0.100000000000000</double>
+ </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>
- <property name="value">
- <double>1.600000000000000</double>
+ </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>
@@ -372,30 +383,19 @@
</property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_6">
- <property name="text">
- <string>bottom pO₂</string>
+ <item row="3" column="1">
+ <widget class="QDoubleSpinBox" name="decopo2">
+ <property name="suffix">
+ <string>bar</string>
</property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="decoStopSAC"/>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="label_13">
- <property name="text">
- <string>bottom SAC</string>
+ <property name="maximum">
+ <double>2.000000000000000</double>
</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 name="singleStep">
+ <double>0.100000000000000</double>
+ </property>
+ <property name="value">
+ <double>1.600000000000000</double>
</property>
</widget>
</item>
@@ -436,13 +436,6 @@
<property name="spacing">
<number>2</number>
</property>
- <item row="3" column="0">
- <widget class="QCheckBox" name="verbatim_plan">
- <property name="text">
- <string>verbatim diveplan</string>
- </property>
- </widget>
- </item>
<item row="0" column="0">
<widget class="QCheckBox" name="display_runtime">
<property name="toolTip">
@@ -482,6 +475,13 @@
</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">