1 files changed, 43 insertions, 53 deletions
diff --git a/Swift/QtUI/QtUIFactory.cpp b/Swift/QtUI/QtUIFactory.cpp
index 583c477..93fca5f 100644
--- a/Swift/QtUI/QtUIFactory.cpp
+++ b/Swift/QtUI/QtUIFactory.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2010-2017 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
@@ -21,3 +21,2 @@
 #include <Swift/QtUI/QtChatTabs.h>
-#include <Swift/QtUI/QtChatTabsBase.h>
 #include <Swift/QtUI/QtChatWindow.h>
@@ -25,2 +24,3 @@
 #include <Swift/QtUI/QtContactEditWindow.h>
+#include <Swift/QtUI/QtFdpFormSubmitWindow.h>
 #include <Swift/QtUI/QtFileTransferListWidget.h>
@@ -43,6 +43,7 @@ namespace Swift {
 
-QtUIFactory::QtUIFactory(SettingsProviderHierachy* settings, QtSettingsProvider* qtOnlySettings, QtChatTabsBase* tabs, QtSingleWindow* netbookSplitter, QtSystemTray* systemTray, QtChatWindowFactory* chatWindowFactory, TimerFactory* timerFactory, StatusCache* statusCache, AutoUpdater* autoUpdater, bool startMinimized, bool emoticonsExist, bool enableAdHocCommandOnJID) : settings(settings), qtOnlySettings(qtOnlySettings), tabsBase(tabs), netbookSplitter(netbookSplitter), systemTray(systemTray), chatWindowFactory(chatWindowFactory), timerFactory_(timerFactory), lastMainWindow(nullptr), loginWindow(nullptr), statusCache(statusCache), autoUpdater(autoUpdater), startMinimized(startMinimized), emoticonsExist_(emoticonsExist), enableAdHocCommandOnJID_(enableAdHocCommandOnJID) {
-    chatFontSize = settings->getSetting(QtUISettingConstants::CHATWINDOW_FONT_SIZE);
-    historyFontSize_ = settings->getSetting(QtUISettingConstants::HISTORYWINDOW_FONT_SIZE);
-    this->tabs = dynamic_cast<QtChatTabs*>(tabsBase);
+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);
 }
