From afd46a60f7b9a7aba0ae515f4ae38c8223761f2d Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Tue, 5 Dec 2017 20:58:54 +0100 Subject: [PATCH] Add button to rescan BT devices Otherwise the divecomputer has to be in pairing mode at app start time. Unfortunately, this leaves less space for the progress message. My time/qml knowledge does not suffice to move that to the next line (when moving that out of the RowLayout it overlaps with the buttons). Signed-off-by: Robert C. Helling --- CHANGELOG.md | 1 + mobile-widgets/qml/DownloadFromDiveComputer.qml | 8 ++++++++ mobile-widgets/qmlmanager.cpp | 5 +++++ mobile-widgets/qmlmanager.h | 2 ++ 4 files changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2c302e31..bdb888ce0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +- Add button to recan for BT devices - Compute plan variations in background to improve responsiveness - Improve profile rescaling in planner - Store the gas switch depth of a cylinder from the planner in the logbook diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml index 1091a0350..199f6aa67 100644 --- a/mobile-widgets/qml/DownloadFromDiveComputer.qml +++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml @@ -215,6 +215,14 @@ Kirigami.Page { manager.appendTextToLog("exit DCDownload screen") } } + SsrfButton { + id:rescanbutton + text: qsTr("Rescan") + onClicked: { + manager.btRescan() + } + } + Controls.Label { Layout.maximumWidth: parent.width - download.width - quitbutton.width text: divesDownloaded ? qsTr(" Downloaded dives") : diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 3b1ed4aaa..413364a65 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -96,6 +96,11 @@ void QMLManager::btHostModeChange(QBluetoothLocalDevice::HostMode state) emit btEnabledChanged(); } +void QMLManager::btRescan() +{ + BTDiscovery::instance()->BTDiscoveryReDiscover(); +} + QMLManager::QMLManager() : m_locationServiceEnabled(false), m_verboseEnabled(false), reply(0), diff --git a/mobile-widgets/qmlmanager.h b/mobile-widgets/qmlmanager.h index cd827da4d..92b320966 100644 --- a/mobile-widgets/qmlmanager.h +++ b/mobile-widgets/qmlmanager.h @@ -192,6 +192,8 @@ public slots: void appendTextToLog(const QString &newText); void quit(); void hasLocationSourceChanged(); + void btRescan(); + private: QString m_cloudUserName;