Redesign Dive Computer configuration dialog

The dive computer configuration dialog was a bit cluttered. This
change adds a tabbed interface separating the basic settings from
the gas, dilutent and set point settings

Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 686 insertions, 646 deletions

diff --git a/qt-ui/configuredivecomputerdialog.ui b/qt-ui/configuredivecomputerdialog.ui
index 41745a652..3a6c07513 100644
--- a/qt-ui/configuredivecomputerdialog.ui
+++ b/qt-ui/configuredivecomputerdialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>844</width>
-    <height>616</height>
+    <width>842</width>
+    <height>614</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -124,6 +124,12 @@
    </item>
    <item>
     <widget class="QSplitter" name="splitter">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>2</verstretch>
+      </sizepolicy>
+     </property>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
@@ -157,650 +163,684 @@
      </widget>
      <widget class="QStackedWidget" name="dcStackedWidget">
       <widget class="QWidget" name="page_2">
-       <layout class="QGridLayout" name="gridLayout_2">
-        <item row="0" column="0">
-         <widget class="QLabel" name="label_7">
-          <property name="text">
-           <string>Serial No.</string>
-          </property>
-          <property name="buddy">
-           <cstring>serialNoLineEdit</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QLineEdit" name="serialNoLineEdit">
-          <property name="readOnly">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="2">
-         <widget class="QLabel" name="label_8">
-          <property name="text">
-           <string>Firmware Version:</string>
-          </property>
-          <property name="buddy">
-           <cstring>firmwareVersionLineEdit</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="3">
-         <widget class="QLineEdit" name="firmwareVersionLineEdit">
-          <property name="readOnly">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="label_5">
-          <property name="text">
-           <string>Custom Text:</string>
-          </property>
-          <property name="buddy">
-           <cstring>customTextLlineEdit</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="QLineEdit" name="customTextLlineEdit">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-            <horstretch>1</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="2">
-         <widget class="QLabel" name="label_6">
-          <property name="text">
-           <string>Language:</string>
-          </property>
-          <property name="buddy">
-           <cstring>languageComboBox</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="3">
-         <widget class="QComboBox" name="languageComboBox">
-          <item>
-           <property name="text">
-            <string>English</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>German</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>French</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Italian</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="label">
-          <property name="text">
-           <string>Dive Mode:</string>
-          </property>
-          <property name="buddy">
-           <cstring>diveModeComboBox</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="2" 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="2" column="2">
-         <widget class="QLabel" name="label_9">
-          <property name="text">
-           <string>Date Format:</string>
-          </property>
-          <property name="buddy">
-           <cstring>dateFormatComboBox</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="3">
-         <widget class="QComboBox" name="dateFormatComboBox">
-          <item>
-           <property name="text">
-            <string>MMDDYY</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>DDMMYY</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>YYMMDD</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item row="3" column="0">
-         <widget class="QLabel" name="label_2">
-          <property name="text">
-           <string>Saturation:</string>
-          </property>
-          <property name="buddy">
-           <cstring>saturationSpinBox</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="3" 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_16">
-          <property name="text">
-           <string>Desaturation:</string>
-          </property>
-          <property name="buddy">
-           <cstring>desaturationSpinBox</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="3">
-         <widget class="QSpinBox" name="desaturationSpinBox">
-          <property name="suffix">
-           <string>%</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="0">
-         <widget class="QLabel" name="label_10">
-          <property name="text">
-           <string>Last Deco:</string>
-          </property>
-          <property name="buddy">
-           <cstring>lastDecoSpinBox</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="1">
-         <widget class="QSpinBox" name="lastDecoSpinBox">
-          <property name="suffix">
-           <string> m</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="2">
-         <widget class="QLabel" name="label_4">
-          <property name="text">
-           <string>Brightness:</string>
-          </property>
-          <property name="buddy">
-           <cstring>brightnessComboBox</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="3">
-         <widget class="QComboBox" name="brightnessComboBox">
-          <item>
-           <property name="text">
-            <string>Eco</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Medium</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>High</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item row="5" column="0">
-         <widget class="QLabel" name="label_12">
-          <property name="text">
-           <string>Sampling Rate:</string>
-          </property>
-          <property name="buddy">
-           <cstring>samplingRateComboBox</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="1">
-         <widget class="QComboBox" name="samplingRateComboBox">
-          <item>
-           <property name="text">
-            <string>2s</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>10s</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item row="5" column="2">
-         <widget class="QLabel" name="label_11">
-          <property name="text">
-           <string>Units:</string>
-          </property>
-          <property name="buddy">
-           <cstring>unitsComboBox</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="3">
-         <widget class="QComboBox" name="unitsComboBox">
-          <item>
-           <property name="text">
-            <string>m/°C</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>ft/°F</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item row="6" column="0">
-         <widget class="QLabel" name="label_14">
-          <property name="text">
-           <string>Dive Mode Colour:</string>
-          </property>
-          <property name="buddy">
-           <cstring>diveModeColour</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="6" column="1">
-         <widget class="QComboBox" name="diveModeColour">
-          <item>
-           <property name="text">
-            <string>Standard</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Red</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Green</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Blue</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item row="6" column="2">
-         <widget class="QLabel" name="label_13">
-          <property name="text">
-           <string>Salinity (0-5%):</string>
-          </property>
-          <property name="buddy">
-           <cstring>salinitySpinBox</cstring>
-          </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>
-          </property>
-         </widget>
-        </item>
-        <item row="7" column="0" colspan="2">
-         <widget class="QCheckBox" name="dateTimeSyncCheckBox">
-          <property name="text">
-           <string>Sync dive computer time with PC</string>
-          </property>
-         </widget>
-        </item>
-        <item row="7" column="2">
-         <widget class="QLabel" name="label_15">
-          <property name="text">
-           <string>Compass Gain:</string>
-          </property>
-          <property name="buddy">
-           <cstring>compassGainComboBox</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="7" column="3">
-         <widget class="QComboBox" name="compassGainComboBox">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-            <horstretch>1</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <item>
-           <property name="text">
-            <string>230LSB/Gauss</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>330LSB/Gauss</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>390LSB/Gauss</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>440LSB/Gauss</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>660LSB/Gauss</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>820LSB/Gauss</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>1090LSB/Gauss</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>1370LSB/Gauss</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item row="8" column="0" colspan="2">
-         <widget class="QTableWidget" name="ostc3GasTable">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-            <horstretch>0</horstretch>
-            <verstretch>1</verstretch>
-           </sizepolicy>
-          </property>
-          <row>
-           <property name="text">
-            <string/>
-           </property>
-          </row>
-          <row>
-           <property name="text">
-            <string/>
-           </property>
-          </row>
-          <row>
-           <property name="text">
-            <string/>
-           </property>
-          </row>
-          <row>
-           <property name="text">
-            <string/>
-           </property>
-          </row>
-          <row>
-           <property name="text">
-            <string/>
-           </property>
-          </row>
-          <column>
-           <property name="text">
-            <string/>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>%O2</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>%He</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>Type</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>Change Depth</string>
-           </property>
-          </column>
-          <item row="0" column="0">
-           <property name="text">
-            <string>Gas 1</string>
-           </property>
-          </item>
-          <item row="1" column="0">
-           <property name="text">
-            <string>Gas 2</string>
-           </property>
-          </item>
-          <item row="2" column="0">
-           <property name="text">
-            <string>Gas 3</string>
-           </property>
-          </item>
-          <item row="3" column="0">
-           <property name="text">
-            <string>Gas 4</string>
-           </property>
-          </item>
-          <item row="4" column="0">
-           <property name="text">
-            <string>Gas 5</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item row="8" column="2" colspan="2">
-         <widget class="QTableWidget" name="ostc3DilTable">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-            <horstretch>0</horstretch>
-            <verstretch>2</verstretch>
-           </sizepolicy>
-          </property>
-          <row>
-           <property name="text">
-            <string/>
-           </property>
-          </row>
-          <row>
-           <property name="text">
-            <string/>
-           </property>
-          </row>
-          <row>
-           <property name="text">
-            <string/>
-           </property>
-          </row>
-          <row>
-           <property name="text">
-            <string/>
-           </property>
-          </row>
-          <row>
-           <property name="text">
-            <string/>
-           </property>
-          </row>
-          <column>
-           <property name="text">
-            <string/>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>%He</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>%O2</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>Type</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>Change Depth</string>
-           </property>
-          </column>
-          <item row="0" column="0">
-           <property name="text">
-            <string>Dil 1</string>
-           </property>
-          </item>
-          <item row="1" column="0">
-           <property name="text">
-            <string>Dil 2</string>
-           </property>
-          </item>
-          <item row="2" column="0">
-           <property name="text">
-            <string>Dil 3</string>
-           </property>
-          </item>
-          <item row="3" column="0">
-           <property name="text">
-            <string>Dil 4</string>
-           </property>
-          </item>
-          <item row="4" column="0">
-           <property name="text">
-            <string>Dil 5</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item row="9" column="0" colspan="2">
-         <widget class="QTableWidget" name="ostc3SetPointTable">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-            <horstretch>0</horstretch>
-            <verstretch>1</verstretch>
-           </sizepolicy>
-          </property>
-          <row>
-           <property name="text">
-            <string/>
-           </property>
-          </row>
-          <row>
-           <property name="text">
-            <string/>
-           </property>
-          </row>
-          <row>
-           <property name="text">
-            <string/>
-           </property>
-          </row>
-          <row>
-           <property name="text">
-            <string/>
-           </property>
-          </row>
-          <row>
-           <property name="text">
-            <string/>
-           </property>
-          </row>
-          <column>
-           <property name="text">
-            <string/>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>Set Point [cbar]</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>Change Depth [m]</string>
-           </property>
-          </column>
-          <item row="0" column="0">
-           <property name="text">
-            <string>SP 1</string>
-           </property>
-          </item>
-          <item row="1" column="0">
-           <property name="text">
-            <string>SP 2</string>
-           </property>
-          </item>
-          <item row="2" column="0">
-           <property name="text">
-            <string>SP 3</string>
-           </property>
-          </item>
-          <item row="3" column="0">
-           <property name="text">
-            <string>SP 4</string>
-           </property>
-          </item>
-          <item row="4" column="0">
-           <property name="text">
-            <string>SP 5</string>
-           </property>
-          </item>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <widget class="QTabWidget" name="tabWidget">
+          <property name="currentIndex">
+           <number>0</number>
+          </property>
+          <widget class="QWidget" name="tab">
+           <attribute name="title">
+            <string>Basic Settings</string>
+           </attribute>
+           <layout class="QGridLayout" name="gridLayout">
+            <item row="0" column="0">
+             <widget class="QLabel" name="label_7">
+              <property name="text">
+               <string>Serial No.</string>
+              </property>
+              <property name="buddy">
+               <cstring>serialNoLineEdit</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1" colspan="2">
+             <widget class="QLineEdit" name="serialNoLineEdit">
+              <property name="readOnly">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="3">
+             <widget class="QLabel" name="label_8">
+              <property name="text">
+               <string>Firmware Version:</string>
+              </property>
+              <property name="buddy">
+               <cstring>firmwareVersionLineEdit</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="4">
+             <widget class="QLineEdit" name="firmwareVersionLineEdit">
+              <property name="readOnly">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="label_5">
+              <property name="text">
+               <string>Custom Text:</string>
+              </property>
+              <property name="buddy">
+               <cstring>customTextLlineEdit</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1" colspan="2">
+             <widget class="QLineEdit" name="customTextLlineEdit">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                <horstretch>1</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="3">
+             <widget class="QLabel" name="label_6">
+              <property name="text">
+               <string>Language:</string>
+              </property>
+              <property name="buddy">
+               <cstring>languageComboBox</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="4">
+             <widget class="QComboBox" name="languageComboBox">
+              <item>
+               <property name="text">
+                <string>English</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>German</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>French</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Italian</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item row="2" column="0">
+             <widget class="QLabel" name="label">
+              <property name="text">
+               <string>Dive Mode:</string>
+              </property>
+              <property name="buddy">
+               <cstring>diveModeComboBox</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="2" 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="2" column="3">
+             <widget class="QLabel" name="label_9">
+              <property name="text">
+               <string>Date Format:</string>
+              </property>
+              <property name="buddy">
+               <cstring>dateFormatComboBox</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="4">
+             <widget class="QComboBox" name="dateFormatComboBox">
+              <item>
+               <property name="text">
+                <string>MMDDYY</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>DDMMYY</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>YYMMDD</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item row="3" column="0">
+             <widget class="QLabel" name="label_2">
+              <property name="text">
+               <string>Saturation:</string>
+              </property>
+              <property name="buddy">
+               <cstring>saturationSpinBox</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="1">
+             <widget class="QSpinBox" name="saturationSpinBox">
+              <property name="suffix">
+               <string>%</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="3">
+             <widget class="QLabel" name="label_16">
+              <property name="text">
+               <string>Desaturation:</string>
+              </property>
+              <property name="buddy">
+               <cstring>desaturationSpinBox</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="4">
+             <widget class="QSpinBox" name="desaturationSpinBox">
+              <property name="suffix">
+               <string>%</string>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="0">
+             <widget class="QLabel" name="label_10">
+              <property name="text">
+               <string>Last Deco:</string>
+              </property>
+              <property name="buddy">
+               <cstring>lastDecoSpinBox</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="1">
+             <widget class="QSpinBox" name="lastDecoSpinBox">
+              <property name="suffix">
+               <string> m</string>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="3">
+             <widget class="QLabel" name="label_4">
+              <property name="text">
+               <string>Brightness:</string>
+              </property>
+              <property name="buddy">
+               <cstring>brightnessComboBox</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="4">
+             <widget class="QComboBox" name="brightnessComboBox">
+              <item>
+               <property name="text">
+                <string>Eco</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Medium</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>High</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item row="5" column="0">
+             <widget class="QLabel" name="label_12">
+              <property name="text">
+               <string>Sampling Rate:</string>
+              </property>
+              <property name="buddy">
+               <cstring>samplingRateComboBox</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="1">
+             <widget class="QComboBox" name="samplingRateComboBox">
+              <item>
+               <property name="text">
+                <string>2s</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>10s</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item row="5" column="3">
+             <widget class="QLabel" name="label_11">
+              <property name="text">
+               <string>Units:</string>
+              </property>
+              <property name="buddy">
+               <cstring>unitsComboBox</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="4">
+             <widget class="QComboBox" name="unitsComboBox">
+              <item>
+               <property name="text">
+                <string>m/°C</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>ft/°F</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item row="6" column="0">
+             <widget class="QLabel" name="label_14">
+              <property name="text">
+               <string>Dive Mode Colour:</string>
+              </property>
+              <property name="buddy">
+               <cstring>diveModeColour</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="6" column="1">
+             <widget class="QComboBox" name="diveModeColour">
+              <item>
+               <property name="text">
+                <string>Standard</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Red</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Green</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Blue</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item row="6" column="3">
+             <widget class="QLabel" name="label_13">
+              <property name="text">
+               <string>Salinity (0-5%):</string>
+              </property>
+              <property name="buddy">
+               <cstring>salinitySpinBox</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="6" column="4">
+             <widget class="QSpinBox" name="salinitySpinBox">
+              <property name="suffix">
+               <string>%</string>
+              </property>
+              <property name="maximum">
+               <number>5</number>
+              </property>
+             </widget>
+            </item>
+            <item row="7" column="0" colspan="3">
+             <widget class="QCheckBox" name="dateTimeSyncCheckBox">
+              <property name="text">
+               <string>Sync dive computer time with PC</string>
+              </property>
+             </widget>
+            </item>
+            <item row="7" column="3">
+             <widget class="QLabel" name="label_15">
+              <property name="text">
+               <string>Compass Gain:</string>
+              </property>
+              <property name="buddy">
+               <cstring>compassGainComboBox</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="7" column="4">
+             <widget class="QComboBox" name="compassGainComboBox">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>1</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <item>
+               <property name="text">
+                <string>230LSB/Gauss</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>330LSB/Gauss</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>390LSB/Gauss</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>440LSB/Gauss</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>660LSB/Gauss</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>820LSB/Gauss</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>1090LSB/Gauss</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>1370LSB/Gauss</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item row="8" column="2">
+             <spacer name="verticalSpacer">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>177</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </widget>
+          <widget class="QWidget" name="tab_2">
+           <attribute name="title">
+            <string>Gas Settings</string>
+           </attribute>
+           <layout class="QGridLayout" name="gridLayout_2">
+            <item row="0" column="0">
+             <widget class="QTableWidget" name="ostc3GasTable">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <row>
+               <property name="text">
+                <string/>
+               </property>
+              </row>
+              <row>
+               <property name="text">
+                <string/>
+               </property>
+              </row>
+              <row>
+               <property name="text">
+                <string/>
+               </property>
+              </row>
+              <row>
+               <property name="text">
+                <string/>
+               </property>
+              </row>
+              <row>
+               <property name="text">
+                <string/>
+               </property>
+              </row>
+              <column>
+               <property name="text">
+                <string/>
+               </property>
+              </column>
+              <column>
+               <property name="text">
+                <string>%O2</string>
+               </property>
+              </column>
+              <column>
+               <property name="text">
+                <string>%He</string>
+               </property>
+              </column>
+              <column>
+               <property name="text">
+                <string>Type</string>
+               </property>
+              </column>
+              <column>
+               <property name="text">
+                <string>Change Depth</string>
+               </property>
+              </column>
+              <item row="0" column="0">
+               <property name="text">
+                <string>Gas 1</string>
+               </property>
+              </item>
+              <item row="1" column="0">
+               <property name="text">
+                <string>Gas 2</string>
+               </property>
+              </item>
+              <item row="2" column="0">
+               <property name="text">
+                <string>Gas 3</string>
+               </property>
+              </item>
+              <item row="3" column="0">
+               <property name="text">
+                <string>Gas 4</string>
+               </property>
+              </item>
+              <item row="4" column="0">
+               <property name="text">
+                <string>Gas 5</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QTableWidget" name="ostc3DilTable">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <row>
+               <property name="text">
+                <string/>
+               </property>
+              </row>
+              <row>
+               <property name="text">
+                <string/>
+               </property>
+              </row>
+              <row>
+               <property name="text">
+                <string/>
+               </property>
+              </row>
+              <row>
+               <property name="text">
+                <string/>
+               </property>
+              </row>
+              <row>
+               <property name="text">
+                <string/>
+               </property>
+              </row>
+              <column>
+               <property name="text">
+                <string/>
+               </property>
+              </column>
+              <column>
+               <property name="text">
+                <string>%He</string>
+               </property>
+              </column>
+              <column>
+               <property name="text">
+                <string>%O2</string>
+               </property>
+              </column>
+              <column>
+               <property name="text">
+                <string>Type</string>
+               </property>
+              </column>
+              <column>
+               <property name="text">
+                <string>Change Depth</string>
+               </property>
+              </column>
+              <item row="0" column="0">
+               <property name="text">
+                <string>Dil 1</string>
+               </property>
+              </item>
+              <item row="1" column="0">
+               <property name="text">
+                <string>Dil 2</string>
+               </property>
+              </item>
+              <item row="2" column="0">
+               <property name="text">
+                <string>Dil 3</string>
+               </property>
+              </item>
+              <item row="3" column="0">
+               <property name="text">
+                <string>Dil 4</string>
+               </property>
+              </item>
+              <item row="4" column="0">
+               <property name="text">
+                <string>Dil 5</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QTableWidget" name="ostc3SetPointTable">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <row>
+               <property name="text">
+                <string/>
+               </property>
+              </row>
+              <row>
+               <property name="text">
+                <string/>
+               </property>
+              </row>
+              <row>
+               <property name="text">
+                <string/>
+               </property>
+              </row>
+              <row>
+               <property name="text">
+                <string/>
+               </property>
+              </row>
+              <row>
+               <property name="text">
+                <string/>
+               </property>
+              </row>
+              <column>
+               <property name="text">
+                <string/>
+               </property>
+              </column>
+              <column>
+               <property name="text">
+                <string>Set Point [cbar]</string>
+               </property>
+              </column>
+              <column>
+               <property name="text">
+                <string>Change Depth [m]</string>
+               </property>
+              </column>
+              <item row="0" column="0">
+               <property name="text">
+                <string>SP 1</string>
+               </property>
+              </item>
+              <item row="1" column="0">
+               <property name="text">
+                <string>SP 2</string>
+               </property>
+              </item>
+              <item row="2" column="0">
+               <property name="text">
+                <string>SP 3</string>
+               </property>
+              </item>
+              <item row="3" column="0">
+               <property name="text">
+                <string>SP 4</string>
+               </property>
+              </item>
+              <item row="4" column="0">
+               <property name="text">
+                <string>SP 5</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+           </layout>
+          </widget>
          </widget>
         </item>
        </layout>