From 2444e187bca15832c25845d69789e7926a23f170 Mon Sep 17 00:00:00 2001 From: Titta Heikkala Date: Wed, 8 Feb 2017 13:55:14 +0200 Subject: iot-sensortag: Add all states to sensor settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added 'Scanning' and 'Error' states to sensor settings. Change-Id: Ib207170c00994873bbfcbf86cb6aaa541bf93101 Reviewed-by: Kari Hautamäki --- tradeshow/iot-sensortag/resources/base/SensorSettings.qml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'tradeshow') 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 } -- cgit v1.2.3