diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-22 14:57:26 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-22 14:57:26 +0200 |
| commit | 7d335195a06f3453de82ee870c699652a55a2bfd (patch) | |
| tree | be80ab7c4b5531439947e939bf0070377d3365ec /kcontrol | |
| parent | 19b918348907ac2f8bf0307d601bea26e774e6c0 (diff) | |
| download | tdebase-7d335195a06f3453de82ee870c699652a55a2bfd.tar.gz tdebase-7d335195a06f3453de82ee870c699652a55a2bfd.zip | |
Add support for freeze suspend state
Diffstat (limited to 'kcontrol')
| -rw-r--r-- | kcontrol/hwmanager/devicepropsdlg.cpp | 1 | ||||
| -rw-r--r-- | kcontrol/hwmanager/devicepropsdlgbase.ui | 23 | ||||
| -rw-r--r-- | kcontrol/hwmanager/hwmanager.desktop | 2 |
3 files changed, 20 insertions, 6 deletions
diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp index a4849af54..30778dac2 100644 --- a/kcontrol/hwmanager/devicepropsdlg.cpp +++ b/kcontrol/hwmanager/devicepropsdlg.cpp @@ -714,6 +714,7 @@ void DevicePropertiesDialog::populateDeviceInformation() { base->comboSystemHibernationMethod->setCurrentItem(m_hibernationComboMap[rdevice->hibernationMethod()]); base->labelSystemUserCanStandby->setText((rdevice->canStandby())?i18n("Yes"):i18n("No")); + 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->labelSystemUserCanPowerOff->setText((rdevice->canPowerOff())?i18n("Yes"):i18n("No")); diff --git a/kcontrol/hwmanager/devicepropsdlgbase.ui b/kcontrol/hwmanager/devicepropsdlgbase.ui index 5f6c2c166..74afdf5f3 100644 --- a/kcontrol/hwmanager/devicepropsdlgbase.ui +++ b/kcontrol/hwmanager/devicepropsdlgbase.ui @@ -1385,12 +1385,12 @@ <cstring>unnamed</cstring> </property> <property name="text"> - <string>User Can Request Suspend</string> + <string>User Can Request Freeze</string> </property> </widget> <widget class="TQLabel" row="4" column="1" colspan="1"> <property name="name"> - <cstring>labelSystemUserCanSuspend</cstring> + <cstring>labelSystemUserCanFreeze</cstring> </property> </widget> <widget class="TQLabel" row="5" column="0" colspan="1"> @@ -1398,12 +1398,12 @@ <cstring>unnamed</cstring> </property> <property name="text"> - <string>User Can Request Hibernation</string> + <string>User Can Request Suspend</string> </property> </widget> <widget class="TQLabel" row="5" column="1" colspan="1"> <property name="name"> - <cstring>labelSystemUserCanHibernate</cstring> + <cstring>labelSystemUserCanSuspend</cstring> </property> </widget> <widget class="TQLabel" row="6" column="0" colspan="1"> @@ -1411,11 +1411,24 @@ <cstring>unnamed</cstring> </property> <property name="text"> - <string>User Can Request Shutdown</string> + <string>User Can Request Hibernation</string> </property> </widget> <widget class="TQLabel" row="6" column="1" colspan="1"> <property name="name"> + <cstring>labelSystemUserCanHibernate</cstring> + </property> + </widget> + <widget class="TQLabel" row="7" column="0" colspan="1"> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="text"> + <string>User Can Request Shutdown</string> + </property> + </widget> + <widget class="TQLabel" row="7" column="1" colspan="1"> + <property name="name"> <cstring>labelSystemUserCanPowerOff</cstring> </property> </widget> diff --git a/kcontrol/hwmanager/hwmanager.desktop b/kcontrol/hwmanager/hwmanager.desktop index 1b006504b..d8a870f98 100644 --- a/kcontrol/hwmanager/hwmanager.desktop +++ b/kcontrol/hwmanager/hwmanager.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=tdecmshell kwmanager +Exec=tdecmshell hwmanager Icon=background Type=Application DocPath=kcontrol/hwmanager/index.html |