diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-12 10:43:05 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-12 10:46:51 +0200 |
commit | 55df38263ee7902eff15ab452fa8bc222fcf07b3 (patch) | |
tree | a4ee5425e2dbc870ac4ce72e8435a4e39f6e3dca /tradeshow | |
parent | a028e8328056979f09e3dd35ded54890dbef1fd9 (diff) | |
parent | f8bbf6dd890c1d111bda52bf83e8c6c90213844e (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
* origin/5.10:
Doc: Bump version to 5.10.1
iot-sensortag: Add an About tab
iot-sensortag: Fix build against 5.10.0
iot-sensortag: Create a quit button SmartWatch demo
Change-Id: I247db054b05cb481c67b08cd42fb762f5539460c
Diffstat (limited to 'tradeshow')
-rw-r--r-- | tradeshow/iot-sensortag/mqttdataprovider.cpp | 2 | ||||
-rw-r--r-- | tradeshow/iot-sensortag/resources/base/TopToolbar.qml | 1 | ||||
-rw-r--r-- | tradeshow/iot-sensortag/resources/watch/MainWatch.qml | 61 | ||||
-rw-r--r-- | tradeshow/iot-sensortag/resources/watch/images/BuiltWithQt.png | bin | 0 -> 22172 bytes | |||
-rw-r--r-- | tradeshow/iot-sensortag/uiwatch.qrc | 1 |
5 files changed, 64 insertions, 1 deletions
diff --git a/tradeshow/iot-sensortag/mqttdataprovider.cpp b/tradeshow/iot-sensortag/mqttdataprovider.cpp index 8985f02..16bc096 100644 --- a/tradeshow/iot-sensortag/mqttdataprovider.cpp +++ b/tradeshow/iot-sensortag/mqttdataprovider.cpp @@ -108,7 +108,7 @@ void MqttDataProvider::reset() void MqttDataProvider::messageReceived(const QMqttMessage &msg) { - parseMessage(msg.payload(), msg.topic()); + parseMessage(msg.payload(), msg.topic().name()); if (!m_pollTimer->isActive()) m_pollTimer->start(); } 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..5a500a2 100644 --- a/tradeshow/iot-sensortag/resources/watch/MainWatch.qml +++ b/tradeshow/iot-sensortag/resources/watch/MainWatch.qml @@ -226,6 +226,54 @@ Item { title: "" } } + + Item { + Text { + text: qsTr("About") + anchors.fill: parent + color: "white" + font.pixelSize: titleFontSize + } + + Rectangle { + id: aboutView + width: swipePane.width + height: swipePane.height + color: "transparent" + + ColumnLayout { + id: aboutLayout + width: parent.width * 0.8 + height: parent.width * 0.8 + anchors.centerIn: parent + + Image { + source: "images/BuiltWithQt.png" + fillMode: Image.PreserveAspectFit + width: parent.width + Layout.maximumWidth: parent.width - 20 + Layout.maximumHeight: 100 + anchors.horizontalCenter: parent.horizontalCenter + } + + Text { + id: qtLinkLabel + color: "white" + text: "Visit us at http://qt.io" + anchors.horizontalCenter: parent.horizontalCenter + font.pixelSize: Style.indicatorTitleSize + } + + Text { + color: "white" + text: "qt.io/demos/IoTScale" + anchors.horizontalCenter: parent.horizontalCenter + font.pixelSize: Style.indicatorTitleSize + } + } + } + } + } TopToolbar { @@ -236,5 +284,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() + } + } } } diff --git a/tradeshow/iot-sensortag/resources/watch/images/BuiltWithQt.png b/tradeshow/iot-sensortag/resources/watch/images/BuiltWithQt.png Binary files differnew file mode 100644 index 0000000..7e56de7 --- /dev/null +++ b/tradeshow/iot-sensortag/resources/watch/images/BuiltWithQt.png diff --git a/tradeshow/iot-sensortag/uiwatch.qrc b/tradeshow/iot-sensortag/uiwatch.qrc index 74093da..5167663 100644 --- a/tradeshow/iot-sensortag/uiwatch.qrc +++ b/tradeshow/iot-sensortag/uiwatch.qrc @@ -30,5 +30,6 @@ <file>resources/small/images/Gyro/gyro_ring2.png</file> <file>resources/small/images/Gyro/gyro_ring3.png</file> <file>resources/small/images/Gyro/gyro_outer.png</file> + <file>resources/watch/images/BuiltWithQt.png</file> </qresource> </RCC> |