diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-07-16 21:50:28 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-07-16 21:53:44 -0700 |
| commit | 40223c8a5fb921efdc237528c0aa9fff54899b35 (patch) | |
| tree | 69a695e2382534f982fa3904e425b387e7edbfcc | |
| parent | a4f045abaa625db4780f915ab57ed3edc89bf000 (diff) | |
| download | subsurface-40223c8a5fb921efdc237528c0aa9fff54899b35.tar.gz | |
QML UI: show the connection choices in Download UI
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | mobile-widgets/qml/DownloadFromDiveComputer.qml | 14 | ||||
| -rw-r--r-- | subsurface-mobile-helper.cpp | 1 |
2 files changed, 14 insertions, 1 deletions
diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml index b7f000a46..d57068522 100644 --- a/mobile-widgets/qml/DownloadFromDiveComputer.qml +++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml @@ -26,7 +26,7 @@ Kirigami.Page { deviceData.product : comboProduct.currentText //TODO: make this dynamic? - deviceData.devName : "/tmp/ttyS1" + deviceData.devName : comboConnection.currentText //TODO: Make this the default on the C++ deviceData.bluetoothMode : isBluetooth.checked @@ -82,10 +82,22 @@ Kirigami.Page { Layout.fillWidth: true model: null currentIndex: productidx + onCurrentTextChanged: { + comboConnection.currentIndex = downloadThread.data().getMatchingAddress(comboVendor.currentText, currentText) + } + onModelChanged: { currentIndex = productidx } } + Kirigami.Label { text: qsTr(" Connection:") } + ComboBox { + id: comboConnection + Layout.fillWidth: true + model: connectionListModel + currentIndex: -1 + } + Kirigami.Label { text: btEnabled ? qsTr("Bluetooth download:") : qsTr("No Bluetooth support detected")} CheckBox { id: isBluetooth diff --git a/subsurface-mobile-helper.cpp b/subsurface-mobile-helper.cpp index 00c0e2c08..e84fd82d1 100644 --- a/subsurface-mobile-helper.cpp +++ b/subsurface-mobile-helper.cpp @@ -75,6 +75,7 @@ void run_ui() ctxt->setContextProperty("diveModel", sortModel); ctxt->setContextProperty("gpsModel", gpsSortModel); ctxt->setContextProperty("vendorList", vendorList); + ctxt->setContextProperty("connectionListModel", &connectionListModel); ctxt->setContextProperty("logModel", MessageHandlerModel::self()); engine.load(QUrl(QStringLiteral("qrc:///qml/main.qml"))); |