diff options
author | Joseph W. Joshua <joejoshw@gmail.com> | 2014-06-10 15:03:26 +0300 |
---|---|---|
committer | Thiago Macieira <thiago@macieira.org> | 2014-08-09 12:06:42 -0300 |
commit | 4fc16b16749a73b8c06d41cb7cb22b78c77ab29e (patch) | |
tree | 6a434679d4f6d0677f920f910a2ddca39296cf87 /qt-ui/configuredivecomputerdialog.ui | |
parent | 2432350064c6a9109501b3df21f56a9fe41aa686 (diff) | |
download | subsurface-4fc16b16749a73b8c06d41cb7cb22b78c77ab29e.tar.gz |
Move divecomputer configuration code to different files
This splits the code in configuredivecomputer.cpp into multiple files.
The read and write threads are moved to configuredivecomputerthreads.h/cpp,
and the device details class is moved to devicedetails.h/.cpp
Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com>
Signed-off-by: Thiago Macieira <thiago@macieira.org>
Diffstat (limited to 'qt-ui/configuredivecomputerdialog.ui')
-rw-r--r-- | qt-ui/configuredivecomputerdialog.ui | 127 |
1 files changed, 103 insertions, 24 deletions
diff --git a/qt-ui/configuredivecomputerdialog.ui b/qt-ui/configuredivecomputerdialog.ui index cb4dacb23..d7c584e0c 100644 --- a/qt-ui/configuredivecomputerdialog.ui +++ b/qt-ui/configuredivecomputerdialog.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>362</width> - <height>375</height> + <width>343</width> + <height>365</height> </rect> </property> <property name="windowTitle"> @@ -92,32 +92,15 @@ </layout> </item> <item> - <widget class="QTextBrowser" name="availableDetails"/> - </item> - <item> <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0"> - <widget class="QPushButton" name="setDeviceName"> - <property name="text"> - <string>Set Device Name</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QPushButton" name="setDateAndTime"> - <property name="text"> - <string>Set Date && Time</string> - </property> - </widget> - </item> - <item row="1" column="0"> + <item row="3" column="0"> <widget class="QLabel" name="label_4"> <property name="text"> <string>Brightness:</string> </property> </widget> </item> - <item row="1" column="1"> + <item row="3" column="1"> <widget class="QComboBox" name="brightnessComboBox"> <item> <property name="text"> @@ -136,16 +119,91 @@ </item> </widget> </item> - <item row="1" column="2"> - <widget class="QToolButton" name="setBrightnessButton"> + <item row="0" column="1"> + <widget class="QLineEdit" name="serialNoLineEdit"> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="4" column="1"> + <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="1"> + <widget class="QLineEdit" name="customTextLlineEdit"/> + </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>Language:</string> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>Serial No.</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Custom Text:</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_8"> <property name="text"> - <string>...</string> + <string>Firmware Version:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="firmwareVersionLineEdit"> + <property name="readOnly"> + <bool>true</bool> </property> </widget> </item> </layout> </item> <item> + <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> <widget class="QLabel" name="errorLabel"> <property name="styleSheet"> <string notr="true">color: rgb(242, 19, 25);</string> @@ -165,6 +223,13 @@ <item> <layout class="QHBoxLayout" name="horizontalLayout_3"> <item> + <widget class="QPushButton" name="saveSettingsPushButton"> + <property name="text"> + <string>Save Chages to Device</string> + </property> + </widget> + </item> + <item> <spacer name="horizontalSpacer_2"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -188,6 +253,20 @@ </item> </layout> </widget> + <tabstops> + <tabstop>vendor</tabstop> + <tabstop>product</tabstop> + <tabstop>device</tabstop> + <tabstop>search</tabstop> + <tabstop>retrieveDetails</tabstop> + <tabstop>serialNoLineEdit</tabstop> + <tabstop>firmwareVersionLineEdit</tabstop> + <tabstop>customTextLlineEdit</tabstop> + <tabstop>brightnessComboBox</tabstop> + <tabstop>languageComboBox</tabstop> + <tabstop>saveSettingsPushButton</tabstop> + <tabstop>cancel</tabstop> + </tabstops> <resources/> <connections/> </ui> |