fix for #1202

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5936 17fca916-40b9-46aa-a4ea-0a15b648b75c

5 files changed, 14 insertions, 0 deletions

diff --git a/src/modules/addon/AddonManagementDialog.cpp b/src/modules/addon/AddonManagementDialog.cpp
index 08c13ec7b..c8c9a0acb 100644
--- a/src/modules/addon/AddonManagementDialog.cpp
+++ b/src/modules/addon/AddonManagementDialog.cpp
@@ -54,6 +54,7 @@
 #include <QFrame>
 #include <QDir>
 #include <QAbstractTextDocumentLayout>
+#include <QShortcut>
 
 #ifdef COMPILE_WEBKIT_SUPPORT
 	#include "WebAddonInterfaceDialog.h"
@@ -199,6 +200,8 @@ AddonManagementDialog::AddonManagementDialog(QWidget * p)
 
 	QRect rect = g_pApp->desktop()->screenGeometry(g_pMainWindow);
 	move(rect.x() + ((rect.width() - g_rectManagementDialogGeometry.width())/2),rect.y() + ((rect.height() - g_rectManagementDialogGeometry.height())/2));
+
+	new QShortcut(Qt::Key_Escape, this, SLOT(closeClicked()));
 }
 
 AddonManagementDialog::~AddonManagementDialog()
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index c72fa162f..6735e5314 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -65,6 +65,7 @@
 #include <QInputDialog>
 #include <QHeaderView>
 #include <QIcon>
+#include <QShortcut>
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) || defined(COMPILE_ON_MAC)
 	#include <QStyleFactory>
@@ -1432,6 +1433,8 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent)
 
 			KviTalToolTip::add(m_pShowThisDialogAtStartupSelector,__tr2qs_ctx("<center>If this option is enabled, the Servers dialog will appear every time you start KVIrc</center>","options"));
 		}
+
+		new QShortcut(Qt::Key_Escape, parent, SLOT(close()));
 	} else {
 		m_pConnectCurrent = NULL;
 	}
diff --git a/src/modules/reguser/RegisteredUsersDialog.cpp b/src/modules/reguser/RegisteredUsersDialog.cpp
index d676a1235..3b2f1c068 100644
--- a/src/modules/reguser/RegisteredUsersDialog.cpp
+++ b/src/modules/reguser/RegisteredUsersDialog.cpp
@@ -64,6 +64,7 @@
 #include <QAbstractItemView>
 #include <QTextDocument>
 #include <QAbstractTextDocumentLayout>
+#include <QShortcut>
 
 #define LVI_ICON_SIZE 32
 #define LVI_BORDER 4
@@ -313,6 +314,8 @@ RegisteredUsersDialog::RegisteredUsersDialog(QWidget * par)
 	connect(m_pListView,SIGNAL(itemSelectionChanged()),this,SLOT(selectionChanged()));
 	connect(m_pListView,SIGNAL(rightButtonPressed(QTreeWidgetItem *, QPoint)),this,SLOT(rightButtonPressed(QTreeWidgetItem *, QPoint)));
 
+	new QShortcut(Qt::Key_Escape, this, SLOT(cancelClicked()));
+
 	fillList();
 
 	if(!parent())
diff --git a/src/modules/theme/ThemeManagementDialog.cpp b/src/modules/theme/ThemeManagementDialog.cpp
index 8cf91beb3..e1becb2c4 100644
--- a/src/modules/theme/ThemeManagementDialog.cpp
+++ b/src/modules/theme/ThemeManagementDialog.cpp
@@ -70,6 +70,7 @@
 #include <QSplitter>
 #include <QTextDocument>
 #include <QAbstractTextDocumentLayout>
+#include <QShortcut>
 
 extern QRect g_rectManagementDialogGeometry;
 
@@ -247,6 +248,8 @@ ThemeManagementDialog::ThemeManagementDialog(QWidget * parent)
 
 	QRect rect = g_pApp->desktop()->screenGeometry(g_pMainWindow);
 	move(rect.x() + ((rect.width() - g_rectManagementDialogGeometry.width())/2),rect.y() + ((rect.height() - g_rectManagementDialogGeometry.height())/2));
+
+	new QShortcut(Qt::Key_Escape, this, SLOT(closeClicked()));
 }
 
 ThemeManagementDialog::~ThemeManagementDialog()
diff --git a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
index 2d80dba87..7761df686 100644
--- a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
+++ b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
@@ -346,6 +346,8 @@ CustomizeToolBarsDialog::CustomizeToolBarsDialog(QWidget * p)
 		g_rectToolBarEditorDialogGeometry.height());
 	move(g_rectToolBarEditorDialogGeometry.x(),
 		g_rectToolBarEditorDialogGeometry.y());
+
+	new QShortcut(Qt::Key_Escape, this, SLOT(closeClicked()));
 }
 
 CustomizeToolBarsDialog::~CustomizeToolBarsDialog()