From db0580bcac07701198cf010537f83e10f0ddcfca Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Thu, 7 Dec 2017 13:10:49 +0100
Subject: Remove shortcut for changing trellis layout

It is rarely used and conflicts with Polish keyboard layout
on Windows.

Test-Information:

Verified that shortcut is gone and the description text is
sensible on macOS 10.13.1 with Qt 5.4.2.

Change-Id: I79ede2827e2e5f7b9afcb3bbd2669e5bf83f091f

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 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -18,8 +18,8 @@
 #include <QMenu>
 #include <QTabBar>
 #include <QTabWidget>
-#include <QtGlobal>
 #include <QWindow>
+#include <QtGlobal>
 
 #include <Swiften/Base/Log.h>
 
@@ -112,8 +112,6 @@ void QtChatTabs::setViewMenu(QMenu* viewMenu) {
     if (trellisMode_) {
         viewMenu->addSeparator();
         QAction* action = new QAction(tr("Change &layout"), this);
-        action->setShortcutContext(Qt::ApplicationShortcut);
-        action->setShortcut(QKeySequence(tr("Ctrl+Alt+L")));
         connect(action, SIGNAL(triggered()), this, SLOT(handleOpenLayoutChangeDialog()));
         viewMenu->addAction(action);
 
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 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -57,7 +57,7 @@ void QtTabWidget::paintEvent(QPaintEvent * event) {
         label.setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
         label.setGeometry(QRect(QPoint(0,0), size()) - QMargins(10,10,10,10));
         label.setWordWrap(true);
-        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)));
+        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."));
         QPainter painter(this);
         painter.drawPixmap(label.geometry().topLeft(), label.grab());
     }
-- 
cgit v0.10.2-6-g49f6