Renamed Sleep to Suspend, following discussion on a more consistent naming convention for shutdown actions.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

9 files changed, 33 insertions, 33 deletions

diff --git a/src/config/kpowersaverc_default b/src/config/kpowersaverc_default
index 61e6e05..3a6d15b 100644
--- a/src/config/kpowersaverc_default
+++ b/src/config/kpowersaverc_default
@@ -5,7 +5,7 @@ ActionOnLidClose=
 ActionOnLidCloseValue=
 ActionOnPowerButton=SHUTDOWN
 ActionOnPowerButtonValue=
-ActionOnSleepButton=SUSPEND2RAM
+ActionOnSuspendButton=SUSPEND2RAM
 ActionOnS2DiskButton=SUSPEND2DISK
 buttonsAllowedActions=SHUTDOWN,LOGOUT_DIALOG,SUSPEND2DISK,SUSPEND2RAM
 AutoSuspendCountdown=true
diff --git a/src/configure_Dialog.ui b/src/configure_Dialog.ui
index 2500a62..e55d4ca 100644
--- a/src/configure_Dialog.ui
+++ b/src/configure_Dialog.ui
@@ -1491,10 +1491,10 @@
                                         <cstring>textLabel3_4_3</cstring>
                                     </property>
                                     <property name="text">
-                                        <string>Sleep button:</string>
+                                        <string>Suspend button:</string>
                                     </property>
                                     <property name="buddy" stdset="0">
-                                        <cstring>cB_SleepButton</cstring>
+                                        <cstring>cB_SuspendButton</cstring>
                                     </property>
                                 </widget>
                                 <widget class="TQLabel" row="2" column="0">
@@ -1589,7 +1589,7 @@
                                 </spacer>
                                 <widget class="TQComboBox" row="3" column="2">
                                     <property name="name">
-                                        <cstring>cB_SleepButton</cstring>
+                                        <cstring>cB_SuspendButton</cstring>
                                     </property>
                                     <property name="minimumSize">
                                         <size>
@@ -2276,7 +2276,7 @@
         <slot>general_valueChanged()</slot>
     </connection>
     <connection>
-        <sender>cB_SleepButton</sender>
+        <sender>cB_SuspendButton</sender>
         <signal>activated(int)</signal>
         <receiver>configure_Dialog</receiver>
         <slot>general_valueChanged()</slot>
@@ -2517,7 +2517,7 @@
     <tabstop>sB_batCritAction_value</tabstop>
     <tabstop>cB_PowerButton</tabstop>
     <tabstop>cB_LidcloseButton</tabstop>
-    <tabstop>cB_SleepButton</tabstop>
+    <tabstop>cB_SuspendButton</tabstop>
     <tabstop>cB_S2DiskButton</tabstop>
     <tabstop>cB_acScheme</tabstop>
     <tabstop>cB_batteryScheme</tabstop>
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"))) {
diff --git a/src/eventsrc b/src/eventsrc
index b1e10ce..63317e5 100644
--- a/src/eventsrc
+++ b/src/eventsrc
@@ -236,9 +236,9 @@ default_presentation=0
 
 [suspend2ram_event]
 Name=SuspendToRamEvent
-Comment=Sleep mode is started
+Comment=Suspend mode is started
 Comment[cs]=Uspávání do RAM
-Comment[de]='Sleep mode' wurde gestartet
+Comment[de]='Suspend mode' wurde gestartet
 Comment[es]=Se ha iniciado la suspensión en RAM
 Comment[fr]=La mise en veille sur RAM a été lancée
 Comment[it]=Modalità sleep avviata
@@ -287,9 +287,9 @@ default_presentation=0
 
 [resume_from_suspend2ram_event]
 Name=ResumeFromSuspendToRamEvent
-Comment=Resumed from Sleep mode 
+Comment=Resumed from Suspend mode 
 Comment[cs]=Probouzení z uspání do RAM
-Comment[de]=Wiederaufnahme nach 'Sleep mode'
+Comment[de]=Wiederaufnahme nach 'Suspend mode'
 Comment[es]=Reanudación desde suspensión en RAM
 Comment[fr]=Reprise après la mise en veille sur RAM
 Comment[it]=Ripristinato da Sospendi su RAM
