Changes to planner ui
This patch adds four heading lables to the planner UI in order to
facilitate the
documentation for the planner. The print button was moved in order
to provide
space for a Settings heading lable at the top.
This arrangement is likely to be temporary and will be changed when the
planner is in a more finalised state. The only objective with this
patch
is to provide information that will make an easy description
possible in
the user manual for V4.2
Signed-off-by: Willem Ferguson <willemfergu...@zoology.up.ac.za>
>From 5344d27b873eb590d5b9f107bc20ebefb420a162 Mon Sep 17 00:00:00 2001
From: Willem Ferguson <willemfergu...@zoology.up.ac.za>
Date: Wed, 25 Jun 2014 12:43:59 +0200
Subject: [PATCH] Changes to planner ui
This patch adds four heading labels to the planner UI in order to facilitate the
documentation for the planner. The print button was moved in order to provide
space for a Settings heading at the top.
This arrangement is likely to be temporary and will be rearranged when the
planner is in a more finalised state. The only objective with this patch
is to provide information that will make an easy decription possible for
the user manual.
Signed-off-by: Willem Ferguson <willemfergu...@zoology.up.ac.za>
---
qt-ui/diveplanner.ui | 69 ++++++++++++++++---------------------
qt-ui/plannerSettings.ui | 85 +++++++++++++++++++++++++++-------------------
2 files changed, 80 insertions(+), 74 deletions(-)
diff --git a/qt-ui/diveplanner.ui b/qt-ui/diveplanner.ui
index 1aa4376..a0d9ae3 100644
--- a/qt-ui/diveplanner.ui
+++ b/qt-ui/diveplanner.ui
@@ -14,16 +14,7 @@
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
+ <property name="margin">
<number>0</number>
</property>
<property name="spacing">
@@ -50,16 +41,7 @@
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2">
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
+ <property name="margin">
<number>0</number>
</property>
<property name="spacing">
@@ -97,10 +79,17 @@
</property>
</widget>
</item>
- <item row="3" column="1">
+ <item row="0" column="0">
+ <widget class="QLabel" name="setuplabel">
+ <property name="text">
+ <string><html><head/><body><p><span style=" font-weight:600;">Setup</span></p></body></html></string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
<widget class="QSpinBox" name="decoStopSAC"/>
</item>
- <item row="5" column="0">
+ <item row="6" column="0">
<widget class="QSpinBox" name="gflow">
<property name="minimum">
<number>1</number>
@@ -110,34 +99,41 @@
</property>
</widget>
</item>
- <item row="1" column="0">
+ <item row="2" column="0">
<widget class="QTimeEdit" name="startTime"/>
</item>
- <item row="0" column="0">
+ <item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Start Time</string>
</property>
</widget>
</item>
- <item row="4" column="0">
+ <item row="5" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>GFLow</string>
</property>
</widget>
</item>
- <item row="11" column="0" colspan="2">
+ <item row="11" column="0">
+ <widget class="QPushButton" name="printPlan">
+ <property name="text">
+ <string>Print</string>
+ </property>
+ </widget>
+ </item>
+ <item row="11" column="1">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Abort|QDialogButtonBox::Save</set>
</property>
</widget>
</item>
- <item row="3" column="0">
+ <item row="4" column="0">
<widget class="QSpinBox" name="bottomSAC"/>
</item>
- <item row="5" column="1">
+ <item row="6" column="1">
<widget class="QSpinBox" name="gfhigh">
<property name="minimum">
<number>1</number>
@@ -147,35 +143,35 @@
</property>
</widget>
</item>
- <item row="2" column="1">
+ <item row="3" column="1">
<widget class="QLabel" name="label_4">
<property name="text">
<string>SAC on DECO Stop</string>
</property>
</widget>
</item>
- <item row="2" column="0">
+ <item row="3" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Bottom SAC</string>
</property>
</widget>
</item>
- <item row="4" column="1">
+ <item row="5" column="1">
<widget class="QLabel" name="label_6">
<property name="text">
<string>GFHigh</string>
</property>
</widget>
</item>
- <item row="0" column="1">
+ <item row="1" column="1">
<widget class="QLabel" name="label_2">
<property name="text">
<string>ATM Pressure</string>
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="2" column="1">
<widget class="QLineEdit" name="ATMPressure">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -185,13 +181,6 @@
</property>
</widget>
</item>
- <item row="6" column="1">
- <widget class="QPushButton" name="printPlan">
- <property name="text">
- <string>Print</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
</widget>
diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui
index 547bd81..0deef95 100644
--- a/qt-ui/plannerSettings.ui
+++ b/qt-ui/plannerSettings.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>963</width>
- <height>324</height>
+ <height>290</height>
</rect>
</property>
<property name="windowTitle">
@@ -19,7 +19,7 @@
<x>20</x>
<y>20</y>
<width>872</width>
- <height>203</height>
+ <height>247</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2">
@@ -102,23 +102,44 @@
</layout>
</widget>
</item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_5b">
+ <property name="text">
+ <string><html><head/><body><p><span style=" font-weight:600;">Display Options</span></p></body></html></string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLabel" name="label_5c">
+ <property name="text">
+ <string><html><head/><body><p><span style=" font-weight:600;">Ascent Rates</span></p></body></html></string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QLabel" name="label_5d">
+ <property name="text">
+ <string><html><head/><body><p><span style=" font-weight:600;">Dive Options</span></p></body></html></string>
+ </property>
+ </widget>
+ </item>
<item row="1" column="0">
- <widget class="QFrame" name="frame">
+ <widget class="QFrame" name="frame_2a">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
+ <layout class="QFormLayout" name="formLayout1">
+ <item row="1" column="0">
<widget class="QCheckBox" name="verbatim_plan">
<property name="text">
<string>verbatim diveplan</string>
</property>
</widget>
</item>
- <item>
+ <item row="2" column="0">
<widget class="QCheckBox" name="display_runtime">
<property name="toolTip">
<string>In dive plan, show runtime (absolute time) of stops</string>
@@ -131,7 +152,7 @@
</property>
</widget>
</item>
- <item>
+ <item row="3" column="0">
<widget class="QCheckBox" name="display_duration">
<property name="enabled">
<bool>true</bool>
@@ -147,7 +168,7 @@
</property>
</widget>
</item>
- <item>
+ <item row="4" column="0">
<widget class="QCheckBox" name="display_transitions">
<property name="toolTip">
<string>In diveplan, list transitions or treat them as implicit</string>
@@ -169,14 +190,17 @@
<enum>QFrame::Raised</enum>
</property>
<layout class="QFormLayout" name="formLayout">
- <item row="1" column="0">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+ </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="1" column="1">
+ <item row="0" column="1">
<widget class="QPlainTextEdit" name="ascRate75">
<property name="maximumSize">
<size>
@@ -186,29 +210,32 @@
</property>
</widget>
</item>
- <item row="2" column="0">
+ <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="3" column="0">
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>50% avg. depth - 6m/20ft</string>
+ <item row="1" column="1">
+ <widget class="QPlainTextEdit" name="ascRate50">
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>20</height>
+ </size>
</property>
</widget>
</item>
- <item row="4" 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="2" column="1">
- <widget class="QPlainTextEdit" name="ascRate50">
+ <widget class="QPlainTextEdit" name="ascRateStops">
<property name="maximumSize">
<size>
<width>16777215</width>
@@ -217,17 +244,14 @@
</property>
</widget>
</item>
- <item row="3" column="1">
- <widget class="QPlainTextEdit" name="ascRateStops">
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>20</height>
- </size>
+ <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="4" column="1">
+ <item row="3" column="1">
<widget class="QPlainTextEdit" name="ascRateLast6m">
<property name="maximumSize">
<size>
@@ -237,13 +261,6 @@
</property>
</widget>
</item>
- <item row="0" column="0">
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>Ascent rates</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
--
1.7.10.4
_______________________________________________
subsurface mailing list
subsurface@hohndel.org
http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface
