From 863a1a085e83780e8f6eff8a19ab4322a7f5e28a Mon Sep 17 00:00:00 2001 From: Tomasz Sterna Date: Fri, 27 Jun 2014 19:14:41 +0200 Subject: Renamed waterwatch -> pebble --- app/qml/cover/CoverPage.qml | 2 +- app/qml/pages/WatchPage.qml | 2 +- app/qml/pebble.qml | 40 ++++++++++++++++++++++++++++++++++++++++ app/qml/waterwatch.qml | 42 ------------------------------------------ 4 files changed, 42 insertions(+), 44 deletions(-) create mode 100644 app/qml/pebble.qml delete mode 100644 app/qml/waterwatch.qml (limited to 'app/qml') diff --git a/app/qml/cover/CoverPage.qml b/app/qml/cover/CoverPage.qml index aaa33c6..06340aa 100644 --- a/app/qml/cover/CoverPage.qml +++ b/app/qml/cover/CoverPage.qml @@ -36,7 +36,7 @@ CoverBackground { Label { id: label anchors.centerIn: parent - text: "WaterWatch" + text: "Pebble" } Label { anchors.top: label.bottom diff --git a/app/qml/pages/WatchPage.qml b/app/qml/pages/WatchPage.qml index 623c47e..6ffd06b 100644 --- a/app/qml/pages/WatchPage.qml +++ b/app/qml/pages/WatchPage.qml @@ -221,7 +221,7 @@ Page { width: page.width spacing: Theme.paddingLarge PageHeader { - title: "WaterWatch" + title: "Pebble Manager" } Label { visible: !watchConnector.isConnected diff --git a/app/qml/pebble.qml b/app/qml/pebble.qml new file mode 100644 index 0000000..c0085f1 --- /dev/null +++ b/app/qml/pebble.qml @@ -0,0 +1,40 @@ +/* + Copyright (C) 2014 Jouni Roivas + Copyright (C) 2013 Jolla Ltd. + Contact: Thomas Perl + 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 authors 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 "pages" + +ApplicationWindow +{ + initialPage: WatchPage { id: watchPage } + cover: Qt.resolvedUrl("cover/CoverPage.qml") +} diff --git a/app/qml/waterwatch.qml b/app/qml/waterwatch.qml deleted file mode 100644 index cf65076..0000000 --- a/app/qml/waterwatch.qml +++ /dev/null @@ -1,42 +0,0 @@ -/* - Copyright (C) 2014 Jouni Roivas - Copyright (C) 2013 Jolla Ltd. - Contact: Thomas Perl - 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 authors 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 "pages" - -ApplicationWindow -{ - initialPage: WatchPage { id: watchPage } - cover: Qt.resolvedUrl("cover/CoverPage.qml") -} - - -- cgit v1.2.3