summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-03-17 15:00:02 (GMT)
committerKevin Smith <kevin.smith@isode.com>2015-04-10 15:12:53 (GMT)
commit6a2e6d58233cbf40b34f962f2b2f9b1589969e13 (patch)
treeb0a62c32adc64fda30fc024f38acfb2a6da6351e /Swift/QtUI/QtChatTabs.h
parentb4e3ecf40ee5fda0ba46f714bd24a6d9f3a4cb5e (diff)
downloadswift-6a2e6d58233cbf40b34f962f2b2f9b1589969e13.zip
swift-6a2e6d58233cbf40b34f962f2b2f9b1589969e13.tar.bz2
Fix keyboard shortcuts for --no-tabs mode
This commit enables the following shortcuts for --no-tabs mode: - CTRL + Tab or CTRL/CMD + PageDown to switch to the next chat window - CTRL + Shift + Tab or CTRL/CMD + PageUp to switch to the previous chat window - CTRL/CMD + W to close the current chat window - ALT + A to switch to the next chat window with active messages Test-Information: Verified that the new shortcuts work as expected and verified that standard mode and netbook mode still work as usual. Change-Id: I3831b6c02f5d664cc8b21d7571e20aed00de89b4
Diffstat (limited to 'Swift/QtUI/QtChatTabs.h')
-rw-r--r--Swift/QtUI/QtChatTabs.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/Swift/QtUI/QtChatTabs.h b/Swift/QtUI/QtChatTabs.h
index bee03ec..71d4ddc 100644
--- a/Swift/QtUI/QtChatTabs.h
+++ b/Swift/QtUI/QtChatTabs.h
@@ -10,6 +10,8 @@
#include <QRect>
#include <QShortcut>
+#include <Swift/QtUI/QtChatTabsBase.h>
+
class QTabWidget;
class QMenu;
@@ -21,13 +23,13 @@ namespace Swift {
class QtDynamicGridLayout;
class QtGridSelectionDialog;
- class QtChatTabs : public QWidget {
+ class QtChatTabs : public QWidget, public QtChatTabsBase {
Q_OBJECT
public:
QtChatTabs(bool singleWindow, SettingsProvider* settingsProvider, bool trellisMode);
virtual ~QtChatTabs();
- void addTab(QtTabbable* tab);
+ virtual void addTab(QtTabbable* tab);
void minimise();
QtTabbable* getCurrentTab();
void setViewMenu(QMenu* viewMenu);