Merge branch 'master' into notifications

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

1 files changed, 25 insertions, 0 deletions

diff --git a/daemon/settings.h b/daemon/settings.h
new file mode 100644
index 0000000..50ffd86
--- /dev/null
+++ b/daemon/settings.h
@@ -0,0 +1,25 @@
+#ifndef SETTINGS_H
+#define SETTINGS_H
+
+#include <MDConfGroup>
+
+class Settings : public MDConfGroup
+{
+    Q_OBJECT
+
+    Q_PROPERTY(bool silentWhenConnected MEMBER silentWhenConnected NOTIFY silentWhenConnectedChanged)
+    bool silentWhenConnected;
+
+public:
+    explicit Settings(QObject *parent = 0) :
+        MDConfGroup("/org/pebbled/settings", parent, BindProperties)
+    { resolveMetaObject(); }
+
+signals:
+    void silentWhenConnectedChanged(bool);
+
+public slots:
+
+};
+
+#endif // SETTINGS_H