TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

kcontrol: Added support for hybrid suspend (aka suspend to RAM + suspend to disk)

Browse Source 
in hardware manager. This relates to bug 2601.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/2/head
Michele Calgaro 10 years ago
parent e972ff07d5
commit b49194171a
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File

27
kcontrol/hwmanager/devicepropsdlg.cpp
Unescape Escape View File

@ -685,19 +685,22 @@ void DevicePropertiesDialog::populateDeviceInformation() {
if ((*it) == TDESystemPowerState::Active) { if ((*it) == TDESystemPowerState::Active) {
powerStatesString += i18n("Active<br>"); powerStatesString += i18n("Active<br>");
} }
if ((*it) == TDESystemPowerState::Standby) { else if ((*it) == TDESystemPowerState::Standby) {
powerStatesString += i18n("Standby<br>"); powerStatesString += i18n("Standby<br>");
} }
if ((*it) == TDESystemPowerState::Freeze) { else if ((*it) == TDESystemPowerState::Freeze) {
powerStatesString += i18n("Freeze<br>"); powerStatesString += i18n("Freeze<br>");
} }
if ((*it) == TDESystemPowerState::Suspend) { else if ((*it) == TDESystemPowerState::Suspend) {
powerStatesString += i18n("Suspend<br>"); powerStatesString += i18n("Suspend<br>");
} }
if ((*it) == TDESystemPowerState::Hibernate) { else if ((*it) == TDESystemPowerState::Hibernate) {
powerStatesString += i18n("Hibernate<br>"); 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>"); powerStatesString += i18n("Power Off<br>");
} }
} }
@ -719,19 +722,22 @@ void DevicePropertiesDialog::populateDeviceInformation() {
if ((*it) == TDESystemHibernationMethod::Unsupported) { if ((*it) == TDESystemHibernationMethod::Unsupported) {
label = i18n("<none>"); label = i18n("<none>");
} }
if ((*it) == TDESystemHibernationMethod::Platform) { else if ((*it) == TDESystemHibernationMethod::Platform) {
label = i18n("Platform"); label = i18n("Platform");
} }
if ((*it) == TDESystemHibernationMethod::Shutdown) { else if ((*it) == TDESystemHibernationMethod::Suspend) {
label = i18n("Suspend");
}
else if ((*it) == TDESystemHibernationMethod::Shutdown) {
label = i18n("Shutdown"); label = i18n("Shutdown");
} }
if ((*it) == TDESystemHibernationMethod::Reboot) { else if ((*it) == TDESystemHibernationMethod::Reboot) {
label = i18n("Reboot"); label = i18n("Reboot");
} }
if ((*it) == TDESystemHibernationMethod::TestProc) { else if ((*it) == TDESystemHibernationMethod::TestProc) {
label = i18n("Test Procedure"); label = i18n("Test Procedure");
} }
if ((*it) == TDESystemHibernationMethod::Test) { else if ((*it) == TDESystemHibernationMethod::Test) {
label = i18n("Test"); label = i18n("Test");
} }
base->comboSystemHibernationMethod->insertItem(label, i); base->comboSystemHibernationMethod->insertItem(label, i);
@ -745,6 +751,7 @@ void DevicePropertiesDialog::populateDeviceInformation() {
base->labelSystemUserCanFreeze->setText((rdevice->canFreeze())?i18n("Yes"):i18n("No")); base->labelSystemUserCanFreeze->setText((rdevice->canFreeze())?i18n("Yes"):i18n("No"));
base->labelSystemUserCanSuspend->setText((rdevice->canSuspend())?i18n("Yes"):i18n("No")); base->labelSystemUserCanSuspend->setText((rdevice->canSuspend())?i18n("Yes"):i18n("No"));
base->labelSystemUserCanHibernate->setText((rdevice->canHibernate())?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->labelSystemUserCanPowerOff->setText((rdevice->canPowerOff())?i18n("Yes"):i18n("No"));
base->labelSystemHibernationSpace->setText((rdevice->diskSpaceNeededForHibernation()<0)?i18n("<unknown>"):TDEHardwareDevices::bytesToFriendlySizeString(rdevice->diskSpaceNeededForHibernation())); base->labelSystemHibernationSpace->setText((rdevice->diskSpaceNeededForHibernation()<0)?i18n("<unknown>"):TDEHardwareDevices::bytesToFriendlySizeString(rdevice->diskSpaceNeededForHibernation()));

17
kcontrol/hwmanager/devicepropsdlgbase.ui
Unescape Escape View File

@ -1508,7 +1508,20 @@
<cstring>labelSystemUserCanHibernate</cstring> <cstring>labelSystemUserCanHibernate</cstring>
</property> </property>
</widget> </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"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
@ -1516,7 +1529,7 @@
<string>User Can Request Shutdown</string> <string>User Can Request Shutdown</string>
</property> </property>
</widget> </widget>
<widget class="TQLabel" row="7" column="1" colspan="1"> <widget class="TQLabel" row="8" column="1" colspan="1">
<property name="name"> <property name="name">
<cstring>labelSystemUserCanPowerOff</cstring> <cstring>labelSystemUserCanPowerOff</cstring>
</property> </property>

Write Preview
Loading…
Cancel
Save