1 files changed, 31 insertions, 6 deletions
diff --git a/Swift/QtUI/QtMainWindow.cpp b/Swift/QtUI/QtMainWindow.cpp
index 0c1dd97..92488ae 100644
--- a/Swift/QtUI/QtMainWindow.cpp
+++ b/Swift/QtUI/QtMainWindow.cpp
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/QtMainWindow.h>
@@ -17,26 +17,29 @@
 #include <QLineEdit>
 #include <QListWidget>
 #include <QListWidgetItem>
 #include <QMenuBar>
 #include <QPushButton>
+#include <QScrollArea>
 #include <QTabWidget>
 #include <QToolBar>
 
 #include <Swiften/Base/Platform.h>
 
 #include <Swift/Controllers/SettingConstants.h>
 #include <Swift/Controllers/UIEvents/JoinMUCUIEvent.h>
+#include <Swift/Controllers/UIEvents/FdpFormSubmitWindowOpenUIEvent.h>
 #include <Swift/Controllers/UIEvents/RequestAdHocUIEvent.h>
 #include <Swift/Controllers/UIEvents/RequestAddUserDialogUIEvent.h>
 #include <Swift/Controllers/UIEvents/RequestBlockListDialogUIEvent.h>
 #include <Swift/Controllers/UIEvents/RequestChatWithUserDialogUIEvent.h>
 #include <Swift/Controllers/UIEvents/RequestHistoryUIEvent.h>
 #include <Swift/Controllers/UIEvents/RequestJoinMUCUIEvent.h>
 #include <Swift/Controllers/UIEvents/RequestProfileEditorUIEvent.h>
 
 #include <Swift/QtUI/QtAdHocCommandWithJIDWindow.h>
+#include <Swift/QtUI/QtChatOverview.h>
 #include <Swift/QtUI/QtLoginWindow.h>
 #include <Swift/QtUI/QtSettingsProvider.h>
 #include <Swift/QtUI/QtSwiftUtil.h>
 #include <Swift/QtUI/QtTabWidget.h>
 #include <Swift/QtUI/QtUISettingConstants.h>
