summaryrefslogtreecommitdiffstats
path: root/kcontrol
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2016-05-02 23:43:29 +1000
committerMichele Calgaro <michele.calgaro@yahoo.it>2016-05-02 23:43:29 +1000
commitb49194171a97487c80d1462fdef3e40cb1711f7c (patch)
treedbf9b73a02d643dbd3b72278d1a25248cc239204 /kcontrol
parente972ff07d575958a22b952bcc957e5bac1863965 (diff)
downloadtdebase-b49194171a97487c80d1462fdef3e40cb1711f7c.tar.gz
tdebase-b49194171a97487c80d1462fdef3e40cb1711f7c.zip
kcontrol: Added support for hybrid suspend (aka suspend to RAM + suspend to disk)
in hardware manager. This relates to bug 2601. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'kcontrol')
-rw-r--r--kcontrol/hwmanager/devicepropsdlg.cpp27
-rw-r--r--kcontrol/hwmanager/devicepropsdlgbase.ui17
2 files changed, 32 insertions, 12 deletions
diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp
index 9946ede6..cb69c56f 100644
--- a/kcontrol/hwmanager/devicepropsdlg.cpp
+++ b/kcontrol/hwmanager/devicepropsdlg.cpp
@@ -685,19 +685,22 @@ void DevicePropertiesDialog::populateDeviceInformation() {
if ((*it) == TDESystemPowerState::Active) {
powerStatesString += i18n("Active<br>");
}
- if ((*it) == TDESystemPowerState::Standby) {
+ else if ((*it) == TDESystemPowerState::Standby) {
powerStatesString += i18n("Standby<br>");
}
- if ((*it) == TDESystemPowerState::Freeze) {
+ else if ((*it) == TDESystemPowerState::Freeze) {
powerStatesString += i18n("Freeze<br>");
}
- if ((*it) == TDESystemPowerState::Suspend) {
+ else if ((*it) == TDESystemPowerState::Suspend) {
powerStatesString += i18n("Suspend<br>");
}
- if ((*it) == TDESystemPowerState::Hibernate) {
+ else if ((*it) == TDESystemPowerState::Hibernate) {
powerStatesString += i18n("Hibernate<br>");
}
- if ((*it) == TDESystemPowerState::PowerOff) {
+ else if ((*it) == TDESystemPowerState::HybridSuspend) {
+ powerStatesString += i18n("Hybrid Suspend<br>");
+ }
+ else if ((*it) == TDESystemPowerState::PowerOff) {
powerStatesString += i18n("Power Off<br>");
}
}
@@ -719,19 +722,22 @@ void DevicePropertiesDialog::populateDeviceInformation() {
if ((*it) == TDESystemHibernationMethod::Unsupported) {
label = i18n("<none>");
}
- if ((*it) == TDESystemHibernationMethod::Platform) {
+ else if ((*it) == TDESystemHibernationMethod::Platform) {
label = i18n("Platform");
}
- if ((*it) == TDESystemHibernationMethod::Shutdown) {
+ else if ((*it) == TDESystemHibernationMethod::Suspend) {
+ label = i18n("Suspend");
+ }
+ else if ((*it) == TDESystemHibernationMethod::Shutdown) {
label = i18n("Shutdown");
}
- if ((*it) == TDESystemHibernationMethod::Reboot) {
+ else if ((*it) == TDESystemHibernationMethod::Reboot) {
label = i18n("Reboot");
}
- if ((*it) == TDESystemHibernationMethod::TestProc) {
+ else if ((*it) == TDESystemHibernationMethod::TestProc) {
label = i18n("Test Procedure");
}
- if ((*it) == TDESystemHibernationMethod::Test) {
+ else if ((*it) == TDESystemHibernationMethod::Test) {
label = i18n("Test");
}
base->comboSystemHibernationMethod->insertItem(label, i);
@@ -745,6 +751,7 @@ void DevicePropertiesDialog::populateDeviceInformation() {
base->labelSystemUserCanFreeze->setText((rdevice->canFreeze())?i18n("Yes"):i18n("No"));
base->labelSystemUserCanSuspend->setText((rdevice->canSuspend())?i18n("Yes"):i18n("No"));
base->labelSystemUserCanHibernate->setText((rdevice->canHibernate())?i18n("Yes"):i18n("No"));
+ base->labelSystemUserCanHybridSuspend->setText((rdevice->canHybridSuspend())?i18n("Yes"):i18n("No"));
base->labelSystemUserCanPowerOff->setText((rdevice->canPowerOff())?i18n("Yes"):i18n("No"));
base->labelSystemHibernationSpace->setText((rdevice->diskSpaceNeededForHibernation()<0)?i18n("<unknown>"):TDEHardwareDevices::bytesToFriendlySizeString(rdevice->diskSpaceNeededForHibernation()));
diff --git a/kcontrol/hwmanager/devicepropsdlgbase.ui b/kcontrol/hwmanager/devicepropsdlgbase.ui
index 131cf69b..42e12f5d 100644
--- a/kcontrol/hwmanager/devicepropsdlgbase.ui
+++ b/kcontrol/hwmanager/devicepropsdlgbase.ui
@@ -1508,7 +1508,20 @@
<cstring>labelSystemUserCanHibernate</cstring>
</property>
</widget>
- <widget class="TQLabel" row="7" column="0" colspan="1">
+ <widget class="TQLabel" row="7" column="0" colspan="1">
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <property name="text">
+ <string>User Can Request Hybrid Suspend</string>
+ </property>
+ </widget>
+ <widget class="TQLabel" row="7" column="1" colspan="1">
+ <property name="name">
+ <cstring>labelSystemUserCanHybridSuspend</cstring>
+ </property>
+ </widget>
+ <widget class="TQLabel" row="8" column="0" colspan="1">
<property name="name">
<cstring>unnamed</cstring>
</property>
@@ -1516,7 +1529,7 @@
<string>User Can Request Shutdown</string>
</property>
</widget>
- <widget class="TQLabel" row="7" column="1" colspan="1">
+ <widget class="TQLabel" row="8" column="1" colspan="1">
<property name="name">
<cstring>labelSystemUserCanPowerOff</cstring>
</property>