From 650c7d83fdfbe28c15821aaf5ec8aafa9811a5cf Mon Sep 17 00:00:00 2001
From: Joakim Bygdell <j.bygdell@gmail.com>
Date: Tue, 7 Jul 2015 13:10:16 +0200
Subject: [PATCH 2/4] Planner: GUI changes for improved clarity.

Restructure planner GUI for improved clarity of how settings are related.

Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
---
 qt-ui/plannerSettings.ui | 205 ++++++++++++++++++++++++++++-------------------
 1 file changed, 122 insertions(+), 83 deletions(-)

diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui
index 5916b27..0d92280 100644
--- a/qt-ui/plannerSettings.ui
+++ b/qt-ui/plannerSettings.ui
@@ -274,51 +274,73 @@
           <property name="spacing">
            <number>2</number>
           </property>
-          <item row="6" column="1">
-           <widget class="QLabel" name="label_16">
-            <property name="text">
-             <string>GF high</string>
+          <item row="14" column="1">
+           <spacer name="verticalSpacer_6">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
             </property>
-           </widget>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
           </item>
-          <item row="9" column="1" colspan="2">
-           <widget class="QCheckBox" name="backgasBreaks">
+          <item row="1" column="1">
+           <widget class="QCheckBox" name="safetystop">
             <property name="text">
-             <string>Plan backgas breaks</string>
+             <string>Safety stop</string>
+            </property>
+            <property name="tristate">
+             <bool>false</bool>
             </property>
            </widget>
           </item>
-          <item row="6" column="2">
-           <widget class="QSpinBox" name="gfhigh">
+          <item row="2" column="2">
+           <widget class="QSpinBox" name="reserve_gas">
             <property name="suffix">
-             <string>%</string>
+             <string>bar</string>
+            </property>
+            <property name="prefix">
+             <string/>
             </property>
             <property name="minimum">
-             <number>1</number>
+             <number>10</number>
             </property>
             <property name="maximum">
-             <number>150</number>
+             <number>99</number>
+            </property>
+            <property name="value">
+             <number>40</number>
             </property>
            </widget>
           </item>
-          <item row="8" column="1" colspan="2">
-           <widget class="QCheckBox" name="lastStop">
+          <item row="13" column="1">
+           <widget class="QRadioButton" name="vpmb_deco">
             <property name="text">
-             <string>Last stop at 6m</string>
+             <string>VPM-B deco</string>
             </property>
            </widget>
           </item>
-          <item row="12" column="1">
-           <widget class="QComboBox" name="rebreathermode">
-            <property name="currentText">
-             <string/>
+          <item row="18" column="1" colspan="2">
+           <widget class="QCheckBox" name="switch_at_req_stop">
+            <property name="toolTip">
+             <string>Postpone gas change if a stop is not required</string>
             </property>
-            <property name="maxVisibleItems">
-             <number>6</number>
+            <property name="text">
+             <string>Only switch at required stops</string>
+            </property>
+           </widget>
+          </item>
+          <item row="10" column="1">
+           <widget class="QLabel" name="label_15">
+            <property name="text">
+             <string>GF low</string>
             </property>
            </widget>
           </item>
-          <item row="5" column="2">
+          <item row="10" column="2">
            <widget class="QSpinBox" name="gflow">
             <property name="suffix">
              <string>%</string>
@@ -331,14 +353,7 @@
             </property>
            </widget>
           </item>
-          <item row="7" column="1" colspan="2">
-           <widget class="QCheckBox" name="drop_stone_mode">
-            <property name="text">
-             <string>Drop to first depth</string>
-            </property>
-           </widget>
-          </item>
-          <item row="13" column="1">
+          <item row="21" column="1">
            <spacer name="verticalSpacer_2">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
@@ -351,108 +366,132 @@
             </property>
            </spacer>
           </item>
-          <item row="5" column="1">
-           <widget class="QLabel" name="label_15">
+          <item row="15" column="1" colspan="2">
+           <widget class="QCheckBox" name="drop_stone_mode">
             <property name="text">
