diff --git a/icons/ostc3.png b/icons/ostc3.png new file mode 100644 index 000000000..5c49a76b3 Binary files /dev/null and b/icons/ostc3.png differ diff --git a/qt-ui/configuredivecomputerdialog.cpp b/qt-ui/configuredivecomputerdialog.cpp index 733d64a4f..c9e8da751 100644 --- a/qt-ui/configuredivecomputerdialog.cpp +++ b/qt-ui/configuredivecomputerdialog.cpp @@ -50,7 +50,8 @@ ConfigureDiveComputerDialog::ConfigureDiveComputerDialog(QWidget *parent) : if (default_dive_computer_device) ui->device->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