diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-03-13 13:13:42 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-03-13 14:47:30 +0000 |
commit | e89722d444c303897cdd7761d4fd13a98c48ec91 (patch) | |
tree | e299f7f5ef9793f17b3cbe6618529cf66fe89db5 /examples | |
parent | 95fe95a1deb654ca4b6900243b86632ba02f084e (diff) |
Wearable: cleanup AlarmsPage
Change-Id: I918e69a8396cf57dd685cc2116722618a3d7fda4
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml | 105 | ||||
-rw-r--r-- | examples/quickcontrols2/wearable/qml/Alarms/alarms.js | 65 | ||||
-rw-r--r-- | examples/quickcontrols2/wearable/wearable.qrc | 1 |
3 files changed, 31 insertions, 140 deletions
diff --git a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml index d44cc29f..e07908ee 100644 --- a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml +++ b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml @@ -51,7 +51,6 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 as QQC2 import "../Style" -import "alarms.js" as AlarmData Item { QQC2.SwipeView { @@ -59,86 +58,44 @@ Item { anchors.fill: parent - Item { - id: alarmsPage1 - - Column { - anchors.centerIn: parent - width: parent.width - spacing: 30 - - Row { - anchors.right: parent.right - anchors.rightMargin: 40 - height: 30 - QQC2.Switch { - id: alarmsPage1State - checked: AlarmData.weekdaysAlarmDefaultState() - } - } - - Text { - anchors.horizontalCenter: parent.horizontalCenter - height: 30 - text: AlarmData.weekdaysAlarm() - font.bold: alarmsPage1State.checked - font.pixelSize: alarmsPage1State.checked ? - UIStyle.fontSizeXL : UIStyle.fontSizeL - font.letterSpacing: 4 - color: UIStyle.colorQtGray1 - } - - Text { - anchors.horizontalCenter: parent.horizontalCenter - height: 30 - text: qsTr("Week Days") - font.pixelSize: UIStyle.fontSizeS - font.italic: true - font.bold: true - font.letterSpacing: 1 - color: UIStyle.colorQtGray2 - } + Repeater { + model: ListModel { + ListElement { name: qsTr("Week Days"); state: true; time: "06:00 AM" } + ListElement { name: qsTr("Week Ends"); state: false; time: "07:30 AM" } } - } - Item { - id: alarmsPage2 + Item { + Column { + spacing: 30 + anchors.centerIn: parent - Column { - anchors.centerIn: parent - width: parent.width - spacing: 30 - - Row { - anchors.right: parent.right - anchors.rightMargin: 40 - height: 30 QQC2.Switch { - id: alarmsPage2State - checked: AlarmData.weekendAlarmDefaultState() + id: stateSwitch + checked: model.state + anchors.left: nameLabel.right } - } - Text { - anchors.horizontalCenter: parent.horizontalCenter - height: 30 - text: AlarmData.weekendAlarm() - font.bold: alarmsPage2State.checked - font.pixelSize: alarmsPage2State.checked ? - UIStyle.fontSizeXL : UIStyle.fontSizeL - font.letterSpacing: 4 - color: UIStyle.colorQtGray1 - } + Text { + text: model.time + anchors.horizontalCenter: parent.horizontalCenter + verticalAlignment: Text.AlignVCenter + height: UIStyle.fontSizeXL + font.bold: stateSwitch.checked + font.pixelSize: stateSwitch.checked ? UIStyle.fontSizeXL : UIStyle.fontSizeL + font.letterSpacing: 4 + color: UIStyle.colorQtGray1 + } - Text { - anchors.horizontalCenter: parent.horizontalCenter - height: 30 - text: qsTr("Week Ends") - font.pixelSize: UIStyle.fontSizeS - font.italic: true - font.bold: true - font.letterSpacing: 1 - color: UIStyle.colorQtGray2 + Text { + id: nameLabel + text: model.name + anchors.horizontalCenter: parent.horizontalCenter + font.pixelSize: UIStyle.fontSizeS + font.italic: true + font.bold: true + font.letterSpacing: 1 + color: UIStyle.colorQtGray2 + } } } } diff --git a/examples/quickcontrols2/wearable/qml/Alarms/alarms.js b/examples/quickcontrols2/wearable/qml/Alarms/alarms.js deleted file mode 100644 index 7e81b183..00000000 --- a/examples/quickcontrols2/wearable/qml/Alarms/alarms.js +++ /dev/null @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $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$ -** -****************************************************************************/ - -function weekendAlarm() { - return "07:30 AM"; -} - -function weekendAlarmDefaultState() { - return false; -} - -function weekdaysAlarm() { - return "06:00 AM"; -} - -function weekdaysAlarmDefaultState() { - return true; -} diff --git a/examples/quickcontrols2/wearable/wearable.qrc b/examples/quickcontrols2/wearable/wearable.qrc index b512fbd7..a596fb63 100644 --- a/examples/quickcontrols2/wearable/wearable.qrc +++ b/examples/quickcontrols2/wearable/wearable.qrc @@ -6,7 +6,6 @@ <file>images/background.png</file> <file>images/back.png</file> <file>images/home.png</file> - <file>qml/Alarms/alarms.js</file> <file>qml/Alarms/AlarmsPage.qml</file> <file>qml/Alarms/images/alarms.png</file> <file>qml/Fitness/fitness.js</file> |