Rearrange planner UI elements

This is my first attempt at grouping UI elements of the planner in a
sensible way.

It might still be sensible to combine the two bottom panes into one.

In addition there is a new field "altutude" which is sychronized with the
surface pressure as for planning we often know the altitude of the dive
site rather than the atmospheric pressure.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 29 insertions, 82 deletions

diff --git a/qt-ui/diveplanner.ui b/qt-ui/diveplanner.ui
index 33ec33cbd..fffed0d99 100644
--- a/qt-ui/diveplanner.ui
+++ b/qt-ui/diveplanner.ui
@@ -65,10 +65,10 @@
        <property name="spacing">
         <number>2</number>
        </property>
-       <item row="7" column="0" colspan="2">
-        <widget class="TableView" name="cylinderTableWidget" native="true">
+       <item row="6" column="0" colspan="2">
+        <widget class="TableView" name="tableWidget" native="true">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -81,10 +81,10 @@
          </property>
         </widget>
        </item>
-       <item row="8" column="0" colspan="2">
-        <widget class="TableView" name="tableWidget" native="true">
+       <item row="5" column="0" colspan="2">
+        <widget class="TableView" name="cylinderTableWidget" native="true">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -95,24 +95,9 @@
            <height>50</height>
           </size>
          </property>
+         <zorder>label_2</zorder>
         </widget>
        </item>
-       <item row="3" column="1">
-        <widget class="QSpinBox" name="decoStopSAC"/>
-       </item>
-       <item row="5" column="0">
-        <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="QTimeEdit" name="startTime"/>
-       </item>
        <item row="0" column="0">
         <widget class="QLabel" name="label">
          <property name="text">
@@ -120,82 +105,50 @@
          </property>
         </widget>
        </item>
-       <item row="4" 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="9" column="0" colspan="2">
         <widget class="QDialogButtonBox" name="buttonBox">
          <property name="standardButtons">
           <set>QDialogButtonBox::Abort|QDialogButtonBox::Save</set>
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QSpinBox" name="bottomSAC"/>
-       </item>
-       <item row="5" 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="1">
-        <widget class="QLabel" name="label_4">
-         <property name="text">
-          <string>SAC on DECO Stop</string>
-         </property>
-        </widget>
+       <item row="1" column="0">
+        <widget class="QTimeEdit" name="startTime"/>
        </item>
        <item row="2" column="0">
-        <widget class="QLabel" name="label_3">
+        <widget class="QLabel" name="label_7">
          <property name="text">
-          <string>Bottom SAC</string>
+          <string>Altitide</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="1">
-        <widget class="QLabel" name="label_6">
-         <property name="text">
-          <string>GFHigh</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
+       <item row="2" column="1">
         <widget class="QLabel" name="label_2">
          <property name="text">
           <string>ATM Pressure</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="QLineEdit" name="ATMPressure">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+       <item row="3" column="1">
+        <widget class="QSpinBox" name="ATMPressure">
+         <property name="suffix">
+          <string>bar</string>
          </property>
-        </widget>
-       </item>
-       <item row="6" column="0">
-        <widget class="QCheckBox" name="drop_stone_mode">
-         <property name="text">
-          <string>Drop like a stone mode</string>
+         <property name="maximum">
+          <number>2000</number>
          </property>
         </widget>
        </item>
-       <item row="6" column="1">
-        <widget class="QPushButton" name="printPlan">
-         <property name="text">
-          <string>Print</string>
+       <item row="3" column="0">
+        <widget class="QSpinBox" name="atmHeight">
+         <property name="suffix">
+          <string>m</string>
+         </property>
+         <property name="minimum">
+          <number>-2000</number>
+         </property>
+         <property name="maximum">
+          <number>10000</number>
          </property>
         </widget>
        </item>
@@ -215,12 +168,6 @@
  </customwidgets>
  <tabstops>
   <tabstop>startTime</tabstop>
-  <tabstop>ATMPressure</tabstop>
-  <tabstop>bottomSAC</tabstop>
-  <tabstop>decoStopSAC</tabstop>
-  <tabstop>gflow</tabstop>
-  <tabstop>gfhigh</tabstop>
-  <tabstop>printPlan</tabstop>
   <tabstop>buttonBox</tabstop>
   <tabstop>scrollArea</tabstop>
  </tabstops>