1 files changed, 115 insertions, 105 deletions
diff --git a/Swift/QtUI/QtUIFactory.cpp b/Swift/QtUI/QtUIFactory.cpp
index e5db22d..49f55dd 100644
--- a/Swift/QtUI/QtUIFactory.cpp
+++ b/Swift/QtUI/QtUIFactory.cpp
@@ -1,179 +1,189 @@
 /*
- * Copyright (c) 2010-2012 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2019 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/QtUIFactory.h>
 
+#include <algorithm>
+
 #include <QSplitter>
 
-#include <Swift/QtUI/QtXMLConsoleWidget.h>
+#include <Swiften/Base/Log.h>
+#include <Swiften/Whiteboard/WhiteboardSession.h>
+
+#include <Swift/Controllers/Settings/SettingsProviderHierachy.h>
+
+#include <Swift/QtUI/MUCSearch/QtMUCSearchWindow.h>
+#include <Swift/QtUI/QtAdHocCommandWindow.h>
+#include <Swift/QtUI/QtBlockListEditorWindow.h>
 #include <Swift/QtUI/QtChatTabs.h>
-#include <Swift/QtUI/QtMainWindow.h>
-#include <Swift/QtUI/QtLoginWindow.h>
-#include <Swift/QtUI/QtSystemTray.h>
-#include <Swift/QtUI/QtSettingsProvider.h>
-#include <Swift/QtUI/QtMainWindow.h>
 #include <Swift/QtUI/QtChatWindow.h>
-#include <Swift/QtUI/QtJoinMUCWindow.h>
 #include <Swift/QtUI/QtChatWindowFactory.h>
-#include <Swift/QtUI/QtSwiftUtil.h>
-#include <Swift/QtUI/MUCSearch/QtMUCSearchWindow.h>
-#include <Swift/QtUI/UserSearch/QtUserSearchWindow.h>
-#include <Swift/QtUI/QtProfileWindow.h>
 #include <Swift/QtUI/QtContactEditWindow.h>
-#include <Swift/QtUI/QtAdHocCommandWindow.h>
+#include <Swift/QtUI/QtFdpFormSubmitWindow.h>
 #include <Swift/QtUI/QtFileTransferListWidget.h>
-#include <Swift/QtUI/QtHighlightEditorWidget.h>
-#include <Swift/QtUI/Whiteboard/QtWhiteboardWindow.h>
-#include <Swift/Controllers/Settings/SettingsProviderHierachy.h>
-#include <Swift/QtUI/QtUISettingConstants.h>
+#include <Swift/QtUI/QtHighlightNotificationConfigDialog.h>
 #include <Swift/QtUI/QtHistoryWindow.h>
-#include <Swiften/Whiteboard/WhiteboardSession.h>
+#include <Swift/QtUI/QtJoinMUCWindow.h>
+#include <Swift/QtUI/QtLoginWindow.h>
+#include <Swift/QtUI/QtMainWindow.h>
+#include <Swift/QtUI/QtProfileWindow.h>
+#include <Swift/QtUI/QtSettingsProvider.h>
 #include <Swift/QtUI/QtSingleWindow.h>
-#include <Swift/QtUI/QtBlockListEditorWindow.h>
+#include <Swift/QtUI/QtSwiftUtil.h>
+#include <Swift/QtUI/QtSystemTray.h>
+#include <Swift/QtUI/QtUISettingConstants.h>
+#include <Swift/QtUI/QtXMLConsoleWidget.h>
+#include <Swift/QtUI/UserSearch/QtUserSearchWindow.h>
+#include <Swift/QtUI/Whiteboard/QtWhiteboardWindow.h>
 
 namespace Swift {
 
-QtUIFactory::QtUIFactory(SettingsProviderHierachy* settings, QtSettingsProvider* qtOnlySettings, QtChatTabs* tabs, QtSingleWindow* netbookSplitter, QtSystemTray* systemTray, QtChatWindowFactory* chatWindowFactory, TimerFactory* timerFactory, StatusCache* statusCache, bool startMinimized, bool emoticonsExist) : settings(settings), qtOnlySettings(qtOnlySettings), tabs(tabs), netbookSplitter(netbookSplitter), systemTray(systemTray), chatWindowFactory(chatWindowFactory), timerFactory_(timerFactory), lastMainWindow(NULL), loginWindow(NULL), statusCache(statusCache), startMinimized(startMinimized), emoticonsExist_(emoticonsExist) {
-	chatFontSize = settings->getSetting(QtUISettingConstants::CHATWINDOW_FONT_SIZE);
-	historyFontSize_ = settings->getSetting(QtUISettingConstants::HISTORYWINDOW_FONT_SIZE);
+QtUIFactory::QtUIFactory(SettingsProviderHierachy* settings, QtSettingsProvider* qtOnlySettings, QtChatTabs* tabs, QtSingleWindow* netbookSplitter, QtSystemTray* systemTray, TimerFactory* timerFactory, StatusCache* statusCache, AutoUpdater* autoUpdater, std::map<std::string, std::string>& emoticons, bool enableAdHocCommandOnJID) : settings_(settings), qtOnlySettings_(qtOnlySettings), tabs_(tabs), netbookSplitter_(netbookSplitter), systemTray_(systemTray), timerFactory_(timerFactory), lastMainWindow_(nullptr), loginWindow_(nullptr), statusCache_(statusCache), autoUpdater_(autoUpdater), emoticons_(emoticons), enableAdHocCommandOnJID_(enableAdHocCommandOnJID) {
+    emoticonsExist_ = !emoticons_.empty();
+    chatWindowFactory_ = new QtChatWindowFactory(netbookSplitter_, settings, qtOnlySettings, tabs_, ":/themes/Default/", emoticons_);
+    chatFontSize_ = settings_->getSetting(QtUISettingConstants::CHATWINDOW_FONT_SIZE);
+    historyFontSize_ = settings_->getSetting(QtUISettingConstants::HISTORYWINDOW_FONT_SIZE);
+}
+
+QtUIFactory::~QtUIFactory() {
+    SWIFT_LOG(debug) << "Entering QtUIFactory destructor. chatWindows size:" << chatWindows_.size();
+    for (auto chat : chatWindows_) {
+        SWIFT_LOG_ASSERT(chat.isNull(), debug) << "QtUIFactory has active chat windows and has not been reset properly";
+    }
+    delete chatWindowFactory_;
 }
 
 XMLConsoleWidget* QtUIFactory::createXMLConsoleWidget() {
-	QtXMLConsoleWidget* widget = new QtXMLConsoleWidget();
-	tabs->addTab(widget);
-	if (!tabs->isVisible()) {
-		tabs->show();
-	}
-	widget->show();
-	return widget;
+    QtXMLConsoleWidget* widget = new QtXMLConsoleWidget();
+    tabs_->addTab(widget);
+    showTabs();
+    widget->show();
+    return widget;
 }
 
 HistoryWindow* QtUIFactory::createHistoryWindow(UIEventStream* uiEventStream) {
-	QtHistoryWindow* window = new QtHistoryWindow(settings, uiEventStream);
-	tabs->addTab(window);
-	if (!tabs->isVisible()) {
-		tabs->show();
-	}
+    QtHistoryWindow* window = new QtHistoryWindow(settings_, uiEventStream);
+    tabs_->addTab(window);
+    showTabs();
+    connect(window, SIGNAL(fontResized(int)), this, SLOT(handleHistoryWindowFontResized(int)));
 
-	connect(window, SIGNAL(fontResized(int)), this, SLOT(handleHistoryWindowFontResized(int)));
-
-	window->handleFontResized(historyFontSize_);
-	window->show();
-	return window;
+    window->handleFontResized(historyFontSize_);
+    window->show();
+    return window;
 }
 
 void QtUIFactory::handleHistoryWindowFontResized(int size) {
-	historyFontSize_ = size;
-	settings->storeSetting(QtUISettingConstants::HISTORYWINDOW_FONT_SIZE, size);
+    historyFontSize_ = size;
+    settings_->storeSetting(QtUISettingConstants::HISTORYWINDOW_FONT_SIZE, size);
 }
 
 FileTransferListWidget* QtUIFactory::createFileTransferListWidget() {
-	QtFileTransferListWidget* widget = new QtFileTransferListWidget();
-	tabs->addTab(widget);
-	if (!tabs->isVisible()) {
-		tabs->show();
-	}
-	widget->show();
-	return widget;
+    QtFileTransferListWidget* widget = new QtFileTransferListWidget();
+    tabs_->addTab(widget);
+    showTabs();
+    widget->show();
+    return widget;
 }
 
-MainWindow* QtUIFactory::createMainWindow(UIEventStream* eventStream) {
-	lastMainWindow  = new QtMainWindow(settings, eventStream, loginWindow->getMenus(), statusCache, emoticonsExist_);
-	return lastMainWindow;
+MainWindow* QtUIFactory::createMainWindow(Chattables& chattables, UIEventStream* eventStream) {
+    lastMainWindow_ = new QtMainWindow(chattables, settings_, eventStream, loginWindow_->getMenus(), statusCache_, emoticonsExist_, enableAdHocCommandOnJID_);
+    tabs_->setViewMenu(lastMainWindow_->getMenus()[0]);
+    return lastMainWindow_;
 }
 
 LoginWindow* QtUIFactory::createLoginWindow(UIEventStream* eventStream) {
-	loginWindow = new QtLoginWindow(eventStream, settings, timerFactory_);
-	if (netbookSplitter) {
-		netbookSplitter->insertAtFront(loginWindow);
-	}
-	connect(systemTray, SIGNAL(clicked()), loginWindow, SLOT(toggleBringToFront()));
-
-#ifndef SWIFT_MOBILE
-	QVariant loginWindowGeometryVariant = qtOnlySettings->getQSettings()->value("loginWindowGeometry");
-	if (loginWindowGeometryVariant.isValid()) {
-		loginWindow->restoreGeometry(loginWindowGeometryVariant.toByteArray());
-	}
-	connect(loginWindow, SIGNAL(geometryChanged()), this, SLOT(handleLoginWindowGeometryChanged()));
-	if (startMinimized) loginWindow->hide();
-#endif
-	return loginWindow;
-}
-
-void QtUIFactory::handleLoginWindowGeometryChanged() {
-	qtOnlySettings->getQSettings()->setValue("loginWindowGeometry", loginWindow->saveGeometry());
+    if (loginWindow_) {
+        return loginWindow_;
+    }
+    loginWindow_ = new QtLoginWindow(eventStream, settings_, timerFactory_, autoUpdater_);
+    netbookSplitter_->addAccount(loginWindow_, tabs_);
+    connect(systemTray_, SIGNAL(clicked()), loginWindow_, SLOT(toggleBringToFront()));
+    return loginWindow_;
 }
 
 EventWindow* QtUIFactory::createEventWindow() {
-	return lastMainWindow->getEventWindow();
+    return lastMainWindow_->getEventWindow();
 }
 
 ChatListWindow* QtUIFactory::createChatListWindow(UIEventStream*) {
-	return lastMainWindow->getChatListWindow();
+    return lastMainWindow_->getChatListWindow();
 }
 
 MUCSearchWindow* QtUIFactory::createMUCSearchWindow() {
-		return new QtMUCSearchWindow();
+        return new QtMUCSearchWindow();
 }
 
 ChatWindow* QtUIFactory::createChatWindow(const JID& contact, UIEventStream* eventStream) {
-	QtChatWindow* window = dynamic_cast<QtChatWindow*>(chatWindowFactory->createChatWindow(contact, eventStream));
-	chatWindows.push_back(window);
-	std::vector<QPointer<QtChatWindow> > deletions;
-	foreach (QPointer<QtChatWindow> existingWindow, chatWindows) {
-		if (existingWindow.isNull()) {
-			deletions.push_back(existingWindow);
-		} else {
-			connect(window, SIGNAL(fontResized(int)), existingWindow, SLOT(handleFontResized(int)));
-			connect(existingWindow, SIGNAL(fontResized(int)), window, SLOT(handleFontResized(int)));
-		}
-	}
-	foreach (QPointer<QtChatWindow> deletedWindow, deletions) {
-		chatWindows.erase(std::remove(chatWindows.begin(), chatWindows.end(), deletedWindow), chatWindows.end());
-	}
-	connect(window, SIGNAL(fontResized(int)), this, SLOT(handleChatWindowFontResized(int)));
-	window->handleFontResized(chatFontSize);
-	return window;
+    QtChatWindow* window = dynamic_cast<QtChatWindow*>(chatWindowFactory_->createChatWindow(contact, eventStream));
+
+    // remove already closed and thereby deleted chat windows
+    chatWindows_.erase(std::remove_if(chatWindows_.begin(), chatWindows_.end(),
+        [](QPointer<QtChatWindow>& window) {
+            return window.isNull();
+        }), chatWindows_.end());
+
+    chatWindows_.push_back(window);
+
+    connect(window, SIGNAL(fontResized(int)), this, SLOT(handleChatWindowFontResized(int)));
+    window->handleFontResized(chatFontSize_);
+    return window;
 }
 
 void QtUIFactory::handleChatWindowFontResized(int size) {
-	chatFontSize = size;
-	settings->storeSetting(QtUISettingConstants::CHATWINDOW_FONT_SIZE, size);
+    chatFontSize_ = size;
+    settings_->storeSetting(QtUISettingConstants::CHATWINDOW_FONT_SIZE, size);
+
+    // resize font in other chat windows
+    for (auto&& existingWindow : chatWindows_) {
+        if (!existingWindow.isNull()) {
+            existingWindow->handleFontResized(size);
+        }
+    }
 }
 
 UserSearchWindow* QtUIFactory::createUserSearchWindow(UserSearchWindow::Type type, UIEventStream* eventStream, const std::set<std::string>& groups) {
-	return new QtUserSearchWindow(eventStream, type, groups, qtOnlySettings);
+    return new QtUserSearchWindow(eventStream, type, groups, qtOnlySettings_);
 }
 
 JoinMUCWindow* QtUIFactory::createJoinMUCWindow(UIEventStream* uiEventStream) {
-	return new QtJoinMUCWindow(uiEventStream);
+    return new QtJoinMUCWindow(uiEventStream);
 }
 
 ProfileWindow* QtUIFactory::createProfileWindow() {
-	return new QtProfileWindow();
+    return new QtProfileWindow();
 }
 
 ContactEditWindow* QtUIFactory::createContactEditWindow() {
-	return new QtContactEditWindow();
+    return new QtContactEditWindow();
 }
 
-WhiteboardWindow* QtUIFactory::createWhiteboardWindow(boost::shared_ptr<WhiteboardSession> whiteboardSession) {
-	return new QtWhiteboardWindow(whiteboardSession);
+WhiteboardWindow* QtUIFactory::createWhiteboardWindow(std::shared_ptr<WhiteboardSession> whiteboardSession) {
+    return new QtWhiteboardWindow(whiteboardSession);
 }
 
-HighlightEditorWidget* QtUIFactory::createHighlightEditorWidget() {
-	return new QtHighlightEditorWidget();
+HighlightEditorWindow* QtUIFactory::createHighlightEditorWindow() {
+    return new QtHighlightNotificationConfigDialog(qtOnlySettings_);
 }
 
 BlockListEditorWidget *QtUIFactory::createBlockListEditorWidget() {
-	return new QtBlockListEditorWindow();
+    return new QtBlockListEditorWindow();
+}
+
+AdHocCommandWindow* QtUIFactory::createAdHocCommandWindow(std::shared_ptr<OutgoingAdHocCommandSession> command) {
+    return new QtAdHocCommandWindow(command);
+}
+
+std::unique_ptr<FdpFormSubmitWindow> QtUIFactory::createFdpFormSubmitWindow() {
+    return std::make_unique<QtFdpFormSubmitWindow>();
 }
 
-void QtUIFactory::createAdHocCommandWindow(boost::shared_ptr<OutgoingAdHocCommandSession> command) {
-	new QtAdHocCommandWindow(command);
+void QtUIFactory::showTabs() {
+    if (!tabs_->isVisible()) {
+        tabs_->show();
+    }
 }
 
 }