diff options
Diffstat (limited to 'qml')
| -rw-r--r-- | qml/cover/CoverPage.qml | 71 | ||||
| -rw-r--r-- | qml/pages/MainPage.qml | 1 | ||||
| -rw-r--r-- | qml/watch/WatchView.qml (renamed from qml/pages/WatchView.qml) | 3 |
3 files changed, 37 insertions, 38 deletions
diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml index e6c3216..a561eba 100644 --- a/qml/cover/CoverPage.qml +++ b/qml/cover/CoverPage.qml @@ -1,42 +1,41 @@ -/* - Copyright (C) 2013 Jolla Ltd. - Contact: Thomas Perl <thomas.perl@jollamobile.com> - All rights reserved. - - You may use this file under the terms of 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 Jolla 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 HOLDERS 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. -*/ - import QtQuick 2.0 import Sailfish.Silica 1.0 +import org.nemomobile.configuration 1.0 +import "../watch" CoverBackground { - Label { - id: label - anchors.centerIn: parent - text: "Salmeta" - } -} + ConfigurationValue { + id: curPageSetting + key: curSettingsPrefix + "/cur-page" + defaultValue: 0 + onValueChanged: { + if (watchView.curPage !== value) { + watchView.switchToPage(value); + } + } + } + Column { + anchors.centerIn: parent + spacing: Theme.paddingLarge + + Item { + width: 96 * 2 + height: 96 * 2 + anchors.horizontalCenter: parent.horizontalCenter + + WatchView { + id: watchView + anchors.centerIn: parent + scale: 2 + } + } + + Label { + id: label + anchors.horizontalCenter: parent.horizontalCenter + text: "Salmeta" + } + } +} diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml index 9014a48..6b2893a 100644 --- a/qml/pages/MainPage.qml +++ b/qml/pages/MainPage.qml @@ -2,6 +2,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import Sailfish.Bluetooth 1.0 import org.nemomobile.configuration 1.0 +import "../watch" Page { id: page diff --git a/qml/pages/WatchView.qml b/qml/watch/WatchView.qml index a5d755e..ca880eb 100644 --- a/qml/pages/WatchView.qml +++ b/qml/watch/WatchView.qml @@ -1,5 +1,4 @@ import QtQuick 2.0 -import "../watch" Flickable { id: watchView @@ -15,7 +14,7 @@ Flickable { model: curWidgets editMode: true onEmptyWidgetClicked: { - pageStack.push(Qt.resolvedUrl("AddWidget.qml"), { + pageStack.push(Qt.resolvedUrl("../pages/AddWidget.qml"), { 'addToPage': page, 'addToPos': pos }); |