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

Reset device field in DownloadFromDCWidget according to dive computer

Browse source 
Fixes minor interface inconsistency: The device field in the
download-from-dive-computer widget is disabled when selecting
a non-serial-transport dive computer. In contrast, post-download
the field was reset to enabled for all dive computers.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2017-11-01 08:01:23 +01:00 • committed by Dirk Hohndel
parent 31e11bc4e8
commit d23bd46a1b
2 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

31
desktop-widgets/downloadfromdivecomputer.cpp
View file

@ -258,18 +258,7 @@ void DownloadFromDCWidget::on_vendor_currentIndexChanged(const QString &vendor)
void DownloadFromDCWidget::on_product_currentIndexChanged(const QString &product) void DownloadFromDCWidget::on_product_currentIndexChanged(const QString &product)
{ {
// Set up the DC descriptor updateDeviceEnabled();
dc_descriptor_t *descriptor = NULL;
descriptor = descriptorLookup[ui.vendor->currentText() + product];
// call dc_descriptor_get_transport to see if the dc_transport_t is DC_TRANSPORT_SERIAL
if (dc_descriptor_get_transport(descriptor) == DC_TRANSPORT_SERIAL) {
// if the dc_transport_t is DC_TRANSPORT_SERIAL, then enable the device node box.
ui.device->setEnabled(true);
} else {
// otherwise disable the device node box
ui.device->setEnabled(false);
}
} }
void DownloadFromDCWidget::on_search_clicked() void DownloadFromDCWidget::on_search_clicked()
@ -489,6 +478,22 @@ void DownloadFromDCWidget::on_ok_clicked()
accept(); accept();
} }
void DownloadFromDCWidget::updateDeviceEnabled()
{
// Set up the DC descriptor
dc_descriptor_t *descriptor = NULL;
descriptor = descriptorLookup[ui.vendor->currentText() + ui.product->currentText()];
// call dc_descriptor_get_transport to see if the dc_transport_t is DC_TRANSPORT_SERIAL
if (dc_descriptor_get_transport(descriptor) == DC_TRANSPORT_SERIAL) {
// if the dc_transport_t is DC_TRANSPORT_SERIAL, then enable the device node box.
ui.device->setEnabled(true);
} else {
// otherwise disable the device node box
ui.device->setEnabled(false);
}
}
void DownloadFromDCWidget::markChildrenAsDisabled() void DownloadFromDCWidget::markChildrenAsDisabled()
{ {
ui.device->setEnabled(false); ui.device->setEnabled(false);
@ -511,7 +516,7 @@ void DownloadFromDCWidget::markChildrenAsDisabled()
void DownloadFromDCWidget::markChildrenAsEnabled() void DownloadFromDCWidget::markChildrenAsEnabled()
{ {
ui.device->setEnabled(true); updateDeviceEnabled();
ui.vendor->setEnabled(true); ui.vendor->setEnabled(true);
ui.product->setEnabled(true); ui.product->setEnabled(true);
ui.forceDownload->setEnabled(true); ui.forceDownload->setEnabled(true);

1
desktop-widgets/downloadfromdivecomputer.h
View file

@ -58,6 +58,7 @@ slots:
private: private:
void markChildrenAsDisabled(); void markChildrenAsDisabled();
void markChildrenAsEnabled(); void markChildrenAsEnabled();
void updateDeviceEnabled();
Ui::DownloadFromDiveComputer ui; Ui::DownloadFromDiveComputer ui;
DownloadThread thread; DownloadThread thread;