@@ -50,11 +53,11 @@
 #include <Swift/QtUI/QtCertificateViewerDialog.h>
 #endif
 
 namespace Swift {
 
-QtMainWindow::QtMainWindow(SettingsProvider* settings, UIEventStream* uiEventStream, QtLoginWindow::QtMenus loginMenus, StatusCache* statusCache, bool emoticonsExist, bool enableAdHocCommandOnJID) : QWidget(), MainWindow(false), loginMenus_(loginMenus) {
+QtMainWindow::QtMainWindow(Chattables& chattables, SettingsProvider* settings, UIEventStream* uiEventStream, QtLoginWindow::QtMenus loginMenus, StatusCache* statusCache, bool emoticonsExist, bool enableAdHocCommandOnJID) : QWidget(), MainWindow(false), chattables_(chattables), loginMenus_(loginMenus) {
     uiEventStream_ = uiEventStream;
     settings_ = settings;
     setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
     QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
     mainLayout->setContentsMargins(0,0,0,0);
@@ -64,15 +67,26 @@ QtMainWindow::QtMainWindow(SettingsProvider* settings, UIEventStream* uiEventStr
     connect(meView_, SIGNAL(onChangeStatusRequest(StatusShow::Type, const QString&)), this, SLOT(handleStatusChanged(StatusShow::Type, const QString&)));
     connect(meView_, SIGNAL(onEditProfileRequest()), this, SLOT(handleEditProfileRequest()));
     connect(meView_, SIGNAL(onShowCertificateInfo()), this, SLOT(handleShowCertificateInfo()));
 
     tabs_ = new QtTabWidget(this);
-#if QT_VERSION >= 0x040500
     tabs_->setDocumentMode(true);
-#endif
     tabs_->setTabPosition(QTabWidget::South);
     mainLayout->addWidget(tabs_);
+
+    if (settings->getSetting(SettingConstants::FUTURE)) {
+        chatOverview_ = new QtChatOverview(chattables, this);
+        auto overviewScroll = new QScrollArea(this);
+        overviewScroll->setWidgetResizable(true);
+        overviewScroll->setWidget(chatOverview_);
+        tabs_->addTab(overviewScroll, tr("&All"));
+
+        // When used with QSplitter and setChildrenCollapsible(false), the following prevents
+        // this widget to be hidden, i.e. resized to zero width.
+        chatOverview_->setMinimumWidth(20);
+    }
+
     contactsTabWidget_ = new QWidget(this);
     contactsTabWidget_->setContentsMargins(0, 0, 0, 0);
     QBoxLayout *contactTabLayout = new QBoxLayout(QBoxLayout::TopToBottom, contactsTabWidget_);
     contactsTabWidget_->setLayout(contactTabLayout);
     contactTabLayout->setSpacing(0);
@@ -80,13 +94,11 @@ QtMainWindow::QtMainWindow(SettingsProvider* settings, UIEventStream* uiEventStr
 
     treeWidget_ = new QtRosterWidget(uiEventStream_, settings_, this);
 
     contactTabLayout->addWidget(treeWidget_);
     new QtFilterWidget(this, treeWidget_, uiEventStream_, contactTabLayout);
-
     tabs_->addTab(contactsTabWidget_, tr("&Contacts"));
-
     eventWindow_ = new QtEventWindow(uiEventStream_);
     connect(eventWindow_, SIGNAL(onNewEventCountUpdated(int)), this, SLOT(handleEventCountUpdated(int)));
 
     chatListWindow_ = new QtChatListWindow(uiEventStream_, settings_);
     connect(chatListWindow_, SIGNAL(onCountUpdated(int)), this, SLOT(handleChatCountUpdated(int)));
@@ -101,12 +113,15 @@ QtMainWindow::QtMainWindow(SettingsProvider* settings, UIEventStream* uiEventStr
     tabBarCombo_ = nullptr;
     if (settings_->getSetting(QtUISettingConstants::USE_SCREENREADER)) {
         tabs_->tabBar()->hide();
         tabBarCombo_ = new QComboBox(this);
         tabBarCombo_->setAccessibleName("Current View");
+        tabBarCombo_->addItem(tr("All"));
+#ifndef NOT_YET
         tabBarCombo_->addItem(tr("Contacts"));
         tabBarCombo_->addItem(tr("Chats"));
+#endif
         tabBarCombo_->addItem(tr("Notices"));
         tabBarCombo_->setCurrentIndex(tabs_->currentIndex());
         mainLayout->addWidget(tabBarCombo_);
         connect(tabBarCombo_, SIGNAL(currentIndexChanged(int)), tabs_, SLOT(setCurrentIndex(int)));
     }
@@ -183,10 +198,17 @@ QtMainWindow::QtMainWindow(SettingsProvider* settings, UIEventStream* uiEventStr
         actionsMenu->addAction(otherAdHocAction_);
         onlineOnlyActions_ << otherAdHocAction_;
     }
     serverAdHocMenu_ = new QMenu(tr("Run Server Command"), this);
     actionsMenu->addMenu(serverAdHocMenu_);
+    if (settings_->getSetting(SettingConstants::FUTURE)) {
+        actionsMenu->addSeparator();
+        submitFormAction_ = new QAction(tr("Submit Form"), this);
+        connect(submitFormAction_, &QAction::triggered, this, &QtMainWindow::handleSubmitFormActionTriggered);
+        actionsMenu->addAction(submitFormAction_);
+        onlineOnlyActions_ << submitFormAction_;
+    }
     actionsMenu->addSeparator();
     QAction* signOutAction = new QAction(tr("&Sign Out"), this);
     connect(signOutAction, SIGNAL(triggered()), SLOT(handleSignOutAction()));
     actionsMenu->addAction(signOutAction);
 
@@ -421,7 +443,10 @@ void QtMainWindow::setAvailableAdHocCommands(const std::vector<DiscoItems::Item>
 
 void QtMainWindow::setBlockingCommandAvailable(bool isAvailable) {
     openBlockingListEditor_->setVisible(isAvailable);
 }
 
+void QtMainWindow::handleSubmitFormActionTriggered() {
+    uiEventStream_->send(std::make_shared<FdpFormSubmitWindowOpenUIEvent>());
 }
 
+}