Merge pull request #50 from abranson/volume

Switch music volume controls to alter the system volume.

1 files changed, 10 insertions, 0 deletions

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