Provide headings for the Settings part of the planner
This patch provides three label headings for three of the four
main sections of the planner. This makes it possible to refer to
particular panels when writing text for the user manual.
Signed-off-by: Willem Ferguson <[email protected]>
I assumed the SHA is implicit in the format-patch, but it is: 5b5a25db7801
There is one issue. I added a a "Drop like a stone mode" check box
to the subpanel of settings that deals with descent rate (subpanel labeled:
Ascent/Descent rates). [see the use of the label? Now I can easily refer
to that subpanel].
This means there are now TWO such checkboxes, one in the diveplanner.ui and
another in the plannerSettings.ui.
We need an opinion from Robert, but my personal feeling is that it is
more useful close to
the setting that deals with rate of descent, and not among the "global"
dive settings
that deal with SAC, gradient factors and the like. If my suggestion is
useful, then
the checkbox needs to be connected to the underlying C++ code and the
other removed.
Kind regards,
willem
>From 74b625eae2401bc094788846396ed365d1e41630 Mon Sep 17 00:00:00 2001
From: Willem Ferguson <[email protected]>
Date: Thu, 26 Jun 2014 12:55:54 +0200
Subject: [PATCH] Provide headings for the Settings part of the planner
This patch provides three label headings for three of the four
main sections of the planner. This makes it possible to refer to
particular panels phen writing text for the user manual.
Signed-off-by: Willem Ferguson <[email protected]>
---
qt-ui/plannerSettings.ui | 98 ++++++++++++++++++++++++++++++++++------------
1 file changed, 72 insertions(+), 26 deletions(-)
diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui
index 57814ea..3f2aa58 100644
--- a/qt-ui/plannerSettings.ui
+++ b/qt-ui/plannerSettings.ui
@@ -191,38 +191,17 @@
</property>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>75%-50% avg. depth</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>50% avg. depth - 6m/20ft</string>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>6m/20ft to surface</string>
- </property>
- </widget>
- </item>
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
- <string>Ascent rates</string>
+ <string><html><head/><body><p><span style=" font-weight:600;">Ascent rates</span></p></body></html></string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
- <string>Descent rate</string>
+ <string><html><head/><body><p><span style=" font-weight:600;">Descent rate</span></p></body></html></string>
</property>
</widget>
</item>
@@ -268,7 +247,14 @@
</property>
</widget>
</item>
- <item row="3" column="1">
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>75%-50% avg. depth</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
<widget class="QSpinBox" name="ascRate50">
<property name="suffix">
<string>m/min</string>
@@ -278,7 +264,21 @@
</property>
</widget>
</item>
- <item row="4" column="1">
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>50% avg. depth - 6m/20ft</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" 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="ascRateStops">
<property name="suffix">
<string>m/min</string>
@@ -288,7 +288,7 @@
</property>
</widget>
</item>
- <item row="5" column="1">
+ <item row="4" column="1">
<widget class="QSpinBox" name="ascRateLast6m">
<property name="suffix">
<string>m/min</string>
@@ -298,11 +298,57 @@
</property>
</widget>
</item>
+ <item row="9" column="0">
+ <widget class="QCheckBox" name="drop_stone_mode">
+ <property name="text">
+ <string>Drop like a stone mode</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
</layout>
</widget>
+ <widget class="QLabel" name="label_10">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>0</y>
+ <width>121</width>
+ <height>17</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string><html><head/><body><p><span style=" font-weight:600;">Display options</span></p></body></html></string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_11">
+ <property name="geometry">
+ <rect>
+ <x>250</x>
+ <y>0</y>
+ <width>181</width>
+ <height>17</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string><html><head/><body><p><span style=" font-weight:600;">Ascent / Descent rates</span></p></body></html></string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_12">
+ <property name="geometry">
+ <rect>
+ <x>700</x>
+ <y>0</y>
+ <width>66</width>
+ <height>17</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string><html><head/><body><p><span style=" font-weight:600;">Deco</span></p></body></html></string>
+ </property>
+ </widget>
</widget>
<tabstops>
<tabstop>verbatim_plan</tabstop>
--
1.7.10.4
_______________________________________________
subsurface mailing list
[email protected]
http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface
