1 files changed, 11 insertions, 13 deletions
diff --git a/Swift/QtUI/QtChatTabs.cpp b/Swift/QtUI/QtChatTabs.cpp
index ad95a07..edd0b87 100644
--- a/Swift/QtUI/QtChatTabs.cpp
+++ b/Swift/QtUI/QtChatTabs.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -18,12 +18,13 @@
 #include <QMenu>
 #include <QTabBar>
 #include <QTabWidget>
-#include <QtGlobal>
 #include <QWindow>
+#include <QtGlobal>
 
 #include <Swiften/Base/Log.h>
 
 #include <Swift/Controllers/ChatMessageSummarizer.h>
+#include <Swift/Controllers/SettingConstants.h>
 
 #include <Swift/QtUI/QtSwiftUtil.h>
 #include <Swift/QtUI/QtTabWidget.h>
@@ -33,13 +34,13 @@
 #include <Swift/QtUI/Trellis/QtGridSelectionDialog.h>
 
 namespace Swift {
-QtChatTabs::QtChatTabs(bool singleWindow, SettingsProvider* settingsProvider, bool trellisMode) : QWidget(), singleWindow_(singleWindow), settingsProvider_(settingsProvider), trellisMode_(trellisMode), dynamicGrid_(nullptr), gridSelectionDialog_(nullptr) {
+QtChatTabs::QtChatTabs(SettingsProvider* settingsProvider, bool trellisMode) : QWidget(), settingsProvider_(settingsProvider), trellisMode_(trellisMode), dynamicGrid_(nullptr), gridSelectionDialog_(nullptr) {
 #ifndef Q_OS_MAC
     setWindowIcon(QIcon(":/logo-chat-16.png"));
 #else
     setAttribute(Qt::WA_ShowWithoutActivating);
 #endif
-    dynamicGrid_ = new QtDynamicGridLayout(this, trellisMode);
+    dynamicGrid_ = new QtDynamicGridLayout(settingsProvider->getSetting(SettingConstants::FUTURE), this, trellisMode);
     connect(dynamicGrid_, SIGNAL(tabCloseRequested(int)), this, SLOT(handleTabCloseRequested(int)));
     connect(dynamicGrid_, SIGNAL(onCurrentIndexChanged(int)), this, SLOT(handleCurrentTabIndexChanged(int)));
 
@@ -112,8 +113,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);
 
@@ -201,13 +200,8 @@ void QtChatTabs::handleTabClosing() {
     if (widget && ((index = dynamicGrid_->indexOf(widget)) >= 0)) {
         dynamicGrid_->removeTab(index);
         if (dynamicGrid_->count() == 0) {
-            if (!singleWindow_) {
-                hide();
-            }
-            else {
-                setWindowTitle("");
-                onTitleChanged("");
-            }
+            setWindowTitle("");
+            onTitleChanged("");
         }
         else {
             handleTabTitleUpdated(dynamicGrid_->currentWidget());
@@ -427,4 +421,8 @@ void QtChatTabs::checkForFirstShow() {
     }
 }
 
+QSize QtChatTabs::sizeHint() const {
+    return QSize(600, 600);
+}
+
 }