@@ -50,6 +51,7 @@ QtUIFactory::QtUIFactory(SettingsProviderHierachy* settings, QtSettingsProvider*
 QtUIFactory::~QtUIFactory() {
-    SWIFT_LOG(debug) << "Entering QtUIFactory destructor. chatWindows size:" << chatWindows.size() << std::endl;
-    for (auto chat : chatWindows) {
+    SWIFT_LOG(debug) << "Entering QtUIFactory destructor. chatWindows size:" << chatWindows_.size() << std::endl;
+    for (auto chat : chatWindows_) {
         SWIFT_LOG_ASSERT(chat.isNull(), debug) << "QtUIFactory has active chat windows and has not been reset properly" << std::endl;
     }
+    delete chatWindowFactory_;
 }
@@ -58,3 +60,3 @@ XMLConsoleWidget* QtUIFactory::createXMLConsoleWidget() {
     QtXMLConsoleWidget* widget = new QtXMLConsoleWidget();
-    tabsBase->addTab(widget);
+    tabs_->addTab(widget);
     showTabs();
@@ -65,4 +67,4 @@ XMLConsoleWidget* QtUIFactory::createXMLConsoleWidget() {
 HistoryWindow* QtUIFactory::createHistoryWindow(UIEventStream* uiEventStream) {
-    QtHistoryWindow* window = new QtHistoryWindow(settings, uiEventStream);
-    tabsBase->addTab(window);
+    QtHistoryWindow* window = new QtHistoryWindow(settings_, uiEventStream);
+    tabs_->addTab(window);
     showTabs();
@@ -77,3 +79,3 @@ void QtUIFactory::handleHistoryWindowFontResized(int size) {
     historyFontSize_ = size;
-    settings->storeSetting(QtUISettingConstants::HISTORYWINDOW_FONT_SIZE, size);
+    settings_->storeSetting(QtUISettingConstants::HISTORYWINDOW_FONT_SIZE, size);
 }
@@ -82,3 +84,3 @@ FileTransferListWidget* QtUIFactory::createFileTransferListWidget() {
     QtFileTransferListWidget* widget = new QtFileTransferListWidget();
-    tabsBase->addTab(widget);
+    tabs_->addTab(widget);
     showTabs();
@@ -88,8 +90,6 @@ FileTransferListWidget* QtUIFactory::createFileTransferListWidget() {
 
-MainWindow* QtUIFactory::createMainWindow(UIEventStream* eventStream) {
-    lastMainWindow  = new QtMainWindow(settings, eventStream, loginWindow->getMenus(), statusCache, emoticonsExist_, enableAdHocCommandOnJID_);
-    if (tabs) {
-        tabs->setViewMenu(lastMainWindow->getMenus()[0]);
-    }
-    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_;
 }
@@ -97,21 +97,9 @@ MainWindow* QtUIFactory::createMainWindow(UIEventStream* eventStream) {
 LoginWindow* QtUIFactory::createLoginWindow(UIEventStream* eventStream) {
-    loginWindow = new QtLoginWindow(eventStream, settings, timerFactory_, autoUpdater);
-    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());
+    if (loginWindow_) {
+        return loginWindow_;
     }
-    connect(loginWindow, SIGNAL(geometryChanged()), this, SLOT(handleLoginWindowGeometryChanged()));
-    if (startMinimized) loginWindow->hide();
-#endif
-    return loginWindow;
-}
-
-void QtUIFactory::handleLoginWindowGeometryChanged() {
-    qtOnlySettings->getQSettings()->setValue("loginWindowGeometry", loginWindow->saveGeometry());
+    loginWindow_ = new QtLoginWindow(eventStream, settings_, timerFactory_, autoUpdater_);
+    netbookSplitter_->addAccount(loginWindow_, tabs_);
+    connect(systemTray_, SIGNAL(clicked()), loginWindow_, SLOT(toggleBringToFront()));
+    return loginWindow_;
 }
@@ -119,3 +107,3 @@ void QtUIFactory::handleLoginWindowGeometryChanged() {
 EventWindow* QtUIFactory::createEventWindow() {
-    return lastMainWindow->getEventWindow();
+    return lastMainWindow_->getEventWindow();
 }
@@ -123,3 +111,3 @@ EventWindow* QtUIFactory::createEventWindow() {
 ChatListWindow* QtUIFactory::createChatListWindow(UIEventStream*) {
-    return lastMainWindow->getChatListWindow();
+    return lastMainWindow_->getChatListWindow();
 }
@@ -131,14 +119,14 @@ MUCSearchWindow* QtUIFactory::createMUCSearchWindow() {
 ChatWindow* QtUIFactory::createChatWindow(const JID& contact, UIEventStream* eventStream) {
-    QtChatWindow* window = dynamic_cast<QtChatWindow*>(chatWindowFactory->createChatWindow(contact, eventStream));
+    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(),
+    chatWindows_.erase(std::remove_if(chatWindows_.begin(), chatWindows_.end(),
         [](QPointer<QtChatWindow>& window) {
             return window.isNull();
-        }), chatWindows.end());
+        }), chatWindows_.end());
 
-    chatWindows.push_back(window);
+    chatWindows_.push_back(window);
 
     connect(window, SIGNAL(fontResized(int)), this, SLOT(handleChatWindowFontResized(int)));
-    window->handleFontResized(chatFontSize);
+    window->handleFontResized(chatFontSize_);
     return window;
@@ -147,7 +135,7 @@ ChatWindow* QtUIFactory::createChatWindow(const JID& contact, UIEventStream* eve
 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) {
+    for (auto&& existingWindow : chatWindows_) {
         if (!existingWindow.isNull()) {
@@ -159,3 +147,3 @@ void QtUIFactory::handleChatWindowFontResized(int 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_);
 }
@@ -179,3 +167,3 @@ WhiteboardWindow* QtUIFactory::createWhiteboardWindow(std::shared_ptr<Whiteboard
 HighlightEditorWindow* QtUIFactory::createHighlightEditorWindow() {
-    return new QtHighlightNotificationConfigDialog(qtOnlySettings);
+    return new QtHighlightNotificationConfigDialog(qtOnlySettings_);
 }
@@ -190,7 +178,9 @@ AdHocCommandWindow* QtUIFactory::createAdHocCommandWindow(std::shared_ptr<Outgoi
 
+std::unique_ptr<FdpFormSubmitWindow> QtUIFactory::createFdpFormSubmitWindow() {
+    return std::make_unique<QtFdpFormSubmitWindow>();
+}
+
 void QtUIFactory::showTabs() {
-    if (tabs) {
-        if (!tabs->isVisible()) {
-            tabs->show();
-        }
+    if (!tabs_->isVisible()) {
+        tabs_->show();
     }