THIS COMMIT NEEDS A COMMIT MESSAGE

I've moved the .pro file fixes to where it happened, so the rest of the
changes need explanation now. -Thiago

Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com>
Signed-off-by: Thiago Macieira <thiago@macieira.org>

1 files changed, 106 insertions, 91 deletions

diff --git a/qt-ui/configuredivecomputerdialog.ui b/qt-ui/configuredivecomputerdialog.ui
index 2d8825847..076b66fd1 100644
--- a/qt-ui/configuredivecomputerdialog.ui
+++ b/qt-ui/configuredivecomputerdialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>594</width>
-    <height>509</height>
+    <width>592</width>
+    <height>507</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -98,34 +98,51 @@
        <string>HW OSTC 3</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout">
-       <item row="4" column="1">
+       <item row="5" column="1">
         <widget class="QSpinBox" name="lastDecoSpinBox">
          <property name="suffix">
           <string> m</string>
          </property>
         </widget>
        </item>
-       <item row="8" column="0" colspan="4">
+       <item row="8" column="0">
+        <widget class="QLabel" name="label_14">
+         <property name="text">
+          <string>Dive Mode Colour:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="0" colspan="4">
         <widget class="QCheckBox" name="dateTimeSyncCheckBox">
          <property name="text">
           <string>Sync dive computer time with PC</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="2">
+       <item row="6" column="2">
         <widget class="QLabel" name="label_11">
          <property name="text">
           <string>Units:</string>
          </property>
         </widget>
        </item>
-       <item row="6" column="2">
+       <item row="7" column="2">
         <widget class="QLabel" name="label_13">
          <property name="text">
           <string>Salinity (0-5%):</string>
          </property>
         </widget>
        </item>
+       <item row="7" column="3">
+        <widget class="QSpinBox" name="salinitySpinBox">
+         <property name="suffix">
+          <string>%</string>
+         </property>
+         <property name="maximum">
+          <number>5</number>
+         </property>
+        </widget>
+       </item>
        <item row="2" column="2">
         <widget class="QLabel" name="label_6">
          <property name="text">
@@ -133,10 +150,10 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_5">
+       <item row="6" column="0">
+        <widget class="QLabel" name="label_9">
          <property name="text">
-          <string>Custom Text:</string>
+          <string>Date Format:</string>
          </property>
         </widget>
        </item>
@@ -150,14 +167,14 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="0">
-        <widget class="QLabel" name="label_9">
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_5">
          <property name="text">
-          <string>Date Format:</string>
+          <string>Custom Text:</string>
          </property>
         </widget>
        </item>
-       <item row="7" column="2">
+       <item row="8" column="2">
         <widget class="QLabel" name="label_15">
          <property name="text">
           <string>Compass Gain:</string>
@@ -171,26 +188,13 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="0">
+       <item row="5" column="0">
         <widget class="QLabel" name="label_10">
          <property name="text">
           <string>Last Deco:</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="0" colspan="4">
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item row="0" column="1">
         <widget class="QLineEdit" name="serialNoLineEdit">
          <property name="readOnly">
@@ -198,7 +202,7 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="1">
+       <item row="8" column="1">
         <widget class="QComboBox" name="diveModeColour">
          <item>
           <property name="text">
@@ -222,7 +226,20 @@
          </item>
         </widget>
        </item>
-       <item row="5" column="1">
+       <item row="10" column="0" colspan="4">
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="6" column="1">
         <widget class="QComboBox" name="dateFormatComboBox">
          <item>
           <property name="text">
@@ -241,45 +258,45 @@
          </item>
         </widget>
        </item>
-       <item row="5" column="3">
-        <widget class="QComboBox" name="unitsComboBox">
+       <item row="2" column="3">
+        <widget class="QComboBox" name="languageComboBox">
          <item>
           <property name="text">
-           <string>m/°C</string>
+           <string>English</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>ft/°F</string>
+           <string>German</string>
           </property>
          </item>
-        </widget>
-       </item>
-       <item row="2" column="3">
-        <widget class="QComboBox" name="languageComboBox">
          <item>
           <property name="text">
