1 files changed, 18 insertions, 1 deletions
diff --git a/Swift/QtUI/QtChatTabs.cpp b/Swift/QtUI/QtChatTabs.cpp
index 0701d33..04c6a49 100644
--- a/Swift/QtUI/QtChatTabs.cpp
+++ b/Swift/QtUI/QtChatTabs.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/QtChatTabs.h>
 
@@ -67,15 +67,25 @@ QtChatTabs::QtChatTabs(bool singleWindow, SettingsProvider* settingsProvider, bo
 			inTabPositions >> tabPositions;
 			dynamicGrid_->setTabPositions(tabPositions);
 		}
 	}
 
 	gridSelectionDialog_ = new QtGridSelectionDialog();
+
+	// setup shortcuts
+	shortcuts_ << new QShortcut(QKeySequence(tr("CTRL+W", "Close chat tab.")), window(), SLOT(handleCloseTabShortcut()));
+	shortcuts_ << new QShortcut(QKeySequence(Qt::CTRL, Qt::Key_PageUp), window(), SLOT(handleRequestedPreviousTab()));
+	shortcuts_ << new QShortcut(QKeySequence(Qt::CTRL, Qt::Key_PageDown), window(), SLOT(handleRequestedNextTab()));
+	shortcuts_ << new QShortcut(QKeySequence(Qt::ALT + Qt::Key_A), window(), SLOT(handleRequestedActiveTab()));
 }
 
 QtChatTabs::~QtChatTabs() {
+	foreach (QShortcut* shortcut, shortcuts_) {
+		delete shortcut;
+	}
+
 	if (trellisMode_) {
 		storeTabPositions();
 	}
 	delete gridSelectionDialog_;
 }
 
@@ -227,12 +237,19 @@ void QtChatTabs::handleRequestedActiveTab() {
 			}
 		}
 	}
 }
 
 
+void QtChatTabs::handleCloseTabShortcut() {
+	QWidget* currentWidget = dynamicGrid_->currentWidget();
+	if (currentWidget) {
+		currentWidget->close();
+	}
+}
+
 void QtChatTabs::handleTabCloseRequested(int index) {
 	if (trellisMode_) {
 		storeTabPositions();
 	}
 
 	assert(index < dynamicGrid_->count());