Merge branch 'master' into notifications

Conflicts:
	daemon/daemon.cpp
	daemon/manager.cpp
	daemon/manager.h

5 files changed, 87 insertions, 2 deletions

diff --git a/app/app.pro b/app/app.pro
index 48aff06..cb4c33b 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -5,6 +5,8 @@ CONFIG += sailfishapp
 QT += dbus
 QMAKE_CXXFLAGS += -std=c++0x
 
+DEFINES += APP_VERSION=\\\"$$VERSION\\\"
+
 SOURCES += \
     pebble.cpp \
     pebbledinterface.cpp
@@ -16,6 +18,8 @@ OTHER_FILES += \
     qml/cover/CoverPage.qml \
     qml/pages/ManagerPage.qml \
     qml/pages/WatchPage.qml \
+    qml/pages/AboutPage.qml \
     qml/pebble.qml \
+    qml/images/* \
     pebble.desktop \
     pebble.png
diff --git a/app/pebble.cpp b/app/pebble.cpp
index b2f4d09..44f1aeb 100644
--- a/app/pebble.cpp
+++ b/app/pebble.cpp
@@ -39,6 +39,13 @@ int main(int argc, char *argv[])
     // Register Pebble daemon interface object on QML side
     qmlRegisterType<PebbledInterface>("org.pebbled", 0, 1, "PebbledInterface");
 
-    return SailfishApp::main(argc, argv);
+    QScopedPointer<QGuiApplication> app(SailfishApp::application(argc, argv));
+
+    QScopedPointer<QQuickView> view(SailfishApp::createView());
+    view->rootContext()->setContextProperty("APP_VERSION", APP_VERSION);
+    view->setSource(SailfishApp::pathTo("qml/pebble.qml"));
+    view->show();
+
+    return app->exec();
 }
 
diff --git a/app/qml/images/btn_donate.png b/app/qml/images/btn_donate.png
new file mode 100644
index 0000000..3777e64
--- /dev/null
+++ b/app/qml/images/btn_donate.png
diff --git a/app/qml/pages/AboutPage.qml b/app/qml/pages/AboutPage.qml
new file mode 100644
index 0000000..6d8d18e
--- /dev/null
+++ b/app/qml/pages/AboutPage.qml
@@ -0,0 +1,68 @@
+import QtQuick 2.0
+import QtQml 2.1
+import Sailfish.Silica 1.0
+
+Page {
+    id: page
+
+    SilicaFlickable {
+        anchors.fill: parent
+
+        contentHeight: column.height
+
+        Column {
+            id: column
+            width: page.width
+            spacing: Theme.paddingMedium
+
+            PageHeader {
+                title: "pebbled"
+            }
+            Label {
+                text: qsTr("Version ") + APP_VERSION
+                horizontalAlignment: Text.AlignRight
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: Theme.paddingLarge
+                }
+            }
+            Label {
+                color: Theme.highlightColor
+                width: parent.width
+                horizontalAlignment: Text.AlignHCenter
+                text: "© 2014 Tomasz Sterna / Xiaoka.com\nAll Rights Reserved."
+            }
+            Label {
+                wrapMode: Text.Wrap
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: Theme.paddingSmall
+                }
+                font.pixelSize: Theme.fontSizeTiny
+                horizontalAlignment: Text.AlignJustify
+                text: qsTr(
+"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.")
+            }
+            IconButton {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: Theme.paddingMedium
+                }
+                icon.source: "../images/btn_donate.png"
+                onClicked: Qt.openUrlExternally("https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MAGN86VCARBSA")
+            }
+        }
+    }
+}
diff --git a/app/qml/pages/ManagerPage.qml b/app/qml/pages/ManagerPage.qml
index a6b6699..6f94e4b 100644
--- a/app/qml/pages/ManagerPage.qml
+++ b/app/qml/pages/ManagerPage.qml
@@ -45,9 +45,15 @@ Page {
 
     SilicaFlickable {
         anchors.fill: parent
-
         contentHeight: column.height
 
+        PullDownMenu {
+            MenuItem {
+                text: qsTr("About")
+                onClicked: pageStack.push(Qt.resolvedUrl("AboutPage.qml"))
+            }
+        }
+
         Column {
             id: column