summaryrefslogtreecommitdiffstats
path: root/src/configuredialog.cpp
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-11-04 00:36:23 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-11-04 00:36:23 +0900
commit5ed7e732c163e2e40312f25588b7121b9efc3f9d (patch)
tree3677b220f418f864ab8b4ca8a00770a12a430f9e /src/configuredialog.cpp
parente10e57865fb550dcfe188162aa10db9169d29979 (diff)
downloadkpowersave-5ed7e732.tar.gz
kpowersave-5ed7e732.zip
Renamed Sleep to Suspend, following discussion on a more consistent naming convention for shutdown actions.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/configuredialog.cpp')
-rw-r--r--src/configuredialog.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp
index ff9ce91..a926df6 100644
--- a/src/configuredialog.cpp
+++ b/src/configuredialog.cpp
@@ -89,7 +89,7 @@ ConfigureDialog::ConfigureDialog( TDEConfig *_config, HardwareInfo *_hwinfo, Set
// get the correct available suspend types
SuspendStates suspend = hwinfo->getSuspendSupport();
if( suspend.suspend2ram && (suspend.suspend2ram_allowed || suspend.suspend2ram_allowed == -1))
- actions.append("Sleep");
+ actions.append("Suspend");
if ( suspend.suspend2disk && (suspend.suspend2disk_allowed || suspend.suspend2disk_allowed == -1))
actions.append("Hibernate");
if ( suspend.standby && (suspend.standby_allowed || suspend.standby_allowed == -1))
@@ -242,7 +242,7 @@ void ConfigureDialog::setIcons(){
if(actions[0] == "Hibernate")
tB_scheme->setItemIconSet( 2 ,SmallIcon("suspend_to_disk", TQIconSet::Automatic));
- else if(actions[0] == "Sleep")
+ else if(actions[0] == "Suspend")
tB_scheme->setItemIconSet( 2 ,SmallIcon("suspend_to_ram", TQIconSet::Automatic));
else if(actions[0] == "Standby")
tB_scheme->setItemIconSet( 2 ,SmallIcon("stand_by", TQIconSet::Automatic));
@@ -725,7 +725,7 @@ void ConfigureDialog::setGeneralSettings() {
// buttons tab:
TQStringList _actions = tdeconfig->readListEntry("buttonsAllowedActions", TQString());
fillActionComboBox(cB_PowerButton, _actions, tdeconfig->readEntry("ActionOnPowerButton", TQString()));
- fillActionComboBox(cB_SleepButton, _actions, tdeconfig->readEntry("ActionOnSleepButton", TQString()));
+ fillActionComboBox(cB_SuspendButton, _actions, tdeconfig->readEntry("ActionOnSuspendButton", TQString()));
fillActionComboBox(cB_S2DiskButton, _actions, tdeconfig->readEntry("ActionOnS2DiskButton", TQString()));
// avoid logout dialog for lidclose - this make no sense
_actions.remove("LOGOUT_DIALOG");
@@ -862,7 +862,7 @@ void ConfigureDialog::saveGeneralSettings() {
// button tab
tdeconfig->writeEntry("ActionOnPowerButton", mapDescriptionToAction(cB_PowerButton->currentText()));
tdeconfig->writeEntry("ActionOnLidClose", mapDescriptionToAction(cB_LidcloseButton->currentText()));
- tdeconfig->writeEntry("ActionOnSleepButton", mapDescriptionToAction(cB_SleepButton->currentText()));
+ tdeconfig->writeEntry("ActionOnSuspendButton", mapDescriptionToAction(cB_SuspendButton->currentText()));
tdeconfig->writeEntry("ActionOnS2DiskButton", mapDescriptionToAction(cB_S2DiskButton->currentText()));
// schemes tab
@@ -1783,8 +1783,8 @@ TQString ConfigureDialog::mapActionToDescription( TQString action ) {
if (actions.contains("Hibernate"))
ret = i18n("Hibernate");
} else if (action.startsWith("SUSPEND2RAM")) {
- if (actions.contains("Sleep"))
- ret = i18n("Sleep");
+ if (actions.contains("Suspend"))
+ ret = i18n("Suspend");
} else if (action.startsWith("CPUFREQ_POWERSAVE")) {
if (hwinfo->supportCPUFreq())
ret = i18n("CPU Powersave policy");
@@ -1821,8 +1821,8 @@ TQString ConfigureDialog::mapDescriptionToAction( TQString description ) {
} else if (description.startsWith("Hibernate") ||
description.startsWith(i18n("Hibernate"))) {
ret = "SUSPEND2DISK";
- } else if (description.startsWith("Sleep") ||
- description.startsWith(i18n("Sleep"))) {
+ } else if (description.startsWith("Suspend") ||
+ description.startsWith(i18n("Suspend"))) {
ret = "SUSPEND2RAM";
} else if (description.startsWith("CPU Powersave policy") ||
description.startsWith(i18n("CPU Powersave policy"))) {