From a9b55d7f0d00d68523058c5714fa4b199cbf2211 Mon Sep 17 00:00:00 2001 From: "Joseph W. Joshua" Date: Wed, 16 Jul 2014 12:04:54 +0300 Subject: [PATCH] Change Dive Computer Configuration dialog Changes the layout of the ConfigureDiveComputer dialog to use a list of supported computers on the left, with a stacked widget showing the configurable details. Signed-off-by: Joseph W. Joshua Signed-off-by: Thiago Macieira --- icons/ostc3.png | Bin 0 -> 28943 bytes qt-ui/configuredivecomputerdialog.cpp | 37 +- qt-ui/configuredivecomputerdialog.h | 3 +- qt-ui/configuredivecomputerdialog.ui | 1425 +++++++++++++------------ subsurface.qrc | 3 +- 5 files changed, 749 insertions(+), 719 deletions(-) create mode 100644 icons/ostc3.png diff --git a/icons/ostc3.png b/icons/ostc3.png new file mode 100644 index 0000000000000000000000000000000000000000..5c49a76b35a4e0e294d9cf48774dbababb06866c GIT binary patch literal 28943 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 u47Ylox8wN``X>b7zcZ}z{CV!5|2F{7T83~qTG*`s0000device->setEditText(default_dive_computer_device); - on_tabWidget_currentChanged(0); + ui->DiveComputerList->setCurrentRow(0); + on_DiveComputerList_currentRowChanged(0); } ConfigureDiveComputerDialog::~ConfigureDiveComputerDialog() @@ -435,23 +436,6 @@ void ConfigureDiveComputerDialog::on_restoreBackupButton_clicked() } } -void ConfigureDiveComputerDialog::on_tabWidget_currentChanged(int index) -{ - switch (index) { - case 0: - selected_vendor = "Heinrichs Weikamp"; - selected_product = "OSTC 3"; - break; - } - - int dcType = DC_TYPE_SERIAL; - - - if (selected_vendor == QString("Uemis")) - dcType = DC_TYPE_UEMIS; - fill_device_list(dcType); -} - void ConfigureDiveComputerDialog::on_updateFirmwareButton_clicked() { QString filename = existing_filename ?: prefs.default_filename; @@ -466,3 +450,20 @@ void ConfigureDiveComputerDialog::on_updateFirmwareButton_clicked() config->startFirmwareUpdate(firmwarePath, &device_data, errText); } } + +void ConfigureDiveComputerDialog::on_DiveComputerList_currentRowChanged(int currentRow) +{ + switch (currentRow) { + case 0: + selected_vendor = "Heinrichs Weikamp"; + selected_product = "OSTC 3"; + break; + } + + int dcType = DC_TYPE_SERIAL; + + + if (selected_vendor == QString("Uemis")) + dcType = DC_TYPE_UEMIS; + fill_device_list(dcType); +} diff --git a/qt-ui/configuredivecomputerdialog.h b/qt-ui/configuredivecomputerdialog.h index 71266c471..66871efa3 100644 --- a/qt-ui/configuredivecomputerdialog.h +++ b/qt-ui/configuredivecomputerdialog.h @@ -31,10 +31,11 @@ private slots: void on_restoreBackupButton_clicked(); - void on_tabWidget_currentChanged(int index); void on_updateFirmwareButton_clicked(); + void on_DiveComputerList_currentRowChanged(int currentRow); + private: Ui::ConfigureDiveComputerDialog *ui; diff --git a/qt-ui/configuredivecomputerdialog.ui b/qt-ui/configuredivecomputerdialog.ui index d0dd91155..41745a652 100644 --- a/qt-ui/configuredivecomputerdialog.ui +++ b/qt-ui/configuredivecomputerdialog.ui @@ -6,8 +6,8 @@ 0 0 - 785 - 670 + 844 + 616 @@ -98,682 +98,6 @@ - - - - 0 - - - - HW OSTC 3 - - - - - - - m/°C - - - - - ft/°F - - - - - - - - Salinity (0-5%): - - - salinitySpinBox - - - - - - - Custom Text: - - - customTextLlineEdit - - - - - - - % - - - - - - - % - - - - - - - % - - - 5 - - - - - - - m - - - - - - - Last Deco: - - - lastDecoSpinBox - - - - - - - - Eco - - - - - Medium - - - - - High - - - - - - - - true - - - - - - - - English - - - - - German - - - - - French - - - - - Italian - - - - - - - - Language: - - - languageComboBox - - - - - - - - 1 - 0 - - - - - - - - - 1 - 0 - - - - - 230LSB/Gauss - - - - - 330LSB/Gauss - - - - - 390LSB/Gauss - - - - - 440LSB/Gauss - - - - - 660LSB/Gauss - - - - - 820LSB/Gauss - - - - - 1090LSB/Gauss - - - - - 1370LSB/Gauss - - - - - - - - Compass Gain: - - - compassGainComboBox - - - - - - - Dive Mode: - - - diveModeComboBox - - - - - - - - 0 - 2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %He - - - - - %O2 - - - - - Type - - - - - Change Depth - - - - - Dil 1 - - - - - Dil 2 - - - - - Dil 3 - - - - - Dil 4 - - - - - Dil 5 - - - - - - - - Units: - - - unitsComboBox - - - - - - - Desaturation: - - - desaturationSpinBox - - - - - - - - OC - - - - - CC - - - - - Gauge - - - - - Apnea - - - - - - - - Serial No. - - - serialNoLineEdit - - - - - - - Brightness: - - - brightnessComboBox - - - - - - - Saturation: - - - saturationSpinBox - - - - - - - - 0 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %O2 - - - - - %He - - - - - Type - - - - - Change Depth - - - - - Gas 1 - - - - - Gas 2 - - - - - Gas 3 - - - - - Gas 4 - - - - - Gas 5 - - - - - - - - - MMDDYY - - - - - DDMMYY - - - - - YYMMDD - - - - - - - - true - - - - - - - Firmware Version: - - - firmwareVersionLineEdit - - - - - - - Date Format: - - - dateFormatComboBox - - - - - - - - Standard - - - - - Red - - - - - Green - - - - - Blue - - - - - - - - Sampling Rate: - - - samplingRateComboBox - - - - - - - Sync dive computer time with PC - - - - - - - - 2s - - - - - 10s - - - - - - - - Dive Mode Colour: - - - diveModeColour - - - - - - - - 0 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Set Point [cbar] - - - - - Change Depth [m] - - - - - SP 1 - - - - - SP 2 - - - - - SP 3 - - - - - SP 4 - - - - - SP 5 - - - - - - - - - - - - color: rgb(242, 19, 25); - - - - - - - - - - - - - @@ -798,6 +122,709 @@ + + + + Qt::Horizontal + + + + + 200 + 16777215 + + + + + 12 + + + + + 64 + 64 + + + + + OSTC 3 + + + + :/icons/ostc3.png:/icons/ostc3.png + + + + + + + + + + Serial No. + + + serialNoLineEdit + + + + + + + true + + + + + + + Firmware Version: + + + firmwareVersionLineEdit + + + + + + + true + + + + + + + Custom Text: + + + customTextLlineEdit + + + + + + + + 1 + 0 + + + + + + + + Language: + + + languageComboBox + + + + + + + + English + + + + + German + + + + + French + + + + + Italian + + + + + + + + Dive Mode: + + + diveModeComboBox + + + + + + + + OC + + + + + CC + + + + + Gauge + + + + + Apnea + + + + + + + + Date Format: + + + dateFormatComboBox + + + + + + + + MMDDYY + + + + + DDMMYY + + + + + YYMMDD + + + + + + + + Saturation: + + + saturationSpinBox + + + + + + + % + + + + + + + Desaturation: + + + desaturationSpinBox + + + + + + + % + + + + + + + Last Deco: + + + lastDecoSpinBox + + + + + + + m + + + + + + + Brightness: + + + brightnessComboBox + + + + + + + + Eco + + + + + Medium + + + + + High + + + + + + + + Sampling Rate: + + + samplingRateComboBox + + + + + + + + 2s + + + + + 10s + + + + + + + + Units: + + + unitsComboBox + + + + + + + + m/°C + + + + + ft/°F + + + + + + + + Dive Mode Colour: + + + diveModeColour + + + + + + + + Standard + + + + + Red + + + + + Green + + + + + Blue + + + + + + + + Salinity (0-5%): + + + salinitySpinBox + + + + + + + % + + + 5 + + + + + + + Sync dive computer time with PC + + + + + + + Compass Gain: + + + compassGainComboBox + + + + + + + + 1 + 0 + + + + + 230LSB/Gauss + + + + + 330LSB/Gauss + + + + + 390LSB/Gauss + + + + + 440LSB/Gauss + + + + + 660LSB/Gauss + + + + + 820LSB/Gauss + + + + + 1090LSB/Gauss + + + + + 1370LSB/Gauss + + + + + + + + + 0 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %O2 + + + + + %He + + + + + Type + + + + + Change Depth + + + + + Gas 1 + + + + + Gas 2 + + + + + Gas 3 + + + + + Gas 4 + + + + + Gas 5 + + + + + + + + + 0 + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %He + + + + + %O2 + + + + + Type + + + + + Change Depth + + + + + Dil 1 + + + + + Dil 2 + + + + + Dil 3 + + + + + Dil 4 + + + + + Dil 5 + + + + + + + + + 0 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Set Point [cbar] + + + + + Change Depth [m] + + + + + SP 1 + + + + + SP 2 + + + + + SP 3 + + + + + SP 4 + + + + + SP 5 + + + + + + + + + + + + + color: rgb(242, 19, 25); + + + + + + + + + + + + + @@ -807,27 +834,27 @@ saveSettingsPushButton backupButton restoreBackupButton - tabWidget - serialNoLineEdit - firmwareVersionLineEdit - customTextLlineEdit - languageComboBox - diveModeComboBox - dateFormatComboBox - saturationSpinBox - desaturationSpinBox - lastDecoSpinBox - brightnessComboBox - samplingRateComboBox - unitsComboBox - diveModeColour - salinitySpinBox - dateTimeSyncCheckBox - compassGainComboBox - ostc3GasTable - ostc3DilTable cancel - - + + + + + + DiveComputerList + currentRowChanged(int) + dcStackedWidget + setCurrentIndex(int) + + + 258 + 130 + + + 292 + 118 + + + + diff --git a/subsurface.qrc b/subsurface.qrc index dfeea6819..1951bb424 100644 --- a/subsurface.qrc +++ b/subsurface.qrc @@ -59,10 +59,11 @@ icons/ead.png icons/icon-HR.png icons/calendarbg.png - icons/pictures.png + icons/pictures.png icons/subsurface/index.theme icons/subsurface/32x32/actions/go-down.png icons/subsurface/32x32/actions/go-up.png icons/subsurface/32x32/actions/window-close.png + icons/ostc3.png