diff options
Diffstat (limited to 'mobile-widgets/qml/DownloadFromDiveComputer.qml')
| -rw-r--r-- | mobile-widgets/qml/DownloadFromDiveComputer.qml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml index 6a24f2dc9..80aaaa251 100644 --- a/mobile-widgets/qml/DownloadFromDiveComputer.qml +++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml @@ -57,11 +57,11 @@ Kirigami.Page { id: comboVendor Layout.fillWidth: true model: vendorList - currentIndex: downloadThread.data().getDetectedVendorIndex() + currentIndex: downloadThread.data().getDetectedVendorIndex(currentText) onCurrentTextChanged: { comboProduct.model = downloadThread.data().getProductListFromVendor(comboVendor.currentText) - if (currentIndex == downloadThread.data().getDetectedVendorIndex()) - comboProduct.currentIndex = downloadThread.data().getDetectedProductIndex() + if (currentIndex == downloadThread.data().getDetectedVendorIndex(currentText)) + comboProduct.currentIndex = downloadThread.data().getDetectedProductIndex(currentText, comboProduct.currentText) } } Kirigami.Label { text: qsTr(" Dive Computer:") } @@ -74,7 +74,7 @@ Kirigami.Page { Kirigami.Label { text: qsTr("Bluetooth download:") } CheckBox { id: isBluetooth - checked: downloadThread.data().getDetectedVendorIndex() != -1 + checked: downloadThread.data().getDetectedVendorIndex(ComboBox.currentText) != -1 } } @@ -89,7 +89,8 @@ Kirigami.Page { onClicked: { text: qsTr("Retry") if (downloadThread.deviceData.bluetoothMode) { - var addr = downloadThread.data().getDetectedDeviceAddress() + var addr = downloadThread.data().getDetectedDeviceAddress(comboVendor.currentText, + comboProduct.currentText) if (addr !== "") downloadThread.deviceData.devName = addr } |