-             <string>GF low</string>
+             <string>Drop to first depth</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QRadioButton" name="recreational_deco">
-            <property name="text">
-             <string>Recreational mode</string>
+          <item row="20" column="1">
+           <widget class="QComboBox" name="rebreathermode">
+            <property name="currentText">
+             <string/>
+            </property>
+            <property name="maxVisibleItems">
+             <number>6</number>
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
-           <widget class="QRadioButton" name="buehlmann_deco">
+          <item row="16" column="1" colspan="2">
+           <widget class="QCheckBox" name="lastStop">
             <property name="text">
-             <string>Buehlmann deco</string>
+             <string>Last stop at 6m</string>
             </property>
-            <property name="checked">
-             <bool>true</bool>
+           </widget>
+          </item>
+          <item row="11" column="2">
+           <widget class="QSpinBox" name="gfhigh">
+            <property name="suffix">
+             <string>%</string>
+            </property>
+            <property name="minimum">
+             <number>1</number>
+            </property>
+            <property name="maximum">
+             <number>150</number>
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
-           <widget class="QRadioButton" name="vpmb_deco">
+          <item row="17" column="1" colspan="2">
+           <widget class="QCheckBox" name="backgasBreaks">
             <property name="text">
-             <string>VPM-B deco</string>
+             <string>Plan backgas breaks</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="1">
-           <widget class="QCheckBox" name="safetystop">
+          <item row="11" column="1">
+           <widget class="QLabel" name="label_16">
             <property name="text">
-             <string>Safety stop</string>
+             <string>GF high</string>
             </property>
-            <property name="tristate">
-             <bool>false</bool>
+           </widget>
+          </item>
+          <item row="19" column="1">
+           <widget class="QLabel" name="label_4">
+            <property name="text">
+             <string>Min. switch duration</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="1">
-           <widget class="QLabel" name="label_3">
+          <item row="0" column="1">
+           <widget class="QRadioButton" name="recreational_deco">
             <property name="text">
-             <string>Reserve gas</string>
+             <string>Recreational mode</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="2">
-           <widget class="QSpinBox" name="reserve_gas">
+          <item row="19" column="2">
+           <widget class="QSpinBox" name="min_switch_duration">
             <property name="suffix">
-             <string>bar</string>
+             <string>min</string>
             </property>
             <property name="prefix">
              <string/>
             </property>
             <property name="minimum">
-             <number>10</number>
+             <number>0</number>
             </property>
             <property name="maximum">
-             <number>99</number>
+             <number>9</number>
             </property>
             <property name="value">
-             <number>40</number>
+             <number>1</number>
             </property>
            </widget>
           </item>
-          <item row="10" column="1" colspan="2">
-           <widget class="QCheckBox" name="switch_at_req_stop">
-            <property name="toolTip">
-             <string>Postpone gas change if a stop is not required</string>
-            </property>
+          <item row="6" column="1">
+           <widget class="QRadioButton" name="buehlmann_deco">
             <property name="text">
-             <string>Only switch at required stops</string>
+             <string>Buehlmann deco</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
             </property>
            </widget>
           </item>
-          <item row="11" column="1">
-           <widget class="QLabel" name="label_4">
+          <item row="2" column="1">
+           <widget class="QLabel" name="label_3">
             <property name="text">
-             <string>Min. switch duration</string>
+             <string>Reserve gas</string>
             </property>
            </widget>
           </item>
-          <item row="11" column="2">
-           <widget class="QSpinBox" name="min_switch_duration">
-            <property name="suffix">
-             <string>min</string>
-            </property>
-            <property name="prefix">
-             <string/>
+          <item row="12" column="1">
+           <spacer name="verticalSpacer_7">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
             </property>
-            <property name="minimum">
-             <number>0</number>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>20</height>
+             </size>
             </property>
-            <property name="maximum">
-             <number>9</number>
+           </spacer>
+          </item>
+          <item row="5" column="1">
+           <spacer name="verticalSpacer_5">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
             </property>
-            <property name="value">
-             <number>1</number>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>20</height>
+             </size>
             </property>
-           </widget>
+           </spacer>
           </item>
          </layout>
         </widget>
-- 
2.3.2 (Apple Git-55)