summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Sterna <tomek@xiaoka.com>2014-06-27 19:14:41 +0200
committerTomasz Sterna <tomek@xiaoka.com>2014-06-27 19:14:41 +0200
commit863a1a085e83780e8f6eff8a19ab4322a7f5e28a (patch)
treef1d9547811d21ec817a07c6fcd8badb8d246bbb0
parent471ff6ca72cd75f8d4df7e0810a6bfed4bf2c3e3 (diff)
Renamed waterwatch -> pebble
-rw-r--r--app/app.pro13
-rw-r--r--app/pebble.cpp (renamed from app/waterwatch.cpp)0
-rw-r--r--app/pebble.desktop (renamed from app/waterwatch.desktop)6
-rw-r--r--app/pebble.pngbin0 -> 4639 bytes
-rw-r--r--app/qml/cover/CoverPage.qml2
-rw-r--r--app/qml/pages/WatchPage.qml2
-rw-r--r--app/qml/pebble.qml (renamed from app/qml/waterwatch.qml)2
-rw-r--r--app/waterwatch.pngbin1725 -> 0 bytes
-rw-r--r--pebble.pro (renamed from waterwatch.pro)4
-rw-r--r--rpm/pebble.yaml (renamed from rpm/waterwatch.yaml)10
10 files changed, 20 insertions, 19 deletions
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/waterwatch.cpp b/app/pebble.cpp
index 46e6298..46e6298 100644
--- a/app/waterwatch.cpp
+++ b/app/pebble.cpp
diff --git a/app/waterwatch.desktop b/app/pebble.desktop
index 4ddba76..ce05073 100644
--- a/app/waterwatch.desktop
+++ b/app/pebble.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
X-Nemo-Application-Type=silica-qt5
-Name=waterwatch
-Icon=waterwatch
-Exec=waterwatch
+Name=Pebble
+Icon=pebble
+Exec=pebble
diff --git a/app/pebble.png b/app/pebble.png
new file mode 100644
index 0000000..9f4a657
--- /dev/null
+++ b/app/pebble.png
Binary files 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/waterwatch.qml b/app/qml/pebble.qml
index cf65076..c0085f1 100644
--- a/app/qml/waterwatch.qml
+++ b/app/qml/pebble.qml
@@ -38,5 +38,3 @@ ApplicationWindow
initialPage: WatchPage { id: watchPage }
cover: Qt.resolvedUrl("cover/CoverPage.qml")
}
-
-
diff --git a/app/waterwatch.png b/app/waterwatch.png
deleted file mode 100644
index f4aaeeb..0000000
--- a/app/waterwatch.png
+++ /dev/null
Binary files differ
diff --git a/waterwatch.pro b/pebble.pro
index 74f613f..2143349 100644
--- a/waterwatch.pro
+++ b/pebble.pro
@@ -2,5 +2,5 @@ TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS = lib daemon app
OTHER_FILES += \
- rpm/waterwatch.spec \
- rpm/waterwatch.yaml
+ rpm/pebble.spec \
+ rpm/pebble.yaml
diff --git a/rpm/waterwatch.yaml b/rpm/pebble.yaml
index 2fe3598..7495643 100644
--- a/rpm/waterwatch.yaml
+++ b/rpm/pebble.yaml
@@ -1,9 +1,9 @@
-Name: waterwatch
+Name: pebble
Summary: Support for Pebble watch in SailfishOS
Version: 0.1
Release: 1
Group: Qt/Qt
-URL: http://example.org/
+URL: http://getpebble.com/
License: BSD
Sources:
- '%{name}-%{version}.tar.xz'
@@ -29,7 +29,7 @@ Files:
- '%{_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.*'
+- '%{_libdir}/systemd/user/%{name}d.service'
+- '%{_libdir}/systemd/user/user-session.target.wants/%{name}d.service'
+- '%{_libdir}/lib%{name}.so.*'
PkgBR: []