From 0ad8e201e428f237a5e25d63a70b28041653a3b8 Mon Sep 17 00:00:00 2001 From: Titta Heikkala Date: Tue, 7 Feb 2017 09:14:08 +0200 Subject: iot-sensortag: Added initial version of CloudSettings dialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A new dialog added for cloud settings. Change-Id: I4064a9b1658237911e373aa32567d34f6bb2583d Reviewed-by: Kari Hautamäki --- tradeshow/iot-sensortag/base.qrc | 1 + .../iot-sensortag/resources/base/CloudSettings.qml | 114 +++++++++++++++++++++ .../iot-sensortag/resources/base/TopToolbar.qml | 23 ++++- .../images/Toolbar/Cloud_button_change_active.png | Bin 0 -> 1206 bytes .../small/images/Toolbar/Cloud_icon_settings.png | Bin 0 -> 772 bytes tradeshow/iot-sensortag/uismall.qrc | 2 + 6 files changed, 135 insertions(+), 5 deletions(-) create mode 100644 tradeshow/iot-sensortag/resources/base/CloudSettings.qml create mode 100644 tradeshow/iot-sensortag/resources/small/images/Toolbar/Cloud_button_change_active.png create mode 100644 tradeshow/iot-sensortag/resources/small/images/Toolbar/Cloud_icon_settings.png (limited to 'tradeshow/iot-sensortag') diff --git a/tradeshow/iot-sensortag/base.qrc b/tradeshow/iot-sensortag/base.qrc index 798fb43..2bf8fb1 100644 --- a/tradeshow/iot-sensortag/base.qrc +++ b/tradeshow/iot-sensortag/base.qrc @@ -17,6 +17,7 @@ resources/base/GyroChart.qml resources/base/AccelChart.qml resources/base/SensorSettings.qml + resources/base/CloudSettings.qml resources/base/fonts/titilliumweb/TitilliumWeb-Bold.ttf resources/base/fonts/titilliumweb/TitilliumWeb-Regular.ttf resources/base/fonts/titilliumweb/TitilliumWeb-SemiBold.ttf diff --git a/tradeshow/iot-sensortag/resources/base/CloudSettings.qml b/tradeshow/iot-sensortag/resources/base/CloudSettings.qml new file mode 100644 index 0000000..1622ada --- /dev/null +++ b/tradeshow/iot-sensortag/resources/base/CloudSettings.qml @@ -0,0 +1,114 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of Qt for Device Creation. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +import QtQuick 2.0 +import Style 1.0 + +Rectangle { + id: mainRect + + width: 360 + height: 252 + color: "black" + + Text { + id: titleText + color: "white" + text: "CLOUD SETTINGS" + font.pixelSize: Style.indicatorTitleFontSize + anchors.horizontalCenter: parent.horizontalCenter + anchors.top: parent.top + anchors.topMargin: 8 + } + + Image { + id: icon + anchors.top: titleText.bottom + anchors.horizontalCenter: parent.horizontalCenter + anchors.margins: 8 + source: pathPrefix + "Toolbar/Cloud_icon_settings.png" + } + + Text { + id: connectText + color: "white" + text: "CONNECTED TO" + font.pixelSize: 16 + anchors.left: parent.left + anchors.leftMargin: 40 + anchors.top: icon.bottom + anchors.topMargin: 32 + } + + Rectangle { + anchors.fill: addressText + color: "white" + } + + Text { + id: addressText + text: "Address to cloud..." + color: "black" + font.pixelSize: 16 + anchors.left: parent.left + anchors.leftMargin: 40 + anchors.right: parent.right + anchors.rightMargin: 20 + anchors.top: connectText.bottom + anchors.topMargin: 2 + } + + Image { + id: changeIcon + anchors.bottom: parent.bottom + anchors.horizontalCenter: parent.horizontalCenter + anchors.margins: 8 + source: pathPrefix + "Toolbar/Cloud_button_change_active.png" + } +} diff --git a/tradeshow/iot-sensortag/resources/base/TopToolbar.qml b/tradeshow/iot-sensortag/resources/base/TopToolbar.qml index ce982c6..af6aba2 100644 --- a/tradeshow/iot-sensortag/resources/base/TopToolbar.qml +++ b/tradeshow/iot-sensortag/resources/base/TopToolbar.qml @@ -57,9 +57,15 @@ Item { height: 100 width: implicitWidth + CloudSettings { + id: cloudSettins + x: cloudItem.x + y: parent.height + visible: false + } + SensorSettings { id: sensorList - x: sensorItem.x y: parent.height visible: false @@ -93,6 +99,11 @@ Item { anchors.left: icon.right anchors.margins: 8 } + + MouseArea { + anchors.fill: parent + onClicked: cloudSettins.visible = !cloudSettins.visible + } } Item { @@ -100,6 +111,8 @@ Item { height: topToolbar.height anchors.top: parent.top anchors.left: cloudItem.right + width: sensorIcon.width + sensorButton.width + 3 * anchors.leftMargin + Image { id: sensorIcon @@ -126,11 +139,11 @@ Item { anchors.verticalCenter: sensorIcon.verticalCenter anchors.left: sensorIcon.right anchors.margins: 8 + } - MouseArea { - anchors.fill: parent - onClicked: sensorList.visible = !sensorList.visible - } + MouseArea { + anchors.fill: parent + onClicked: sensorList.visible = !sensorList.visible } } diff --git a/tradeshow/iot-sensortag/resources/small/images/Toolbar/Cloud_button_change_active.png b/tradeshow/iot-sensortag/resources/small/images/Toolbar/Cloud_button_change_active.png new file mode 100644 index 0000000..6ecc7d3 Binary files /dev/null and b/tradeshow/iot-sensortag/resources/small/images/Toolbar/Cloud_button_change_active.png differ diff --git a/tradeshow/iot-sensortag/resources/small/images/Toolbar/Cloud_icon_settings.png b/tradeshow/iot-sensortag/resources/small/images/Toolbar/Cloud_icon_settings.png new file mode 100644 index 0000000..a3c8972 Binary files /dev/null and b/tradeshow/iot-sensortag/resources/small/images/Toolbar/Cloud_icon_settings.png differ diff --git a/tradeshow/iot-sensortag/uismall.qrc b/tradeshow/iot-sensortag/uismall.qrc index bed3596..aeb9c66 100644 --- a/tradeshow/iot-sensortag/uismall.qrc +++ b/tradeshow/iot-sensortag/uismall.qrc @@ -25,5 +25,7 @@ resources/small/images/AmbientTemperature/temp_ring.png resources/small/images/AmbientTemperature/temp_sensor.png resources/small/images/Magnetometer/grid.png + resources/small/images/Toolbar/Cloud_button_change_active.png + resources/small/images/Toolbar/Cloud_icon_settings.png -- cgit v1.2.3