Merge branch 'master' into notifications

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

1 files changed, 9 insertions, 2 deletions

diff --git a/app/qml/pages/ManagerPage.qml b/app/qml/pages/ManagerPage.qml
index 92d79b1..a6b6699 100644
--- a/app/qml/pages/ManagerPage.qml
+++ b/app/qml/pages/ManagerPage.qml
@@ -32,10 +32,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 bool silentWhenConnected: false
+    }
+
     SilicaFlickable {
         anchors.fill: parent
 
@@ -121,10 +128,10 @@ Page {
             }
             TextSwitch {
                 text: qsTr("Silent when connected")
-                checked: false
+                checked: settings.silentWhenConnected
                 automaticCheck: false
                 onClicked: {
-                    console.log('settings.silentConnected');
+                    settings.silentWhenConnected = !settings.silentWhenConnected;
                 }
             }
         }