mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

THIS COMMIT NEEDS A COMMIT MESSAGE

Browse source 
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>
This commit is contained in:
Joseph W. Joshua 2014-06-16 21:28:27 +03:00 • committed by Thiago Macieira
parent 5292bcbf21
commit d76881cb01
1 changed files with 111 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

207
qt-ui/configuredivecomputerdialog.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>594</width> <width>592</width>
<height>509</height> <height>507</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -98,34 +98,51 @@
<string>HW OSTC 3</string> <string>HW OSTC 3</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="4" column="1"> <item row="5" column="1">
<widget class="QSpinBox" name="lastDecoSpinBox"> <widget class="QSpinBox" name="lastDecoSpinBox">
<property name="suffix"> <property name="suffix">
<string> m</string> <string> m</string>
</property> </property>
</widget> </widget>
</item> </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"> <widget class="QCheckBox" name="dateTimeSyncCheckBox">
<property name="text"> <property name="text">
<string>Sync dive computer time with PC</string> <string>Sync dive computer time with PC</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="2"> <item row="6" column="2">
<widget class="QLabel" name="label_11"> <widget class="QLabel" name="label_11">
<property name="text"> <property name="text">
<string>Units:</string> <string>Units:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="2"> <item row="7" column="2">
<widget class="QLabel" name="label_13"> <widget class="QLabel" name="label_13">
<property name="text"> <property name="text">
<string>Salinity (0-5%):</string> <string>Salinity (0-5%):</string>
</property> </property>
</widget> </widget>
</item> </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"> <item row="2" column="2">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
@ -133,10 +150,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="6" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_9">
<property name="text"> <property name="text">
<string>Custom Text:</string> <string>Date Format:</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -150,14 +167,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_9"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>Date Format:</string> <string>Custom Text:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="2"> <item row="8" column="2">
<widget class="QLabel" name="label_15"> <widget class="QLabel" name="label_15">
<property name="text"> <property name="text">
<string>Compass Gain:</string> <string>Compass Gain:</string>
@ -171,26 +188,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="5" column="0">
<widget class="QLabel" name="label_10"> <widget class="QLabel" name="label_10">
<property name="text"> <property name="text">
<string>Last Deco:</string> <string>Last Deco:</string>
</property> </property>
</widget> </widget>
</item> </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"> <item row="0" column="1">
<widget class="QLineEdit" name="serialNoLineEdit"> <widget class="QLineEdit" name="serialNoLineEdit">
<property name="readOnly"> <property name="readOnly">
@ -198,7 +202,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="1"> <item row="8" column="1">
<widget class="QComboBox" name="diveModeColour"> <widget class="QComboBox" name="diveModeColour">
<item> <item>
<property name="text"> <property name="text">
@ -222,7 +226,20 @@
</item> </item>
</widget> </widget>
</item> </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"> <widget class="QComboBox" name="dateFormatComboBox">
<item> <item>
<property name="text"> <property name="text">
@ -241,20 +258,6 @@
</item> </item>
</widget> </widget>
</item> </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="2" column="3"> <item row="2" column="3">
<widget class="QComboBox" name="languageComboBox"> <widget class="QComboBox" name="languageComboBox">
<item> <item>
@ -279,7 +282,21 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="4" column="2"> <item row="6" 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="5" column="2">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
<string>Brightness:</string> <string>Brightness:</string>
@ -294,20 +311,13 @@
</widget> </widget>
</item> </item>
<item row="7" column="0"> <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"> <widget class="QLabel" name="label_12">
<property name="text"> <property name="text">
<string>Sampling Rate:</string> <string>Sampling Rate:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="3"> <item row="5" column="3">
<widget class="QComboBox" name="brightnessComboBox"> <widget class="QComboBox" name="brightnessComboBox">
<item> <item>
<property name="text"> <property name="text">
@ -326,7 +336,7 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="6" column="1"> <item row="7" column="1">
<widget class="QComboBox" name="samplingRateComboBox"> <widget class="QComboBox" name="samplingRateComboBox">
<item> <item>
<property name="text"> <property name="text">
@ -347,17 +357,38 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="3"> <item row="3" column="0">
<widget class="QSpinBox" name="salinitySpinBox"> <widget class="QLabel" name="label">
<property name="suffix"> <property name="text">
<string>%</string> <string>Dive Mode:</string>
</property>
<property name="maximum">
<number>5</number>
</property> </property>
</widget> </widget>
</item> </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"> <widget class="QComboBox" name="compassGainComboBox">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@ -407,51 +438,34 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="4" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Dive Mode:</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>
</widget>
</item>
<item row="3" column="2">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>Saturation:</string> <string>Saturation:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="3"> <item row="4" column="1">
<widget class="QSpinBox" name="saturationSpinBox"> <widget class="QSpinBox" name="saturationSpinBox">
<property name="suffix"> <property name="suffix">
<string>%</string> <string>%</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="2">
<widget class="QLabel" name="label_16">
<property name="text">
<string>Desaturation:</string>
</property>
</widget>
</item>
<item row="4" column="3">
<widget class="QSpinBox" name="desaturationSpinBox">
<property name="suffix">
<string>%</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>
@ -500,7 +514,7 @@
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>cancel</tabstop> <tabstop>device</tabstop>
<tabstop>search</tabstop> <tabstop>search</tabstop>
<tabstop>retrieveDetails</tabstop> <tabstop>retrieveDetails</tabstop>
<tabstop>saveSettingsPushButton</tabstop> <tabstop>saveSettingsPushButton</tabstop>
@ -513,6 +527,7 @@
<tabstop>languageComboBox</tabstop> <tabstop>languageComboBox</tabstop>
<tabstop>diveModeComboBox</tabstop> <tabstop>diveModeComboBox</tabstop>
<tabstop>saturationSpinBox</tabstop> <tabstop>saturationSpinBox</tabstop>
<tabstop>desaturationSpinBox</tabstop>
<tabstop>lastDecoSpinBox</tabstop> <tabstop>lastDecoSpinBox</tabstop>
<tabstop>brightnessComboBox</tabstop> <tabstop>brightnessComboBox</tabstop>
<tabstop>dateFormatComboBox</tabstop> <tabstop>dateFormatComboBox</tabstop>
@ -522,7 +537,7 @@
<tabstop>diveModeColour</tabstop> <tabstop>diveModeColour</tabstop>
<tabstop>compassGainComboBox</tabstop> <tabstop>compassGainComboBox</tabstop>
<tabstop>dateTimeSyncCheckBox</tabstop> <tabstop>dateTimeSyncCheckBox</tabstop>
<tabstop>device</tabstop> <tabstop>cancel</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>