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

Update downloadfromdivecomputer.cpp

Browse source 
Based on Michael's suggestion, added code to refine enableBluetoothMode. 

Signed-off-by: jme <32236882+notrege@users.noreply.github.com>
This commit is contained in:
jme 2024-04-16 10:38:47 +01:00 • committed by Michael Keller
parent 8a20509861
commit 6b11457ddd
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
desktop-widgets/downloadfromdivecomputer.cpp
View file

@ -152,16 +152,8 @@ void DownloadFromDCWidget::DC##num##Clicked() \
ui.vendor->setCurrentIndex(ui.vendor->findText(qPrefDiveComputer::vendor##num())); \ ui.vendor->setCurrentIndex(ui.vendor->findText(qPrefDiveComputer::vendor##num())); \
productModel.setStringList(productList[qPrefDiveComputer::vendor##num()]); \ productModel.setStringList(productList[qPrefDiveComputer::vendor##num()]); \
ui.product->setCurrentIndex(ui.product->findText(qPrefDiveComputer::product##num())); \ ui.product->setCurrentIndex(ui.product->findText(qPrefDiveComputer::product##num())); \
bool isBluetoothDevice = isBluetoothAddress(qPrefDiveComputer::device##num()); \ ui.device->setCurrentIndex(deviceIndex(qPrefDiveComputer::device##num())); \
/* If we have a Bluetooth device, set the ui.device->CurrentText to avoid starting \ ui.bluetoothMode->setChecked(isBluetoothAddress(qPrefDiveComputer::device##num())); \
a Bluetooth scan in enableBluetoothMode(). \
Note: enableBlueToothMode() will set ui.device.CurrentIndex to -1 unless \
ui.bluetoothMode is checked. */ \
if (isBluetoothDevice) \
ui.device->setCurrentText(qPrefDiveComputer::device##num()); \
ui.bluetoothMode->setChecked(isBluetoothDevice); \
if (ui.device->currentIndex() == -1 || isBluetoothDevice) \
ui.device->setCurrentIndex(deviceIndex(qPrefDiveComputer::device##num())); \
} }
#else #else
#define DCBUTTON(num) \ #define DCBUTTON(num) \
@ -631,12 +623,17 @@ void DownloadFromDCWidget::enableBluetoothMode(int state)
{ {
ui.chooseBluetoothDevice->setEnabled(state == Qt::Checked); ui.chooseBluetoothDevice->setEnabled(state == Qt::Checked);
/* This is convoluted enough to warrant explanation:
1. If we have a Bluetooth device, but no Bluetooth address then scan.
2. If we have a Bluetooth device and address, skip scan.
3. If it's not Bluetooth, clear the device address unless it's a Mac.
Mac USB addresses tend to be persistent and are better saved. */
if (state == Qt::Checked) { if (state == Qt::Checked) {
if (!isBluetoothAddress(ui.device->currentText())) if (!isBluetoothAddress(ui.device->currentText()))
selectRemoteBluetoothDevice(); selectRemoteBluetoothDevice();
} else { } else
ui.device->setCurrentIndex(-1); if (isBluetoothAddress(ui.device->currentText()) || QSysInfo::kernelType() != "darwin")
} ui.device->setCurrentIndex(-1);
} }
#endif #endif