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 +++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'examples/bluetooth/lowenergyscanner/assets')

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"
         }
     }
 }
-- 
cgit v1.2.3