From fab0d1579f8be4859958217e7b632acfbf191de2 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sat, 16 Apr 2016 20:39:37 +1000
Subject: [PATCH] Fixed ESC handling in inactivity dialog. This resolves bug
 2632.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 po/it.po                |  6 +++---
 src/countdowndialog.cpp | 13 +++++++++++++
 src/countdowndialog.h   |  6 ++++--
 src/eventsrc            |  6 +++---
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/po/it.po b/po/it.po
index bf882c7..4986ca1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -398,7 +398,7 @@ msgstr "Iberna"
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
 msgid "Sleep"
-msgstr "Sospendi"
+msgstr "Modalità sleep"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
 msgid "CPU Powersave policy"
@@ -1063,11 +1063,11 @@ msgstr "Ibernazione disabilitata dall'amministratore."
 
 #: tdepowersave.cpp:759
 msgid "Sleep failed"
-msgstr "Sospensione su RAM fallita"
+msgstr "Modalità sleep fallita"
 
 #: tdepowersave.cpp:767
 msgid "Sleep disabled by administrator."
-msgstr "Sospensione su RAM disabilitata dall'amministratore."
+msgstr "Modalità sleep disabilitata dall'amministratore."
 
 #: tdepowersave.cpp:815
 msgid "Standby failed"
diff --git a/src/countdowndialog.cpp b/src/countdowndialog.cpp
index 99b519e..6393875 100644
--- a/src/countdowndialog.cpp
+++ b/src/countdowndialog.cpp
@@ -146,6 +146,19 @@ void countDownDialog::pB_cancel_pressed() {
 	kdDebugFuncOut(trace);
 }
 
+void countDownDialog::reject() {
+	kdDebugFuncIn(trace);
+
+	if (PROGRESS->isActive())
+		PROGRESS->stop();
+
+	chancel = true;
+	
+	countdown_Dialog::reject();
+
+	kdDebugFuncOut(trace);
+}
+
 /*!
  * \b TQT_SLOT to handle the change of the progressbar.
  */
diff --git a/src/countdowndialog.h b/src/countdowndialog.h
index ed8778b..ca1164c 100644
--- a/src/countdowndialog.h
+++ b/src/countdowndialog.h
@@ -72,9 +72,11 @@ private slots:
 
 	//! to update the progressbar
 	void updateProgress();
-	//! to catch the event if the 'Chancel' button get pressed 
+	//! to catch the event if the 'Cancel' button get pressed 
 	void pB_cancel_pressed();
-
+	//! to catch ESC presses
+  void reject();
+  
 signals:
 	//! emited if the dialog get closed
 	void dialogClosed( bool result);
diff --git a/src/eventsrc b/src/eventsrc
index 03387ba..fe33525 100644
--- a/src/eventsrc
+++ b/src/eventsrc
@@ -221,7 +221,7 @@ default_presentation=0
 Name=SuspendToDiskEvent
 Comment=Hibernation is started
 Comment[cs]=Uspávání na disk
-Comment[de]='Suspend to Disk' wurde gestartet
+Comment[de]='Hibernate' wurde gestartet
 Comment[es]=Se ha iniciado la suspensión en disco
 Comment[fr]=La mise en veille sur disque a été lancée
 Comment[it]=Ibernazione avviata
@@ -276,9 +276,9 @@ default_presentation=0
 
 [resume_from_suspend2disk_event]
 Name=ResumeFromSuspendToDiskEvent
-Comment=Resumed from Suspend to Disk
+Comment=Resumed from Hibernate
 Comment[cs]=Probouzení z uspání na disk
-Comment[de]=Wiederaufnahme nach 'Suspend to Disk'
+Comment[de]=Wiederaufnahme nach 'Hibernate'
 Comment[es]=Reanudación desde suspensión en disco
 Comment[fr]=Reprise après la mise en veille sur disque
 Comment[it]=Ripristinato da Sospendi su disco