Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Swift/QtUI/QtChatTabs.cpp6
-rw-r--r--Swift/QtUI/QtTabWidget.cpp4
2 files changed, 4 insertions, 6 deletions
diff --git a/Swift/QtUI/QtChatTabs.cpp b/Swift/QtUI/QtChatTabs.cpp
index ad95a07..f4d0d46 100644
--- a/Swift/QtUI/QtChatTabs.cpp
+++ b/Swift/QtUI/QtChatTabs.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2010-2016 Isode Limited. 2 * Copyright (c) 2010-2017 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -18,8 +18,8 @@
18#include <QMenu> 18#include <QMenu>
19#include <QTabBar> 19#include <QTabBar>
20#include <QTabWidget> 20#include <QTabWidget>
21#include <QtGlobal>
22#include <QWindow> 21#include <QWindow>
22#include <QtGlobal>
23 23
24#include <Swiften/Base/Log.h> 24#include <Swiften/Base/Log.h>
25 25
@@ -112,8 +112,6 @@ void QtChatTabs::setViewMenu(QMenu* viewMenu) {
112 if (trellisMode_) { 112 if (trellisMode_) {
113 viewMenu->addSeparator(); 113 viewMenu->addSeparator();
114 QAction* action = new QAction(tr("Change &layout"), this); 114 QAction* action = new QAction(tr("Change &layout"), this);
115 action->setShortcutContext(Qt::ApplicationShortcut);
116 action->setShortcut(QKeySequence(tr("Ctrl+Alt+L")));
117 connect(action, SIGNAL(triggered()), this, SLOT(handleOpenLayoutChangeDialog())); 115 connect(action, SIGNAL(triggered()), this, SLOT(handleOpenLayoutChangeDialog()));
118 viewMenu->addAction(action); 116 viewMenu->addAction(action);
119 117
diff --git a/Swift/QtUI/QtTabWidget.cpp b/Swift/QtUI/QtTabWidget.cpp
index 67e3ae9..99ef6ee 100644
--- a/Swift/QtUI/QtTabWidget.cpp
+++ b/Swift/QtUI/QtTabWidget.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2010-2016 Isode Limited. 2 * Copyright (c) 2010-2017 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -57,7 +57,7 @@ void QtTabWidget::paintEvent(QPaintEvent * event) {
57 label.setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); 57 label.setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
58 label.setGeometry(QRect(QPoint(0,0), size()) - QMargins(10,10,10,10)); 58 label.setGeometry(QRect(QPoint(0,0), size()) - QMargins(10,10,10,10));
59 label.setWordWrap(true); 59 label.setWordWrap(true);
60 label.setText(tr("This empty cell is a placeholder for chat windows. You can move existing chats to this cell by dragging the tab over here. You can change the number of cells via the 'Change layout' dialog under the 'View' menu or by using the %1 shortcut.").arg(QKeySequence(tr("Ctrl+Alt+L")).toString(QKeySequence::NativeText))); 60 label.setText(tr("This empty cell is a placeholder for chat windows. You can move existing chats to this cell by dragging the tab over here. You can change the number of cells via the 'Change layout' dialog under the 'View' menu."));
61 QPainter painter(this); 61 QPainter painter(this);
62 painter.drawPixmap(label.geometry().topLeft(), label.grab()); 62 painter.drawPixmap(label.geometry().topLeft(), label.grab());
63 } 63 }