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/QtChatWindowFactory.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/QtChatWindowFactory.h')
-rw-r--r--Swift/QtUI/QtChatWindowFactory.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/Swift/QtUI/QtChatWindowFactory.h b/Swift/QtUI/QtChatWindowFactory.h
index c38202f..6b1f0a1 100644
--- a/Swift/QtUI/QtChatWindowFactory.h
+++ b/Swift/QtUI/QtChatWindowFactory.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -19,7 +19,7 @@
#include <Swift/QtUI/QtSettingsProvider.h>
namespace Swift {
- class QtChatTabs;
+ class QtChatTabsBase;
class QtChatTheme;
class UIEventStream;
class QtUIPreferences;
@@ -27,7 +27,7 @@ namespace Swift {
class QtChatWindowFactory : public QObject, public ChatWindowFactory {
Q_OBJECT
public:
- QtChatWindowFactory(QtSingleWindow* splitter, SettingsProvider* settings, QtSettingsProvider* qtSettings, QtChatTabs* tabs, const QString& themePath, const std::map<std::string, std::string>& emoticons);
+ QtChatWindowFactory(QtSingleWindow* splitter, SettingsProvider* settings, QtSettingsProvider* qtSettings, QtChatTabsBase* tabs, const QString& themePath, const std::map<std::string, std::string>& emoticons);
~QtChatWindowFactory();
ChatWindow* createChatWindow(const JID &contact, UIEventStream* eventStream);
signals:
@@ -39,7 +39,7 @@ namespace Swift {
QString themePath_;
SettingsProvider* settings_;
QtSettingsProvider* qtOnlySettings_;
- QtChatTabs* tabs_;
+ QtChatTabsBase* tabs_;
QtChatTheme* theme_;
std::map<std::string, std::string> emoticons_;
};