diff --git a/src/hardware.cpp b/src/hardware.cpp
index 4d688f5..1b16289 100644
--- a/src/hardware.cpp
+++ b/src/hardware.cpp
@@ -306,7 +306,7 @@ void HardwareInfo::processMessage (msg_type type, TQString message, TQString val
 				} else if (value.startsWith("power")) {
 					TQTimer::singleShot(50, this, TQT_SLOT(emitPowerButtonPressed()));
 				} else if (value.startsWith("sleep") || value.startsWith("suspend")) {
-					TQTimer::singleShot(50, this, TQT_SLOT(emitSleepButtonPressed()));
+					TQTimer::singleShot(50, this, TQT_SLOT(emitSuspendButtonPressed()));
 				} else if (value.startsWith("hibernate")) {
 					TQTimer::singleShot(50, this, TQT_SLOT(emitS2diskButtonPressed()));
 				} else if (value.startsWith("brightness-")) {
@@ -1357,9 +1357,9 @@ void HardwareInfo::emitPowerButtonPressed() {
 }
 
 /*!
- * Function to emit the signal for the Sleep button.
+ * Function to emit the signal for the Suspend button.
  */
-void HardwareInfo::emitSleepButtonPressed() {
+void HardwareInfo::emitSuspendButtonPressed() {
 	if (sessionIsActive) {
 		emit sleepButtonPressed();
 	} else {
diff --git a/src/hardware.h b/src/hardware.h
index a3cdc2e..8da117e 100644
--- a/src/hardware.h
+++ b/src/hardware.h
@@ -344,7 +344,7 @@ private slots:
 	//! to emit signal for power button
 	void emitPowerButtonPressed();
 	//! to emit signal for sleep button
-	void emitSleepButtonPressed();
+	void emitSuspendButtonPressed();
 	//! to emit signal for s2disk button
 	void emitS2diskButtonPressed();
 	//! to emit signal for session state
diff --git a/src/kpowersave.cpp b/src/kpowersave.cpp
index c711e57..fba5562 100644
--- a/src/kpowersave.cpp
+++ b/src/kpowersave.cpp
@@ -108,7 +108,7 @@ kpowersave::kpowersave( bool force_acpi_check, bool trace_func ) : KSystemTray(0
 	// connect to events
 	connect(hwinfo, TQT_SIGNAL(lidclosetStatus(bool)), this, TQT_SLOT(handleLidEvent(bool)));
 	connect(hwinfo, TQT_SIGNAL(powerButtonPressed()), this, TQT_SLOT (handlePowerButtonEvent()));
-	connect(hwinfo, TQT_SIGNAL(sleepButtonPressed()), this, TQT_SLOT (handleSleepButtonEvent()));
+	connect(hwinfo, TQT_SIGNAL(sleepButtonPressed()), this, TQT_SLOT (handleSuspendButtonEvent()));
 	connect(hwinfo, TQT_SIGNAL(s2diskButtonPressed()), this, TQT_SLOT (handleS2DiskButtonEvent()));
 	connect(hwinfo, TQT_SIGNAL(batteryWARNState(int,int)), this, TQT_SLOT(notifyBatteryStatusChange (int,int)));
 	connect(hwinfo, TQT_SIGNAL(desktopSessionIsActive(bool)), this, TQT_SLOT (handleSessionState(bool)));
@@ -186,7 +186,7 @@ void kpowersave::initMenu() {
 								TQT_SLOT(do_suspend2disk()));
 	SUSPEND2RAM_MENU_ID = this->contextMenu()->insertItem( SmallIconSet("suspend_to_ram",
 							       TQIconSet::Automatic),
-							       i18n("Sleep"), this,
+							       i18n("Suspend"), this,
 							       TQT_SLOT(do_suspend2ram()));
 	STANDBY_MENU_ID = this->contextMenu()->insertItem( SmallIconSet("stand_by", TQIconSet::Automatic),
 							   i18n("Standby"), this, TQT_SLOT(do_standby()));
@@ -771,7 +771,7 @@ bool kpowersave::do_suspend2ram(){
 				kdDebugFuncOut(trace);
 				return true;
 			} else {
-				KPassivePopup::message( i18n("WARNING"),i18n("Sleep mode failed"),
+				KPassivePopup::message( i18n("WARNING"),i18n("Suspend mode failed"),
 							SmallIcon("messagebox_warning", 20), this,
 							i18n("Warning").ascii(), 15000);
 				kdDebugFuncOut(trace);
@@ -779,7 +779,7 @@ bool kpowersave::do_suspend2ram(){
 			}
 		} else {
 			KPassivePopup::message( i18n("WARNING"),
-						i18n("Sleep mode disabled by administrator."),
+						i18n("Suspend mode disabled by administrator."),
 						SmallIcon("messagebox_warning", 20), this,
 						i18n("Warning").ascii(), 15000);
 			this->contextMenu()->setItemEnabled(SUSPEND2RAM_MENU_ID, false);
@@ -787,7 +787,7 @@ bool kpowersave::do_suspend2ram(){
 			return false;
 		}
 	} else {
-		kdWarning() << "This machine does not provide Sleep state via HAL" << endl;
+		kdWarning() << "This machine does not provide Suspend state via HAL" << endl;
 		kdDebugFuncOut(trace);
 		return false;
 	}
@@ -865,7 +865,7 @@ void kpowersave::do_autosuspendWarn() {
 
 			if(settings->autoInactiveAction == "Hibernate") {
 				countdown->setPixmap("suspend2disk");
-			} else if (settings->autoInactiveAction == "Sleep") {
+			} else if (settings->autoInactiveAction == "Suspend") {
 				countdown->setPixmap("suspend2ram");
 			} else if (settings->autoInactiveAction == "Standby") {
 				countdown->setPixmap("standby");
@@ -915,7 +915,7 @@ bool kpowersave::do_autosuspend(bool chancel) {
 		if(settings->autoSuspend && !contextMenu()->isItemChecked(AUTOSUSPEND_MENU_ID)) {
 			if(settings->autoInactiveAction == "Hibernate") {
 				return do_suspend2disk();
-			} else if (settings->autoInactiveAction == "Sleep") {
+			} else if (settings->autoInactiveAction == "Suspend") {
 				return do_suspend2ram();
 			} else if (settings->autoInactiveAction == "Standby") {
 				return do_standby();
@@ -1145,7 +1145,7 @@ void kpowersave::handlePowerButtonEvent( ) {
 /*!
  * Handle the event for the suspend2ram/sleep button and call the related action.
  */
-void kpowersave::handleSleepButtonEvent() {
+void kpowersave::handleSuspendButtonEvent() {
 	kdDebugFuncIn(trace);
 
 	// Only go to suspend on button event if we already resumed successful.
@@ -2383,7 +2383,7 @@ TQString kpowersave::getSuspendString (int type) {
 			return i18n("Hibernate");
 			break;
 		case SUSPEND2RAM:
-			return i18n("Sleep");
+			return i18n("Suspend");
 			break;
 		case STANDBY:
 			return i18n("Standby");
diff --git a/src/kpowersave.h b/src/kpowersave.h
index 5758764..a26d181 100644
--- a/src/kpowersave.h
+++ b/src/kpowersave.h
@@ -393,7 +393,7 @@ private slots:
 	//! handle event for press power button and call action
 	void handlePowerButtonEvent();
 	//!  handle event for press s2ram/sleep button and call action
-	void handleSleepButtonEvent();
+	void handleSuspendButtonEvent();
 	//!  handle event for press s2disk button and call action
 	void handleS2DiskButtonEvent();
 
diff --git a/src/settings.cpp b/src/settings.cpp
index 34285e3..874b23b 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -299,7 +299,7 @@ bool Settings::load_general_settings(){
 			powerButtonActionValue =  tdeconfig->readNumEntry("ActionOnPowerButtonValue", -1);
 		}
 
-		sleepButtonAction = mapActionToType(tdeconfig->readEntry("ActionOnSleepButton",""));
+		sleepButtonAction = mapActionToType(tdeconfig->readEntry("ActionOnSuspendButton",""));
 		if ((sleepButtonAction != GO_SUSPEND2RAM) && (sleepButtonAction != GO_SUSPEND2DISK)) {
 			sleepButtonAction = NONE;
 		}