4 files changed, 37 insertions, 23 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());
diff --git a/Swift/QtUI/QtChatTabs.h b/Swift/QtUI/QtChatTabs.h
index 6cb4dfe..04e9eca 100644
--- a/Swift/QtUI/QtChatTabs.h
+++ b/Swift/QtUI/QtChatTabs.h
@@ -1,16 +1,17 @@
 /*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <QWidget>
 #include <QRect>
+#include <QShortcut>
 
 class QTabWidget;
 class QMenu;
 
 namespace Swift {
 	class SettingsProvider;
@@ -51,19 +52,23 @@ namespace Swift {
 			void handleRequestedNextTab();
 			void handleRequestedActiveTab();
 			void flash();
 
 			void handleOpenLayoutChangeDialog();
 
+			void handleCloseTabShortcut();
+
 		private:
 			void storeTabPositions();
 			void checkForFirstShow();
 
 		private:
 			bool singleWindow_;
 			SettingsProvider* settingsProvider_;
 			bool trellisMode_;
 			QtDynamicGridLayout* dynamicGrid_;
 			QtGridSelectionDialog* gridSelectionDialog_;
+
+			QList<QShortcut*> shortcuts_;
 	};
 }
 
diff --git a/Swift/QtUI/QtTabbable.cpp b/Swift/QtUI/QtTabbable.cpp
index 962bd9d..feab35e 100644
--- a/Swift/QtUI/QtTabbable.cpp
+++ b/Swift/QtUI/QtTabbable.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/QtTabbable.h>
 
@@ -16,22 +16,16 @@
 #include <Swift/QtUI/QtChatTabs.h>
 #include <Swift/QtUI/QtUtilities.h>
 
 namespace Swift {
 
 QtTabbable::QtTabbable() : QWidget() {
-	shortcuts << new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), window(), SLOT(close()));
-	shortcuts << new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_PageUp), window(), SIGNAL(requestPreviousTab()));
-	shortcuts << new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_PageDown), window(), SIGNAL(requestNextTab()));
-	shortcuts << new QShortcut(QKeySequence(Qt::ALT + Qt::Key_A), window(), SIGNAL(requestActiveTab()));
+
 }
 
 QtTabbable::~QtTabbable() {
-	foreach (QShortcut* shortcut, shortcuts) {
-		delete shortcut;
-	}
 	emit windowClosing();
 }
 
 bool QtTabbable::isWidgetSelected() {
 	/*isActiveWindow() shouldn't be necessary, but I don't trust it as far as I can throw it*/
 	if (!isActiveWindow()) {
@@ -42,22 +36,26 @@ bool QtTabbable::isWidgetSelected() {
 }
 
 bool QtTabbable::event(QEvent* event) {
 	QKeyEvent* keyEvent = dynamic_cast<QKeyEvent*>(event);
 	if (keyEvent) {
 		// According to Qt's focus documentation, one can only override CTRL+TAB via reimplementing QWidget::event().
-#ifdef SWIFTEN_PLATFORM_LINUX
-		if (keyEvent->modifiers().testFlag(QtUtilities::ctrlHardwareKeyModifier) && keyEvent->key() == Qt::Key_Tab && event->type() != QEvent::KeyRelease) {
-#else
 		if (keyEvent->modifiers().testFlag(QtUtilities::ctrlHardwareKeyModifier) && keyEvent->key() == Qt::Key_Tab) {
-#endif
-			emit requestNextTab();
+			if (keyEvent->type() != QEvent::ShortcutOverride) {
+				emit requestNextTab();
+			}
 			return true;
 		}
+#ifdef SWIFTEN_PLATFORM_LINUX
+		else if (keyEvent->modifiers().testFlag(QtUtilities::ctrlHardwareKeyModifier) && keyEvent->key() == Qt::Key_Backtab && keyEvent->type() != QEvent::KeyRelease) {
+#else
 		else if (keyEvent->modifiers().testFlag(QtUtilities::ctrlHardwareKeyModifier) && keyEvent->key() == Qt::Key_Backtab) {
-			emit requestPreviousTab();
+#endif
+			if (keyEvent->type() != QEvent::ShortcutOverride) {
+				emit requestPreviousTab();
+			}
 			return true;
 		}
 	}
 	return QWidget::event(event);
 }
 
diff --git a/Swift/QtUI/QtTabbable.h b/Swift/QtUI/QtTabbable.h
index c3cfa76..db83ba9 100644
--- a/Swift/QtUI/QtTabbable.h
+++ b/Swift/QtUI/QtTabbable.h
@@ -1,21 +1,18 @@
 /*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 
-#include <QList>
 #include <QWidget>
 
-class QShortcut;
-
 namespace Swift {
 	class QtTabbable : public QWidget {
 		Q_OBJECT
 		public:
 			enum AlertType {NoActivity, WaitingActivity, ImpendingActivity};
 			virtual ~QtTabbable();
@@ -35,11 +32,8 @@ namespace Swift {
 			void windowOpening();
 			void wantsToActivate();
 			void requestPreviousTab();
 			void requestNextTab();
 			void requestActiveTab();
 			void requestFlash();
-
-		private:
-			QList<QShortcut*> shortcuts;
 	};
 }