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/app.pro | 13 ++++++++----- app/pebble.cpp | 46 ++++++++++++++++++++++++++++++++++++++++++++ app/pebble.desktop | 7 +++++++ app/pebble.png | Bin 0 -> 4639 bytes app/qml/cover/CoverPage.qml | 2 +- app/qml/pages/WatchPage.qml | 2 +- app/qml/pebble.qml | 40 ++++++++++++++++++++++++++++++++++++++ app/qml/waterwatch.qml | 42 ---------------------------------------- app/waterwatch.cpp | 46 -------------------------------------------- app/waterwatch.desktop | 7 ------- app/waterwatch.png | Bin 1725 -> 0 bytes pebble.pro | 6 ++++++ rpm/pebble.yaml | 35 +++++++++++++++++++++++++++++++++ rpm/waterwatch.yaml | 35 --------------------------------- waterwatch.pro | 6 ------ 15 files changed, 144 insertions(+), 143 deletions(-) create mode 100644 app/pebble.cpp create mode 100644 app/pebble.desktop create mode 100644 app/pebble.png create mode 100644 app/qml/pebble.qml delete mode 100644 app/qml/waterwatch.qml delete mode 100644 app/waterwatch.cpp delete mode 100644 app/waterwatch.desktop delete mode 100644 app/waterwatch.png create mode 100644 pebble.pro create mode 100644 rpm/pebble.yaml delete mode 100644 rpm/waterwatch.yaml delete mode 100644 waterwatch.pro diff --git a/app/app.pro b/app/app.pro index c7e6928..c9156f0 100644 --- a/app/app.pro +++ b/app/app.pro @@ -1,8 +1,9 @@ -TARGET = waterwatch +TARGET = pebble CONFIG += sailfishapp -SOURCES += waterwatch.cpp +SOURCES += \ + pebble.cpp INCLUDEPATH += ../lib LIBS += -L$$OUT_PWD/../lib -lpebble @@ -10,7 +11,9 @@ LIBS += -L$$OUT_PWD/../lib -lpebble QT += bluetooth QMAKE_CXXFLAGS += -std=c++0x -OTHER_FILES += qml/waterwatch.qml \ +OTHER_FILES += \ qml/cover/CoverPage.qml \ - waterwatch.desktop \ - qml/pages/WatchPage.qml + qml/pages/WatchPage.qml \ + qml/pebble.qml \ + pebble.desktop \ + pebble.png diff --git a/app/pebble.cpp b/app/pebble.cpp new file mode 100644 index 0000000..46e6298 --- /dev/null +++ b/app/pebble.cpp @@ -0,0 +1,46 @@ +/* + 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. +*/ + +#include + +#include +#include "watchconnector.h" + +using namespace watch; + +int main(int argc, char *argv[]) +{ + // Registert WatchController object on QML side + qmlRegisterType("watch", 0, 1, "WatchConnector"); + + return SailfishApp::main(argc, argv); +} + diff --git a/app/pebble.desktop b/app/pebble.desktop new file mode 100644 index 0000000..ce05073 --- /dev/null +++ b/app/pebble.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +X-Nemo-Application-Type=silica-qt5 +Name=Pebble +Icon=pebble +Exec=pebble + diff --git a/app/pebble.png b/app/pebble.png new file mode 100644 index 0000000..9f4a657 Binary files /dev/null and b/app/pebble.png differ 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") -} - - diff --git a/app/waterwatch.cpp b/app/waterwatch.cpp deleted file mode 100644 index 46e6298..0000000 --- a/app/waterwatch.cpp +++ /dev/null @@ -1,46 +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. -*/ - -#include - -#include -#include "watchconnector.h" - -using namespace watch; - -int main(int argc, char *argv[]) -{ - // Registert WatchController object on QML side - qmlRegisterType("watch", 0, 1, "WatchConnector"); - - return SailfishApp::main(argc, argv); -} - diff --git a/app/waterwatch.desktop b/app/waterwatch.desktop deleted file mode 100644 index 4ddba76..0000000 --- a/app/waterwatch.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Type=Application -X-Nemo-Application-Type=silica-qt5 -Name=waterwatch -Icon=waterwatch -Exec=waterwatch - diff --git a/app/waterwatch.png b/app/waterwatch.png deleted file mode 100644 index f4aaeeb..0000000 Binary files a/app/waterwatch.png and /dev/null differ diff --git a/pebble.pro b/pebble.pro new file mode 100644 index 0000000..2143349 --- /dev/null +++ b/pebble.pro @@ -0,0 +1,6 @@ +TEMPLATE = subdirs +CONFIG += ordered +SUBDIRS = lib daemon app +OTHER_FILES += \ + rpm/pebble.spec \ + rpm/pebble.yaml diff --git a/rpm/pebble.yaml b/rpm/pebble.yaml new file mode 100644 index 0000000..7495643 --- /dev/null +++ b/rpm/pebble.yaml @@ -0,0 +1,35 @@ +Name: pebble +Summary: Support for Pebble watch in SailfishOS +Version: 0.1 +Release: 1 +Group: Qt/Qt +URL: http://getpebble.com/ +License: BSD +Sources: +- '%{name}-%{version}.tar.xz' +Description: | + Include support for Pebble watch to receive event from SailfishOS device. Communicates via Bluetooth, supporting the Pebble protocol. +Configure: none +Builder: qtc5 +PkgConfigBR: +- Qt5DBus +- Qt5Bluetooth +- Qt5Contacts +- Qt5Quick +- Qt5Qml +- Qt5Core +- sailfishapp >= 0.0.10 +Requires: +- sailfishsilica-qt5 >= 0.10.9 +- systemd-user-session-targets +AutoSubPackages: +- devel +Files: +- '%{_bindir}' +- '%{_datadir}/%{name}/qml' +- '%{_datadir}/applications/%{name}.desktop' +- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png' +- '%{_libdir}/systemd/user/%{name}d.service' +- '%{_libdir}/systemd/user/user-session.target.wants/%{name}d.service' +- '%{_libdir}/lib%{name}.so.*' +PkgBR: [] diff --git a/rpm/waterwatch.yaml b/rpm/waterwatch.yaml deleted file mode 100644 index 2fe3598..0000000 --- a/rpm/waterwatch.yaml +++ /dev/null @@ -1,35 +0,0 @@ -Name: waterwatch -Summary: Support for Pebble watch in SailfishOS -Version: 0.1 -Release: 1 -Group: Qt/Qt -URL: http://example.org/ -License: BSD -Sources: -- '%{name}-%{version}.tar.xz' -Description: | - Include support for Pebble watch to receive event from SailfishOS device. Communicates via Bluetooth, supporting the Pebble protocol. -Configure: none -Builder: qtc5 -PkgConfigBR: -- Qt5DBus -- Qt5Bluetooth -- Qt5Contacts -- Qt5Quick -- Qt5Qml -- Qt5Core -- sailfishapp >= 0.0.10 -Requires: -- sailfishsilica-qt5 >= 0.10.9 -- systemd-user-session-targets -AutoSubPackages: -- devel -Files: -- '%{_bindir}' -- '%{_datadir}/%{name}/qml' -- '%{_datadir}/applications/%{name}.desktop' -- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png' -- '%{_libdir}/systemd/user/pebbled.service' -- '%{_libdir}/systemd/user/user-session.target.wants/pebbled.service' -- '%{_libdir}/libpebble.so.*' -PkgBR: [] diff --git a/waterwatch.pro b/waterwatch.pro deleted file mode 100644 index 74f613f..0000000 --- a/waterwatch.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = subdirs -CONFIG += ordered -SUBDIRS = lib daemon app -OTHER_FILES += \ - rpm/waterwatch.spec \ - rpm/waterwatch.yaml -- cgit v1.2.3