From e2a6b96db8f7c73ad6fca71dc3d943deeda198da Mon Sep 17 00:00:00 2001
From: Willem Ferguson <willemferguson@zoology.up.ac.za>
Date: Mon, 26 Feb 2018 18:30:08 +0200
Subject: Move icd preference setting

Move the icd preference setting to the preference group that deals
with gas pressures.

I also reorganised the existing items so that the items within the
pressure widget are logically arranged according to the grid layout.
The order of items was very haphazard. No change of code at all in
this reorganisation.

Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
---
 desktop-widgets/preferences/preferences_graph.ui | 128 +++++++++++------------
 1 file changed, 64 insertions(+), 64 deletions(-)

diff --git a/desktop-widgets/preferences/preferences_graph.ui b/desktop-widgets/preferences/preferences_graph.ui
index 72d1010b3..e711ea1c7 100644
--- a/desktop-widgets/preferences/preferences_graph.ui
+++ b/desktop-widgets/preferences/preferences_graph.ui
@@ -30,13 +30,16 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_17">
+      <item row="0" column="1">
+       <widget class="QDoubleSpinBox" name="po2ThresholdMin">
         <property name="enabled">
          <bool>true</bool>
         </property>
-        <property name="text">
-         <string>Threshold for pHe (maximum only)</string>
+        <property name="suffix">
+         <string>bar</string>
+        </property>
+        <property name="singleStep">
+         <double>0.010000000000000</double>
         </property>
        </widget>
       </item>
@@ -53,18 +56,18 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_18">
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_13">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="text">
-         <string>pO₂ in calculating MOD (maximum only )</string>
+         <string>Threshold for pN₂ (maximum only)</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QDoubleSpinBox" name="po2ThresholdMin">
+      <item row="1" column="2">
+       <widget class="QDoubleSpinBox" name="pn2Threshold">
         <property name="enabled">
          <bool>true</bool>
         </property>
@@ -72,66 +75,45 @@
          <string>bar</string>
         </property>
         <property name="singleStep">
-         <double>0.010000000000000</double>
+         <double>0.100000000000000</double>
         </property>
        </widget>
       </item>
-      <item row="6" column="1" colspan="2">
-       <widget class="QCheckBox" name="show_ccr_sensors">
-        <property name="text">
-         <string>Show individual O₂ sensor values when viewing pO₂</string>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_17">
+        <property name="enabled">
+         <bool>true</bool>
         </property>
-       </widget>
-      </item>
-      <item row="5" column="1" colspan="2">
-       <widget class="QCheckBox" name="show_ccr_setpoint">
         <property name="text">
-         <string>Show setpoints when viewing pO₂</string>
+         <string>Threshold for pHe (maximum only)</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="1">
-       <widget class="QLabel" name="label_27">
-        <property name="text">
-         <string>Dive planner default setpoint</string>
+      <item row="2" column="2">
+       <widget class="QDoubleSpinBox" name="pheThreshold">
+        <property name="enabled">
+         <bool>true</bool>
         </property>
-       </widget>
-      </item>
-      <item row="4" column="2">
-       <widget class="QDoubleSpinBox" name="defaultSetpoint">
         <property name="suffix">
          <string>bar</string>
         </property>
-        <property name="decimals">
-         <number>2</number>
-        </property>
-        <property name="maximum">
-         <double>10.000000000000000</double>
-        </property>
         <property name="singleStep">
          <double>0.100000000000000</double>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_13">
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_18">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="text">
-         <string>Threshold for pN₂ (maximum only)</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="label_26">
-        <property name="text">
-         <string>CCR options:</string>
+         <string>pO₂ in calculating MOD (maximum only )</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="2">
-       <widget class="QDoubleSpinBox" name="pn2Threshold">
+      <item row="3" column="2">
+       <widget class="QDoubleSpinBox" name="maxpo2">
         <property name="enabled">
          <bool>true</bool>
         </property>
@@ -143,29 +125,54 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="2">
-       <widget class="QDoubleSpinBox" name="pheThreshold">
-        <property name="enabled">
-         <bool>true</bool>
+      <item row="4" column="0">
+       <widget class="QLabel" name="label_26">
+        <property name="text">
+         <string>CCR options:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QLabel" name="label_27">
+        <property name="text">
+         <string>Dive planner default setpoint</string>
         </property>
+       </widget>
+      </item>
+      <item row="4" column="2">
+       <widget class="QDoubleSpinBox" name="defaultSetpoint">
         <property name="suffix">
          <string>bar</string>
         </property>
+        <property name="decimals">
+         <number>2</number>
+        </property>
+        <property name="maximum">
+         <double>10.000000000000000</double>
+        </property>
         <property name="singleStep">
          <double>0.100000000000000</double>
         </property>
        </widget>
       </item>
-      <item row="3" column="2">
-       <widget class="QDoubleSpinBox" name="maxpo2">
-        <property name="enabled">
-         <bool>true</bool>
+      <item row="5" column="1" colspan="2">
+       <widget class="QCheckBox" name="show_ccr_sensors">
+        <property name="text">
+         <string>Show individual O₂ sensor values when viewing pO₂</string>
         </property>
-        <property name="suffix">
-         <string>bar</string>
+       </widget>
+      </item>
+      <item row="6" column="1" colspan="2">
+       <widget class="QCheckBox" name="show_ccr_setpoint">
+        <property name="text">
+         <string>Show setpoints when viewing pO₂</string>
         </property>
-        <property name="singleStep">
-         <double>0.100000000000000</double>
+       </widget>
+      </item>
+      <item row="7" column="0">
+       <widget class="QCheckBox" name="show_icd">
+        <property name="text">
+         <string>Show warnings for isobaric counterdiffusion</string>
         </property>
        </widget>
       </item>
@@ -354,13 +361,6 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QCheckBox" name="show_icd">
-        <property name="text">
-         <string>Warn for isobaric counter diffusion</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
-- 
cgit v1.2.3-70-g09d2