Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-01-15 20:58:00 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-02-17 11:54:49 (GMT) |
| commit | 265b779d6766130afa8f2f166733dc172ba22dca (patch) | |
| tree | 5eb420f523cdfc561ff8c3a2ee44ecc28a717062 /Swift/QtUI/QtChatTabs.h | |
| parent | 619c4611e7c495c4545d65df5c86aa051ab6d354 (diff) | |
| download | swift-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/QtChatTabs.h')
| -rw-r--r-- | Swift/QtUI/QtChatTabs.h | 7 |
1 files changed, 6 insertions, 1 deletions
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,5 +1,5 @@ /* - * Copyright (c) 2010-2014 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,6 +8,7 @@ #include <QWidget> #include <QRect> +#include <QShortcut> class QTabWidget; class QMenu; @@ -54,6 +55,8 @@ namespace Swift { void handleOpenLayoutChangeDialog(); + void handleCloseTabShortcut(); + private: void storeTabPositions(); void checkForFirstShow(); @@ -64,6 +67,8 @@ namespace Swift { bool trellisMode_; QtDynamicGridLayout* dynamicGrid_; QtGridSelectionDialog* gridSelectionDialog_; + + QList<QShortcut*> shortcuts_; }; } |