-           <string>English</string>
+           <string>French</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>German</string>
+           <string>Italian</string>
           </property>
          </item>
+        </widget>
+       </item>
+       <item row="6" column="3">
+        <widget class="QComboBox" name="unitsComboBox">
          <item>
           <property name="text">
-           <string>French</string>
+           <string>m/°C</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>Italian</string>
+           <string>ft/°F</string>
           </property>
          </item>
         </widget>
        </item>
-       <item row="4" column="2">
+       <item row="5" column="2">
         <widget class="QLabel" name="label_4">
          <property name="text">
           <string>Brightness:</string>
@@ -294,20 +311,13 @@
         </widget>
        </item>
        <item row="7" column="0">
-        <widget class="QLabel" name="label_14">
-         <property name="text">
-          <string>Dive Mode Colour:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="0">
         <widget class="QLabel" name="label_12">
          <property name="text">
           <string>Sampling Rate:</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="3">
+       <item row="5" column="3">
         <widget class="QComboBox" name="brightnessComboBox">
          <item>
           <property name="text">
@@ -326,7 +336,7 @@
          </item>
         </widget>
        </item>
-       <item row="6" column="1">
+       <item row="7" column="1">
         <widget class="QComboBox" name="samplingRateComboBox">
          <item>
           <property name="text">
@@ -347,17 +357,38 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="3">
-        <widget class="QSpinBox" name="salinitySpinBox">
-         <property name="suffix">
-          <string>%</string>
-         </property>
-         <property name="maximum">
-          <number>5</number>
+       <item row="3" column="0">
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>Dive Mode:</string>
          </property>
         </widget>
        </item>
-       <item row="7" column="3">
+       <item row="3" column="1">
+        <widget class="QComboBox" name="diveModeComboBox">
+         <item>
+          <property name="text">
+           <string>OC</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>CC</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Gauge</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Apnea</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="8" column="3">
         <widget class="QComboBox" name="compassGainComboBox">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -407,46 +438,29 @@
          </item>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="label">
+       <item row="4" column="0">
+        <widget class="QLabel" name="label_2">
          <property name="text">
-          <string>Dive Mode:</string>
+          <string>Saturation:</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="1">
-        <widget class="QComboBox" name="diveModeComboBox">
-         <item>
-          <property name="text">
-           <string>OC</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>CC</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>Gauge</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>Apnea</string>
-          </property>
-         </item>
+       <item row="4" column="1">
+        <widget class="QSpinBox" name="saturationSpinBox">
+         <property name="suffix">
+          <string>%</string>
+         </property>
         </widget>
        </item>
-       <item row="3" column="2">
-        <widget class="QLabel" name="label_2">
+       <item row="4" column="2">
+        <widget class="QLabel" name="label_16">
          <property name="text">
-          <string>Saturation:</string>
+          <string>Desaturation:</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="3">
-        <widget class="QSpinBox" name="saturationSpinBox">
+       <item row="4" column="3">
+        <widget class="QSpinBox" name="desaturationSpinBox">
          <property name="suffix">
           <string>%</string>
          </property>
@@ -500,7 +514,7 @@
   </layout>
  </widget>
  <tabstops>
-  <tabstop>cancel</tabstop>
+  <tabstop>device</tabstop>
   <tabstop>search</tabstop>
   <tabstop>retrieveDetails</tabstop>
   <tabstop>saveSettingsPushButton</tabstop>
@@ -513,6 +527,7 @@
   <tabstop>languageComboBox</tabstop>
   <tabstop>diveModeComboBox</tabstop>
   <tabstop>saturationSpinBox</tabstop>
+  <tabstop>desaturationSpinBox</tabstop>
   <tabstop>lastDecoSpinBox</tabstop>
   <tabstop>brightnessComboBox</tabstop>
   <tabstop>dateFormatComboBox</tabstop>
@@ -522,7 +537,7 @@
   <tabstop>diveModeColour</tabstop>
   <tabstop>compassGainComboBox</tabstop>
   <tabstop>dateTimeSyncCheckBox</tabstop>
-  <tabstop>device</tabstop>
+  <tabstop>cancel</tabstop>
  </tabstops>
  <resources/>
  <connections/>