Skip to content

Commit

Permalink
Add populated to displaysettings.
Browse files Browse the repository at this point in the history
[display] Add populated signal for display settings. Contributes to JB#41765

Signed-off-by: Marko Saukko <marko.saukko@jolla.com>
  • Loading branch information
saukko committed Jun 21, 2018
1 parent ea17c2c commit af1d3d1
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
8 changes: 8 additions & 0 deletions src/displaysettings.cpp
Expand Up @@ -68,6 +68,7 @@ DisplaySettings::DisplaySettings(QObject *parent)
m_doubleTapMode = true;
m_lidSensorFilteringEnabled = true;
m_lidSensorEnabled = true;
m_populated = false;

/* Setup change listener & get current values via async query */
m_mceSignalIface = new ComNokiaMceSignalInterface(MCE_SERVICE, MCE_SIGNAL_PATH, QDBusConnection::systemBus(), this);
Expand All @@ -94,6 +95,8 @@ void DisplaySettings::configReply(QDBusPendingCallWatcher *watcher)
i.next();
updateConfig(i.key(), i.value());
}
m_populated = true;
emit populatedChanged();
}

watcher->deleteLater();
Expand Down Expand Up @@ -275,6 +278,11 @@ bool DisplaySettings::flipoverGestureEnabled() const
return m_flipoverGestureEnabled;
}

bool DisplaySettings::populated() const
{
return m_populated;
}

void DisplaySettings::setFlipoverGestureEnabled(bool enabled)
{
if (m_flipoverGestureEnabled != enabled) {
Expand Down
6 changes: 5 additions & 1 deletion src/displaysettings.h
Expand Up @@ -62,6 +62,7 @@ class SYSTEMSETTINGS_EXPORT DisplaySettings: public QObject
Q_PROPERTY(bool lidSensorEnabled READ lidSensorEnabled WRITE setLidSensorEnabled NOTIFY lidSensorEnabledChanged)
Q_PROPERTY(bool lidSensorFilteringEnabled READ lidSensorFilteringEnabled WRITE setLidSensorFilteringEnabled NOTIFY lidSensorFilteringEnabledChanged)
Q_PROPERTY(bool flipoverGestureEnabled READ flipoverGestureEnabled WRITE setFlipoverGestureEnabled NOTIFY flipoverGestureEnabledChanged)
Q_PROPERTY(bool populated READ populated NOTIFY populatedChanged)

public:
enum DoubleTapMode {
Expand Down Expand Up @@ -127,6 +128,8 @@ class SYSTEMSETTINGS_EXPORT DisplaySettings: public QObject
bool flipoverGestureEnabled() const;
void setFlipoverGestureEnabled(bool);

bool populated() const;

signals:
void brightnessChanged();
void dimTimeoutChanged();
Expand All @@ -141,12 +144,12 @@ class SYSTEMSETTINGS_EXPORT DisplaySettings: public QObject
void lidSensorEnabledChanged();
void lidSensorFilteringEnabledChanged();
void flipoverGestureEnabledChanged();
void populatedChanged();

private slots:
void configChange(const QString &key, const QDBusVariant &value);
void configReply(QDBusPendingCallWatcher *watcher);


private:
void updateConfig(const QString &key, const QVariant &value);
ComNokiaMceRequestInterface *m_mceIface;
Expand All @@ -164,6 +167,7 @@ private slots:
bool m_lidSensorEnabled;
bool m_lidSensorFilteringEnabled;
bool m_flipoverGestureEnabled;
bool m_populated;
};

QML_DECLARE_TYPE(DisplaySettings)
Expand Down

0 comments on commit af1d3d1

Please sign in to comment.