diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-07-17 12:09:11 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-07-18 00:49:31 -0700 |
| commit | bb3387f234991f0779e683951b3f74cf00782570 (patch) | |
| tree | 7451e90261f4e4b4762d2862ca54667de5f4ca8b | |
| parent | 0104d7444ee5fdc11f8e4949f6a1fe718aa169dc (diff) | |
| download | subsurface-bb3387f234991f0779e683951b3f74cf00782570.tar.gz | |
QML UI: Download from DC: remove Bluetooth checkbox
The connection already clearly defines whether this is Bluetooth or not.
No reason for the separate checkbox.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | mobile-widgets/qml/DownloadFromDiveComputer.qml | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml index ded51abfc..a9b34f34f 100644 --- a/mobile-widgets/qml/DownloadFromDiveComputer.qml +++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml @@ -29,7 +29,7 @@ Kirigami.Page { deviceData.devName : comboConnection.currentText //TODO: Make this the default on the C++ - deviceData.bluetoothMode : isBluetooth.checked + deviceData.bluetoothMode : true deviceData.forceDownload : false deviceData.createNewTrip : false deviceData.deviceId : 0 @@ -157,35 +157,9 @@ Kirigami.Page { // pattern that matches BT addresses var btAddr = /[0-9A-Fa-f][0-9A-Fa-f]:[0-9A-Fa-f][0-9A-Fa-f]:[0-9A-Fa-f][0-9A-Fa-f]:[0-9A-Fa-f][0-9A-Fa-f]:[0-9A-Fa-f][0-9A-Fa-f]:[0-9A-Fa-f][0-9A-Fa-f]/ ; if (btAddr.test(currentText)) - isBluetooth.checked = true + downloadThread.deviceData.bluetoothMode = true else - isBluetooth.checked = false - } - } - - Kirigami.Label { text: btEnabled ? qsTr("Bluetooth download:") : qsTr("No Bluetooth support detected")} - CheckBox { - id: isBluetooth - checked: downloadThread.data().getDetectedVendorIndex(ComboBox.currentText) != -1 - indicator: Rectangle { - visible: btEnabled - implicitWidth: 20 - implicitHeight: 20 - x: isBluetooth.leftPadding - y: parent.height / 2 - height / 2 - radius: 4 - border.color: isBluetooth.down ? subsurfaceTheme.PrimaryColor : subsurfaceTheme.darkerPrimaryColor - color: subsurfaceTheme.backgroundColor - - Rectangle { - width: 12 - height: 12 - x: 4 - y: 4 - radius: 3 - color: isBluetooth.down ? subsurfaceTheme.PrimaryColor : subsurfaceTheme.darkerPrimaryColor - visible: btEnabled && isBluetooth.checked - } + downloadThread.deviceData.bluetoothMode = false } } } |