Skip to content

Commit

Permalink
[systemsettings] Add an orientation lock setting
Browse files Browse the repository at this point in the history
  • Loading branch information
Vesa Halttunen committed Jan 22, 2014
1 parent de63da6 commit 2b27254
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
13 changes: 12 additions & 1 deletion src/displaysettings.cpp
Expand Up @@ -42,7 +42,8 @@ static const char *MceDisplayUseAdaptiveDimming = "/system/osso/dsm/display/use_
static const char *MceDisplayUseAmbientLightSensor = "/system/osso/dsm/display/als_enabled";

DisplaySettings::DisplaySettings(QObject *parent)
: QObject(parent)
: QObject(parent),
m_compositorSettings("nemomobile", "lipstick")
{
m_mceIface = new ComNokiaMceRequestInterface(MCE_SERVICE, MCE_REQUEST_PATH, QDBusConnection::systemBus(), this);
QDBusPendingReply<QDBusVariant> result = m_mceIface->get_config(QDBusObjectPath(MceDisplayBrightness));
Expand Down Expand Up @@ -147,6 +148,16 @@ void DisplaySettings::setAmbientLightSensorEnabled(bool enabled)
}
}

QVariant DisplaySettings::orientationLock() const
{
return m_compositorSettings.value("Compositor/orientationLock", "dynamic");
}

void DisplaySettings::setOrientationLock(const QVariant &orientationLock)
{
m_compositorSettings.setValue("Compositor/orientationLock", orientationLock);
}

void DisplaySettings::configChange(const QString &key, const QDBusVariant &value)
{
if (key == MceDisplayBrightness) {
Expand Down
7 changes: 7 additions & 0 deletions src/displaysettings.h
Expand Up @@ -34,6 +34,7 @@

#include <QObject>
#include <QtQml>
#include <QSettings>

class ComNokiaMceRequestInterface;
class ComNokiaMceSignalInterface;
Expand All @@ -49,6 +50,7 @@ class DisplaySettings: public QObject
Q_PROPERTY(int blankTimeout READ blankTimeout WRITE setBlankTimeout NOTIFY blankTimeoutChanged)
Q_PROPERTY(bool adaptiveDimmingEnabled READ adaptiveDimmingEnabled WRITE setAdaptiveDimmingEnabled NOTIFY adaptiveDimmingEnabledChanged)
Q_PROPERTY(bool ambientLightSensorEnabled READ ambientLightSensorEnabled WRITE setAmbientLightSensorEnabled NOTIFY ambientLightSensorEnabledChanged)
Q_PROPERTY(QVariant orientationLock READ orientationLock WRITE setOrientationLock NOTIFY orientationLockChanged)

public:
explicit DisplaySettings(QObject *parent = 0);
Expand All @@ -70,19 +72,24 @@ class DisplaySettings: public QObject
bool ambientLightSensorEnabled() const;
void setAmbientLightSensorEnabled(bool);

QVariant orientationLock() const;
void setOrientationLock(const QVariant &);

signals:
void brightnessChanged();
void dimTimeoutChanged();
void blankTimeoutChanged();
void adaptiveDimmingEnabledChanged();
void ambientLightSensorEnabledChanged();
void orientationLockChanged();

private slots:
void configChange(const QString &key, const QDBusVariant &value);

private:
ComNokiaMceRequestInterface *m_mceIface;
ComNokiaMceSignalInterface *m_mceSignalIface;
QSettings m_compositorSettings;
int m_brightness;
int m_dimTimeout;
int m_blankTimeout;
Expand Down

0 comments on commit 2b27254

Please sign in to comment.