summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTitta Heikkala <titta.heikkala@qt.io>2017-02-08 13:55:14 +0200
committerKari Hautamäki <kari.hautamaki@qt.io>2017-02-08 13:13:01 +0000
commit2444e187bca15832c25845d69789e7926a23f170 (patch)
tree265f90f88455634f7ad08ae6085011ad727e70fe
parentd49cdefe565d170279d97d3cfedccd1e2111051a (diff)
iot-sensortag: Add all states to sensor settings
Added 'Scanning' and 'Error' states to sensor settings. Change-Id: Ib207170c00994873bbfcbf86cb6aaa541bf93101 Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
-rw-r--r--tradeshow/iot-sensortag/resources/base/SensorSettings.qml8
1 files changed, 6 insertions, 2 deletions
diff --git a/tradeshow/iot-sensortag/resources/base/SensorSettings.qml b/tradeshow/iot-sensortag/resources/base/SensorSettings.qml
index 1586176..bd13ef5 100644
--- a/tradeshow/iot-sensortag/resources/base/SensorSettings.qml
+++ b/tradeshow/iot-sensortag/resources/base/SensorSettings.qml
@@ -117,12 +117,16 @@ Rectangle {
width: 40
height: 40
source: pathPrefix + "Toolbar/icon_topbar_sensor.png"
- opacity: modelData.state === SensorTagData.Connected ? 1 : 0.5
+ opacity: (modelData.state === SensorTagData.Connected
+ || modelData.state === SensorTagData.Scanning) ? 1 : 0.5
}
Text {
Layout.alignment: Qt.AlignHCenter
- text: modelData.state === SensorTagData.Connected ? "Connected" : "Disconnected"
+ text: modelData.state === SensorTagData.Disconnected ? "Disconnected"
+ : (modelData.state === SensorTagData.Scanning) ? "Scanning"
+ : (modelData.state === SensorTagData.Connected) ? "Connected"
+ : "Error"
color: "white"
font.pixelSize: 14
}