summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew O'Doherty <andrew.odoherty@qt.io>2017-11-22 12:56:45 +0100
committerMaurice Kalinowski <maurice.kalinowski@qt.io>2017-11-23 12:14:18 +0000
commitc40611e0ec7a161d9bbdf3845684c27b031aa77a (patch)
tree0e74803afde6cddc2ea4e9d6353f0b43b11a494a
parentf9c7da64cea85d44998e62f4e0d3ec217a22f0d2 (diff)
iot-sensortag: Create a quit button SmartWatch demo
SmartWatch demo requires a button to exit the application Change-Id: I64f366d70960e868bcf9f4c644f81a145edd44b6 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
-rw-r--r--tradeshow/iot-sensortag/resources/base/TopToolbar.qml1
-rw-r--r--tradeshow/iot-sensortag/resources/watch/MainWatch.qml13
2 files changed, 14 insertions, 0 deletions
diff --git a/tradeshow/iot-sensortag/resources/base/TopToolbar.qml b/tradeshow/iot-sensortag/resources/base/TopToolbar.qml
index 3c92c05..bb0ecf9 100644
--- a/tradeshow/iot-sensortag/resources/base/TopToolbar.qml
+++ b/tradeshow/iot-sensortag/resources/base/TopToolbar.qml
@@ -175,6 +175,7 @@ Item {
id: utcGmt
text: "UTC/GMT"
color: "white"
+ visible: dateLabel.visible
anchors.left: timeLabel.right
anchors.leftMargin: 16
anchors.bottom: parent.bottom
diff --git a/tradeshow/iot-sensortag/resources/watch/MainWatch.qml b/tradeshow/iot-sensortag/resources/watch/MainWatch.qml
index 801c38b..5fd6153 100644
--- a/tradeshow/iot-sensortag/resources/watch/MainWatch.qml
+++ b/tradeshow/iot-sensortag/resources/watch/MainWatch.qml
@@ -236,5 +236,18 @@ Item {
height: 48
topbar.visible: false
date.visible: false
+ Image {
+ id: quit
+ source: "images/Toolbar/exit_button.png"
+ fillMode: Image.PreserveAspectFit
+ anchors.top: parent.top
+ anchors.right: parent.right
+ anchors.margins: 5
+ scale: 0.7
+ MouseArea {
+ anchors.fill: parent
+ onClicked: Qt.quit()
+ }
+ }
}
}