Skip to content
This repository was archived by the owner on Apr 28, 2022. It is now read-only.

Commit 113f807

Browse files
committed
Merge branch 'jb43843_power_save_mode' into 'master'
Add properties related to PowerSaveMode settings See merge request mer-core/nemo-qml-plugin-systemsettings!93
2 parents 866bf9f + b75ecd8 commit 113f807

File tree

2 files changed

+89
-5
lines changed

2 files changed

+89
-5
lines changed

src/displaysettings.cpp

Lines changed: 71 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ static const char *MceDoubleTapMode = "/system/osso/dsm/doubletap/mode";
4848
static const char *MceLidSensorEnabled = "/system/osso/dsm/locks/lid_sensor_enabled";
4949
static const char *MceLidSensorFilteringEnabled = "/system/osso/dsm/locks/filter_lid_with_als";
5050
static const char *MceFlipOverGestureEnabled = "/system/osso/dsm/display/flipover_gesture_enabled";
51+
static const char *McePowerSaveModeForced = "/system/osso/dsm/energymanagement/force_power_saving";
52+
static const char *McePowerSaveModeEnabled = "/system/osso/dsm/energymanagement/enable_power_saving";
53+
static const char *McePowerSaveModeThreshold = "/system/osso/dsm/energymanagement/psm_threshold";
5154

5255
DisplaySettings::DisplaySettings(QObject *parent)
5356
: QObject(parent)
@@ -68,6 +71,9 @@ DisplaySettings::DisplaySettings(QObject *parent)
6871
m_doubleTapMode = true;
6972
m_lidSensorFilteringEnabled = true;
7073
m_lidSensorEnabled = true;
74+
m_powerSaveModeForced = false;
75+
m_powerSaveModeEnabled = false;
76+
m_powerSaveModeThreshold = 20;
7177
m_populated = false;
7278

7379
/* Setup change listener & get current values via async query */
@@ -278,11 +284,6 @@ bool DisplaySettings::flipoverGestureEnabled() const
278284
return m_flipoverGestureEnabled;
279285
}
280286

281-
bool DisplaySettings::populated() const
282-
{
283-
return m_populated;
284-
}
285-
286287
void DisplaySettings::setFlipoverGestureEnabled(bool enabled)
287288
{
288289
if (m_flipoverGestureEnabled != enabled) {
@@ -292,6 +293,53 @@ void DisplaySettings::setFlipoverGestureEnabled(bool enabled)
292293
}
293294
}
294295

296+
bool DisplaySettings::powerSaveModeForced() const
297+
{
298+
return m_powerSaveModeForced;
299+
}
300+
301+
void DisplaySettings::setPowerSaveModeForced(bool force)
302+
{
303+
if (m_powerSaveModeForced != force) {
304+
m_powerSaveModeForced = force;
305+
m_mceIface->set_config(QDBusObjectPath(McePowerSaveModeForced), QDBusVariant(force));
306+
emit powerSaveModeForcedChanged();
307+
}
308+
}
309+
310+
bool DisplaySettings::powerSaveModeEnabled() const
311+
{
312+
return m_powerSaveModeEnabled;
313+
}
314+
315+
void DisplaySettings::setPowerSaveModeEnabled(bool enabled)
316+
{
317+
if (m_powerSaveModeEnabled != enabled) {
318+
m_powerSaveModeEnabled = enabled;
319+
m_mceIface->set_config(QDBusObjectPath(McePowerSaveModeEnabled), QDBusVariant(enabled));
320+
emit powerSaveModeEnabledChanged();
321+
}
322+
}
323+
324+
int DisplaySettings::powerSaveModeThreshold() const
325+
{
326+
return m_powerSaveModeThreshold;
327+
}
328+
329+
void DisplaySettings::setPowerSaveModeThreshold(int value)
330+
{
331+
if (m_powerSaveModeThreshold != value) {
332+
m_powerSaveModeThreshold = value;
333+
m_mceIface->set_config(QDBusObjectPath(McePowerSaveModeThreshold), QDBusVariant(value));
334+
emit powerSaveModeThresholdChanged();
335+
}
336+
}
337+
338+
bool DisplaySettings::populated() const
339+
{
340+
return m_populated;
341+
}
342+
295343
void DisplaySettings::configChange(const QString &key, const QDBusVariant &value)
296344
{
297345
updateConfig(key, value.variant());
@@ -371,5 +419,23 @@ void DisplaySettings::updateConfig(const QString &key, const QVariant &value)
371419
m_flipoverGestureEnabled = val;
372420
emit flipoverGestureEnabledChanged();
373421
}
422+
} else if (key == McePowerSaveModeForced) {
423+
bool val = value.toBool();
424+
if (val != m_powerSaveModeForced) {
425+
m_powerSaveModeForced = val;
426+
emit powerSaveModeForcedChanged();
427+
}
428+
} else if (key == McePowerSaveModeEnabled) {
429+
bool val = value.toBool();
430+
if (val != m_powerSaveModeEnabled) {
431+
m_powerSaveModeEnabled = val;
432+
emit powerSaveModeEnabledChanged();
433+
}
434+
} else if (key == McePowerSaveModeThreshold) {
435+
int val = value.toInt();
436+
if (val != m_powerSaveModeThreshold) {
437+
m_powerSaveModeThreshold = val;
438+
emit powerSaveModeThresholdChanged();
439+
}
374440
}
375441
}

