From 73563f571e6dfd37a0e4cf90f4679d9901b9233c Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@theqtcompany.com>
Date: Mon, 24 Nov 2014 11:02:42 +0100
Subject: Improve lowenergyscanner status reporting

Change-Id: If6fccce951c2f3c3787cde2fa593e65da26f4370
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
---
 examples/bluetooth/lowenergyscanner/assets/Characteristics.qml | 3 ++-
 examples/bluetooth/lowenergyscanner/assets/Services.qml        | 8 +++-----
 examples/bluetooth/lowenergyscanner/device.cpp                 | 7 ++++---
 examples/bluetooth/lowenergyscanner/device.h                   | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'examples/bluetooth/lowenergyscanner')

diff --git a/examples/bluetooth/lowenergyscanner/assets/Characteristics.qml b/examples/bluetooth/lowenergyscanner/assets/Characteristics.qml
index ac3b7151..8e6e2868 100644
--- a/examples/bluetooth/lowenergyscanner/assets/Characteristics.qml
+++ b/examples/bluetooth/lowenergyscanner/assets/Characteristics.qml
@@ -141,10 +141,11 @@ Rectangle {
         id: menu
         anchors.bottom: parent.bottom
         menuWidth: parent.width
-        menuText: "Scanning"
+        menuText: device.update
         menuHeight: (parent.height/6)
         onButtonClick: {
             pageLoader.source = "Services.qml"
+            device.update = "Back"
         }
     }
 }
diff --git a/examples/bluetooth/lowenergyscanner/assets/Services.qml b/examples/bluetooth/lowenergyscanner/assets/Services.qml
index a433d445..e3e05cac 100644
--- a/examples/bluetooth/lowenergyscanner/assets/Services.qml
+++ b/examples/bluetooth/lowenergyscanner/assets/Services.qml
@@ -76,10 +76,6 @@ Rectangle {
             else
                 info.visible = false;
         }
-
-        onDisconnected: {
-            pageLoader.source = "main.qml"
-        }
     }
 
     ListView {
@@ -137,10 +133,12 @@ Rectangle {
         id: menu
         anchors.bottom: parent.bottom
         menuWidth: parent.width
-        menuText: "Back"
+        menuText: device.update
         menuHeight: (parent.height/6)
         onButtonClick: {
             device.disconnectFromDevice()
+            pageLoader.source = "main.qml"
+            device.update = "Search"
         }
     }
 }
diff --git a/examples/bluetooth/lowenergyscanner/device.cpp b/examples/bluetooth/lowenergyscanner/device.cpp
index 1f1e11c4..9175095c 100644
--- a/examples/bluetooth/lowenergyscanner/device.cpp
+++ b/examples/bluetooth/lowenergyscanner/device.cpp
@@ -155,7 +155,7 @@ void Device::scanServices(const QString &address)
     m_services.clear();
     emit servicesUpdated();
 
-    setUpdate("Connecting to device...");
+    setUpdate("Back\n(Connecting to device...)");
 
     if (controller && controller->remoteAddress() != currentDevice.getDevice().address()) {
         controller->disconnectFromDevice();
@@ -205,7 +205,7 @@ void Device::addLowEnergyService(const QBluetoothUuid &serviceUuid)
 
 void Device::serviceScanDone()
 {
-    setUpdate("Service scan done!");
+    setUpdate("Back\n(Service scan done!)");
     // force UI in case we didn't find anything
     if (m_services.isEmpty())
         emit servicesUpdated();
@@ -234,6 +234,7 @@ void Device::connectToService(const QString &uuid)
         connect(service, SIGNAL(stateChanged(QLowEnergyService::ServiceState)),
                 this, SLOT(serviceDetailsDiscovered(QLowEnergyService::ServiceState)));
         service->discoverDetails();
+        setUpdate("Back\n(Discovering details...)");
         //! [les-service-3]
         return;
     }
@@ -250,7 +251,7 @@ void Device::connectToService(const QString &uuid)
 
 void Device::deviceConnected()
 {
-    setUpdate("Discovering services!");
+    setUpdate("Back\n(Discovering services...)");
     connected = true;
     //! [les-service-2]
     controller->discoverServices();
diff --git a/examples/bluetooth/lowenergyscanner/device.h b/examples/bluetooth/lowenergyscanner/device.h
index 049d1c61..a12f9e0e 100644
--- a/examples/bluetooth/lowenergyscanner/device.h
+++ b/examples/bluetooth/lowenergyscanner/device.h
@@ -63,7 +63,7 @@ class Device: public QObject
     Q_PROPERTY(QVariant devicesList READ getDevices NOTIFY devicesUpdated)
     Q_PROPERTY(QVariant servicesList READ getServices NOTIFY servicesUpdated)
     Q_PROPERTY(QVariant characteristicList READ getCharacteristics NOTIFY characteristicsUpdated)
-    Q_PROPERTY(QString update READ getUpdate NOTIFY updateChanged)
+    Q_PROPERTY(QString update READ getUpdate WRITE setUpdate NOTIFY updateChanged)
     Q_PROPERTY(bool useRandomAddress READ isRandomAddress WRITE setRandomAddress NOTIFY randomAddressChanged)
     Q_PROPERTY(bool state READ state NOTIFY stateChanged)
     Q_PROPERTY(bool controllerError READ hasControllerError)
-- 
cgit v1.2.3