[nemo-qml-plugin-systemsettings] Store orientationLock in dconf

This also makes orientationLockChanged signal work.
sailfishos · Sep 5, 2014 · a25f40c · a25f40c
1 parent 9c0c57d
commit a25f40c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/rpm/nemo-qml-plugin-systemsettings.spec b/rpm/nemo-qml-plugin-systemsettings.spec
@@ -14,6 +14,7 @@ BuildRequires:  pkgconfig(qmsystem2-qt5)  >= 1.4.17
 BuildRequires:  pkgconfig(timed-qt5)
 BuildRequires:  pkgconfig(profile)
 BuildRequires:  pkgconfig(mce)
+BuildRequires:  pkgconfig(mlite5)
 
 %description
 %{summary}.

diff --git a/src/displaysettings.cpp b/src/displaysettings.cpp
@@ -33,6 +33,7 @@
 #include <mce/mode-names.h>
 #include "mceiface.h"
 #include "displaysettings.h"
+#include <MGConfItem>
 #include <QDebug>
 
 static const char *MceDisplayBrightness = "/system/osso/dsm/display/display_brightness";
@@ -45,9 +46,11 @@ static const char *MceDisplayUseAmbientLightSensor = "/system/osso/dsm/display/a
 static const char *MceDoubleTapMode = "/system/osso/dsm/doubletap/mode";
 
 DisplaySettings::DisplaySettings(QObject *parent)
-    : QObject(parent),
-      m_compositorSettings("nemomobile", "lipstick")
+    : QObject(parent)
 {
+    m_orientationLock = new MGConfItem("/lipstick/orientationLock", this);
+    connect(m_orientationLock, SIGNAL(valueChanged()), SIGNAL(orientationLockChanged()));
+
     m_mceIface = new ComNokiaMceRequestInterface(MCE_SERVICE, MCE_REQUEST_PATH, QDBusConnection::systemBus(), this);
     QDBusPendingReply<QDBusVariant> result = m_mceIface->get_config(QDBusObjectPath(MceDisplayBrightness));
     result.waitForFinished();
@@ -207,12 +210,12 @@ void DisplaySettings::setDoubleTapMode(int mode)
 
 QVariant DisplaySettings::orientationLock() const
 {
-    return m_compositorSettings.value("Compositor/orientationLock", "dynamic");
+    return m_orientationLock->value("dynamic");
 }
 
 void DisplaySettings::setOrientationLock(const QVariant &orientationLock)
 {
-    m_compositorSettings.setValue("Compositor/orientationLock", orientationLock);
+    m_orientationLock->set(orientationLock);
 }
 
 void DisplaySettings::configChange(const QString &key, const QDBusVariant &value)

diff --git a/src/displaysettings.h b/src/displaysettings.h
@@ -34,11 +34,11 @@
 
 #include <QObject>
 #include <QtQml>
-#include <QSettings>
 
 class ComNokiaMceRequestInterface;
 class ComNokiaMceSignalInterface;
 class QDBusVariant;
+class MGConfItem;
 
 class DisplaySettings: public QObject
 {
@@ -125,7 +125,7 @@ private slots:
 private:
     ComNokiaMceRequestInterface *m_mceIface;
     ComNokiaMceSignalInterface *m_mceSignalIface;
-    QSettings m_compositorSettings;
+    MGConfItem *m_orientationLock;
     int m_brightness;
     int m_dimTimeout;
     int m_blankTimeout;

diff --git a/src/src.pro b/src/src.pro
@@ -7,7 +7,7 @@ QT += qml dbus systeminfo
 QT -= gui
 
 CONFIG += link_pkgconfig
-PKGCONFIG += qmsystem2-qt5 profile
+PKGCONFIG += qmsystem2-qt5 profile mlite5
 
 system(qdbusxml2cpp -p mceiface.h:mceiface.cpp mce.xml)