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

Redesign Dive Computer configuration dialog

Browse source 
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>
This commit is contained in:
Joseph W. Joshua 2014-09-02 12:31:21 +03:00 • committed by Dirk Hohndel
parent d698182fb3
commit bf82810a30
1 changed files with 685 additions and 645 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
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>844</width> <width>842</width>
<height>616</height> <height>614</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -124,6 +124,12 @@
</item> </item>
<item> <item>
<widget class="QSplitter" name="splitter"> <widget class="QSplitter" name="splitter">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>2</verstretch>
</sizepolicy>
</property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@ -157,7 +163,17 @@
</widget> </widget>
<widget class="QStackedWidget" name="dcStackedWidget"> <widget class="QStackedWidget" name="dcStackedWidget">
<widget class="QWidget" name="page_2"> <widget class="QWidget" name="page_2">
<layout class="QGridLayout" name="gridLayout_2"> <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"> <item row="0" column="0">
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
@ -168,14 +184,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1" colspan="2">
<widget class="QLineEdit" name="serialNoLineEdit"> <widget class="QLineEdit" name="serialNoLineEdit">
<property name="readOnly"> <property name="readOnly">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="3">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
<property name="text"> <property name="text">
<string>Firmware Version:</string> <string>Firmware Version:</string>
@ -185,7 +201,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="3"> <item row="0" column="4">
<widget class="QLineEdit" name="firmwareVersionLineEdit"> <widget class="QLineEdit" name="firmwareVersionLineEdit">
<property name="readOnly"> <property name="readOnly">
<bool>true</bool> <bool>true</bool>
@ -202,7 +218,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1" colspan="2">
<widget class="QLineEdit" name="customTextLlineEdit"> <widget class="QLineEdit" name="customTextLlineEdit">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -212,7 +228,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="1" column="3">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>Language:</string> <string>Language:</string>
@ -222,7 +238,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="3"> <item row="1" column="4">
<widget class="QComboBox" name="languageComboBox"> <widget class="QComboBox" name="languageComboBox">
<item> <item>
<property name="text"> <property name="text">
@ -280,7 +296,7 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="2" column="2"> <item row="2" column="3">
<widget class="QLabel" name="label_9"> <widget class="QLabel" name="label_9">
<property name="text"> <property name="text">
<string>Date Format:</string> <string>Date Format:</string>
@ -290,7 +306,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="3"> <item row="2" column="4">
<widget class="QComboBox" name="dateFormatComboBox"> <widget class="QComboBox" name="dateFormatComboBox">
<item> <item>
<property name="text"> <property name="text">
@ -326,7 +342,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2"> <item row="3" column="3">
<widget class="QLabel" name="label_16"> <widget class="QLabel" name="label_16">
<property name="text"> <property name="text">
<string>Desaturation:</string> <string>Desaturation:</string>
@ -336,7 +352,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="3"> <item row="3" column="4">
<widget class="QSpinBox" name="desaturationSpinBox"> <widget class="QSpinBox" name="desaturationSpinBox">
<property name="suffix"> <property name="suffix">
<string>%</string> <string>%</string>
@ -360,7 +376,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="2"> <item row="4" column="3">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
<string>Brightness:</string> <string>Brightness:</string>
@ -370,7 +386,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="3"> <item row="4" column="4">
<widget class="QComboBox" name="brightnessComboBox"> <widget class="QComboBox" name="brightnessComboBox">
<item> <item>
<property name="text"> <property name="text">
@ -413,7 +429,7 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="5" column="2"> <item row="5" column="3">
<widget class="QLabel" name="label_11"> <widget class="QLabel" name="label_11">
<property name="text"> <property name="text">
<string>Units:</string> <string>Units:</string>
@ -423,7 +439,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="3"> <item row="5" column="4">
<widget class="QComboBox" name="unitsComboBox"> <widget class="QComboBox" name="unitsComboBox">
<item> <item>
<property name="text"> <property name="text">
@ -471,7 +487,7 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="6" column="2"> <item row="6" column="3">
<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>
@ -481,7 +497,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="3"> <item row="6" column="4">
<widget class="QSpinBox" name="salinitySpinBox"> <widget class="QSpinBox" name="salinitySpinBox">
<property name="suffix"> <property name="suffix">
<string>%</string> <string>%</string>
@ -491,14 +507,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0" colspan="2"> <item row="7" column="0" colspan="3">
<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="7" column="2"> <item row="7" column="3">
<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>
@ -508,7 +524,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="3"> <item row="7" column="4">
<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">
@ -558,12 +574,32 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="8" column="0" colspan="2"> <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"> <widget class="QTableWidget" name="ostc3GasTable">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>1</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<row> <row>
@ -643,12 +679,12 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="8" column="2" colspan="2"> <item row="0" column="1">
<widget class="QTableWidget" name="ostc3DilTable"> <widget class="QTableWidget" name="ostc3DilTable">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>2</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<row> <row>
@ -728,12 +764,12 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="9" column="0" colspan="2"> <item row="1" column="0">
<widget class="QTableWidget" name="ostc3SetPointTable"> <widget class="QTableWidget" name="ostc3SetPointTable">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>1</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<row> <row>
@ -806,6 +842,10 @@
</layout> </layout>
</widget> </widget>
</widget> </widget>
</item>
</layout>
</widget>
</widget>
</widget> </widget>
</item> </item>
<item> <item>