3 files changed, 39 insertions, 2 deletions
diff --git a/app/qml/pages/AboutPage.qml b/app/qml/pages/AboutPage.qml
index 86a05c5..fec0fb5 100644
--- a/app/qml/pages/AboutPage.qml
+++ b/app/qml/pages/AboutPage.qml
@@ -33,7 +33,7 @@ Page {
                 color: Theme.highlightColor
                 width: parent.width
                 horizontalAlignment: Text.AlignHCenter
-                text: "© 2014 Tomasz Sterna / Xiaoka.com\n" + qsTr("All Rights Reserved.")
+                text: "© 2014-2015 Tomasz Sterna / Xiaoka.com\n" + qsTr("All Rights Reserved.")
             }
             Label {
                 wrapMode: Text.Wrap
@@ -73,6 +73,19 @@ Page {
                 wrapMode: Text.Wrap
                 text: qsTr("Your donations help justify development time.")
             }
+            Label {
+                visible: !!donate.active
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: Theme.paddingLarge
+                }
+                font.pixelSize: Theme.fontSizeLarge
+                font.italic: true
+                color: Theme.highlightColor
+                wrapMode: Text.Wrap
+                text: qsTr("Thank you for your support!!!")
+            }
             Button {
                 text: qsTr("PayPal Donate")
                 anchors {
diff --git a/app/qml/pages/Disclaimer.qml b/app/qml/pages/Disclaimer.qml
index baf5cd0..57511fd 100644
--- a/app/qml/pages/Disclaimer.qml
+++ b/app/qml/pages/Disclaimer.qml
@@ -1,10 +1,17 @@
 import QtQuick 2.0
 import QtQml 2.1
 import Sailfish.Silica 1.0
+import org.nemomobile.configuration 1.0
 
 Page {
     id: page
 
+    ConfigurationGroup {
+        id: settings
+        path: "/org/pebbled/settings"
+        property string donationCode: ""
+    }
+
     SilicaFlickable {
         id: flickable
         anchors.fill: parent
@@ -54,7 +61,7 @@ Page {
                     right: parent.right
                     margins: Theme.paddingLarge * 2
                 }
-                onClicked: Qt.openUrlExternally("mailto:support@xiaoka.com?subject=pebbled code request - "+
+                onClicked: Qt.openUrlExternally("mailto:support@pebbled.org?subject=pebbled code request - "+
                                                 donate.id + "&body=My paypal id is: ")
             }
             Label {
@@ -72,7 +79,14 @@ Page {
                     margins: Theme.paddingMedium
                 }
                 focus: true
+                text: settings.donationCode
+                onTextChanged: settings.donationCode = text
             }
         }
     }
+
+    Connections {
+        target: donate
+        onActiveChanged: if(donate.active) pageStack.pop()
+    }
 }
diff --git a/app/qml/pages/ManagerPage.qml b/app/qml/pages/ManagerPage.qml
index 894797d..7fb7369 100644
--- a/app/qml/pages/ManagerPage.qml
+++ b/app/qml/pages/ManagerPage.qml
@@ -11,6 +11,7 @@ Page {
         path: "/org/pebbled/settings"
         property bool silentWhenConnected: false
         property bool transliterateMessage: false
+        property bool useSystemVolume: true
         property bool incomingCallNotification: true
         property bool notificationsCommhistoryd: true
         property bool notificationsMissedCall: true
@@ -133,6 +134,15 @@ Page {
                 }
             }
             TextSwitch {
+                text: qsTr("Control main volume")
+                description: qsTr("Pebble music volume buttons change the main phone volume directly instead of through the music player.")
+                checked: settings.useSystemVolume
+                automaticCheck: true
+                onClicked: {
+                    settings.useSystemVolume = !settings.useSystemVolume;
+                }
+            }
+            TextSwitch {
                 text: qsTr("Transliterate messages")
                 description: qsTr("Messages are transliterated to ASCII before sending to Pebble")
                 checked: settings.transliterateMessage