summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-01-15 20:58:00 (GMT)
committerKevin Smith <kevin.smith@isode.com>2015-02-17 11:54:49 (GMT)
commit265b779d6766130afa8f2f166733dc172ba22dca (patch)
tree5eb420f523cdfc561ff8c3a2ee44ecc28a717062 /Swift/QtUI/QtTabbable.h
parent619c4611e7c495c4545d65df5c86aa051ab6d354 (diff)
downloadswift-265b779d6766130afa8f2f166733dc172ba22dca.zip
swift-265b779d6766130afa8f2f166733dc172ba22dca.tar.bz2
Fix shortcut handling for chat window navigation
This commit fixes CTRL-Tab, CTRL-Backtab and CTRL-W shortcuts on Mac, Windows and Linux. These shortcuts work in all mode except --no-tabs mode. This will be fixed in a future commit. There is still different behavior across platforms: on Windows and Linux they are handled on key press and repeat, and on Mac they are handled on key release and do not repeat. Test-Information: Tested on OS X 10.9.5, Windows 7 and Elementary OS. Change-Id: I2179f234cfd76b86cf261f2cf7500fc1cf0439a4
Diffstat (limited to 'Swift/QtUI/QtTabbable.h')
-rw-r--r--Swift/QtUI/QtTabbable.h8
1 files changed, 1 insertions, 7 deletions
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,5 +1,5 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,11 +8,8 @@
#include <string>
-#include <QList>
#include <QWidget>
-class QShortcut;
-
namespace Swift {
class QtTabbable : public QWidget {
Q_OBJECT
@@ -38,8 +35,5 @@ namespace Swift {
void requestNextTab();
void requestActiveTab();
void requestFlash();
-
- private:
- QList<QShortcut*> shortcuts;
};
}