src/displaysettings.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ class SYSTEMSETTINGS_EXPORT DisplaySettings: public QObject
6262
Q_PROPERTY(bool lidSensorEnabled READ lidSensorEnabled WRITE setLidSensorEnabled NOTIFY lidSensorEnabledChanged)
6363
Q_PROPERTY(bool lidSensorFilteringEnabled READ lidSensorFilteringEnabled WRITE setLidSensorFilteringEnabled NOTIFY lidSensorFilteringEnabledChanged)
6464
Q_PROPERTY(bool flipoverGestureEnabled READ flipoverGestureEnabled WRITE setFlipoverGestureEnabled NOTIFY flipoverGestureEnabledChanged)
65+
Q_PROPERTY(bool powerSaveModeForced READ powerSaveModeForced WRITE setPowerSaveModeForced NOTIFY powerSaveModeForcedChanged)
66+
Q_PROPERTY(bool powerSaveModeEnabled READ powerSaveModeEnabled WRITE setPowerSaveModeEnabled NOTIFY powerSaveModeEnabledChanged)
67+
Q_PROPERTY(int powerSaveModeThreshold READ powerSaveModeThreshold WRITE setPowerSaveModeThreshold NOTIFY powerSaveModeThresholdChanged)
6568
Q_PROPERTY(bool populated READ populated NOTIFY populatedChanged)
6669

6770
public:
@@ -128,6 +131,15 @@ class SYSTEMSETTINGS_EXPORT DisplaySettings: public QObject
128131
bool flipoverGestureEnabled() const;
129132
void setFlipoverGestureEnabled(bool);
130133

134+
bool powerSaveModeForced() const;
135+
void setPowerSaveModeForced(bool);
136+
137+
bool powerSaveModeEnabled() const;
138+
void setPowerSaveModeEnabled(bool);
139+
140+
int powerSaveModeThreshold() const;
141+
void setPowerSaveModeThreshold(int);
142+
131143
bool populated() const;
132144

133145
signals:
@@ -144,6 +156,9 @@ class SYSTEMSETTINGS_EXPORT DisplaySettings: public QObject
144156
void lidSensorEnabledChanged();
145157
void lidSensorFilteringEnabledChanged();
146158
void flipoverGestureEnabledChanged();
159+
void powerSaveModeForcedChanged();
160+
void powerSaveModeEnabledChanged();
161+
void powerSaveModeThresholdChanged();
147162
void populatedChanged();
148163

149164
private slots:
@@ -167,6 +182,9 @@ private slots:
167182
bool m_lidSensorEnabled;
168183
bool m_lidSensorFilteringEnabled;
169184
bool m_flipoverGestureEnabled;
185+
bool m_powerSaveModeForced;
186+
bool m_powerSaveModeEnabled;
187+
int m_powerSaveModeThreshold;
170188
bool m_populated;
171189
};
172190

0 commit comments

Comments
 (0)