1 files changed, 52 insertions, 53 deletions
diff --git a/Swift/QtUI/QtChatWindowFactory.cpp b/Swift/QtUI/QtChatWindowFactory.cpp
index 78c04c9..33c8b94 100644
--- a/Swift/QtUI/QtChatWindowFactory.cpp
+++ b/Swift/QtUI/QtChatWindowFactory.cpp
@@ -1,84 +1,83 @@
 /*
- * Copyright (c) 2010 Kevin Smith
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2018 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/QtChatWindowFactory.h>
 
 #include <QDesktopWidget>
-#include <qdebug.h>
+
+#include <SwifTools/EmojiMapper.h>
 
 #include <Swift/QtUI/QtChatTabs.h>
-#include <Swift/QtUI/QtChatWindow.h>
-#include <Swift/QtUI/QtSwiftUtil.h>
 #include <Swift/QtUI/QtChatTheme.h>
+#include <Swift/QtUI/QtChatWindow.h>
+#include <Swift/QtUI/QtEmojisSelector.h>
 #include <Swift/QtUI/QtSingleWindow.h>
-
+#include <Swift/QtUI/QtSwiftUtil.h>
 
 namespace Swift {
 
 static const QString SPLITTER_STATE = "mucSplitterState";
 static const QString CHAT_TABS_GEOMETRY = "chatTabsGeometry";
 
-QtChatWindowFactory::QtChatWindowFactory(QtSingleWindow* splitter, SettingsProvider* settings, QtSettingsProvider* qtSettings, QtChatTabs* tabs, const QString& themePath) : themePath_(themePath) {
-	qtOnlySettings_ = qtSettings;
-	settings_ = settings;
-	tabs_ = tabs;
-	theme_ = NULL;
-	if (splitter) {
-		splitter->addWidget(tabs_);
-	} else if (tabs_) {
-		QVariant chatTabsGeometryVariant = qtOnlySettings_->getQSettings()->value(CHAT_TABS_GEOMETRY);
-		if (chatTabsGeometryVariant.isValid()) {
-			tabs_->restoreGeometry(chatTabsGeometryVariant.toByteArray());
-		}
-		connect(tabs_, SIGNAL(geometryChanged()), this, SLOT(handleWindowGeometryChanged()));
-	}
+QtChatWindowFactory::QtChatWindowFactory(QtSingleWindow* splitter, SettingsProvider* settings, QtSettingsProvider* qtSettings, QtChatTabs* tabs, const QString& themePath, const std::map<std::string, std::string>& emoticonsMap) : themePath_(themePath), emoticonsMap_(emoticonsMap) {
+    qtOnlySettings_ = qtSettings;
+    settings_ = settings;
+    tabs_ = tabs;
+    theme_ = nullptr;
+    splitter->addWidget(tabs_);
+    QVariant chatTabsGeometryVariant = qtOnlySettings_->getQSettings()->value(CHAT_TABS_GEOMETRY);
+    if (chatTabsGeometryVariant.isValid()) {
+        tabs_->restoreGeometry(chatTabsGeometryVariant.toByteArray());
+    }
+    connect(tabs_, SIGNAL(geometryChanged()), this, SLOT(handleWindowGeometryChanged()));
 }
 
 QtChatWindowFactory::~QtChatWindowFactory() {
-	delete theme_;
+    delete theme_;
 }
 
 ChatWindow* QtChatWindowFactory::createChatWindow(const JID &contact,UIEventStream* eventStream) {
-	if (!theme_) {
-		theme_ = new QtChatTheme(themePath_);
-		if (theme_->getIncomingContent().isEmpty()) {
-			delete theme_;
-			theme_ = new QtChatTheme(""); /* Use the inbuilt theme */
-		}
-	}
-
-	QtChatWindow *chatWindow = new QtChatWindow(P2QSTRING(contact.toString()), theme_, eventStream, settings_);
-	connect(chatWindow, SIGNAL(splitterMoved()), this, SLOT(handleSplitterMoved()));
-	connect(this, SIGNAL(changeSplitterState(QByteArray)), chatWindow, SLOT(handleChangeSplitterState(QByteArray)));
-
-	QVariant splitterState = qtOnlySettings_->getQSettings()->value(SPLITTER_STATE);
-	if(splitterState.isValid()) {
-		chatWindow->handleChangeSplitterState(splitterState.toByteArray());
-	}
-
-	if (tabs_) {
-		tabs_->addTab(chatWindow);
-	} else {
-		QVariant chatGeometryVariant = qtOnlySettings_->getQSettings()->value(CHAT_TABS_GEOMETRY);
-		if (chatGeometryVariant.isValid()) {
-			chatWindow->restoreGeometry(chatGeometryVariant.toByteArray());
-		}
-		connect(chatWindow, SIGNAL(geometryChanged()), this, SLOT(handleWindowGeometryChanged()));
-	}
-	return chatWindow;
+    if (!theme_) {
+        theme_ = new QtChatTheme(themePath_);
+        if (theme_->getIncomingContent().isEmpty()) {
+            delete theme_;
+            theme_ = new QtChatTheme(":/themes/Default/"); /* Use the inbuilt theme */
+        }
+    }
+
+    QtChatWindow* chatWindow = new QtChatWindow(P2QSTRING(contact.toString()), theme_, eventStream, settings_, qtOnlySettings_, emoticonsMap_);
+
+    connect(chatWindow, SIGNAL(splitterMoved()), this, SLOT(handleSplitterMoved()));
+    connect(this, SIGNAL(changeSplitterState(QByteArray)), chatWindow, SLOT(handleChangeSplitterState(QByteArray)));
+
+    QVariant splitterState = qtOnlySettings_->getQSettings()->value(SPLITTER_STATE);
+    if (splitterState.isValid()) {
+        chatWindow->handleChangeSplitterState(splitterState.toByteArray());
+    }
+
+    if (tabs_) {
+        tabs_->addTab(chatWindow);
+    } else {
+        QVariant chatGeometryVariant = qtOnlySettings_->getQSettings()->value(CHAT_TABS_GEOMETRY);
+        if (chatGeometryVariant.isValid()) {
+            chatWindow->restoreGeometry(chatGeometryVariant.toByteArray());
+        }
+        connect(chatWindow, SIGNAL(geometryChanged()), this, SLOT(handleWindowGeometryChanged()));
+    }
+    return chatWindow;
 }
 
 void QtChatWindowFactory::handleWindowGeometryChanged() {
-	qtOnlySettings_->getQSettings()->setValue(CHAT_TABS_GEOMETRY, qobject_cast<QWidget*>(sender())->saveGeometry());
+    qtOnlySettings_->getQSettings()->setValue(CHAT_TABS_GEOMETRY, qobject_cast<QWidget*>(sender())->saveGeometry());
 }
 
 void QtChatWindowFactory::handleSplitterMoved() {
-	QByteArray splitterState = qobject_cast<QtChatWindow*>(sender())->getSplitterState();
-	qtOnlySettings_->getQSettings()->setValue(SPLITTER_STATE, QVariant(splitterState));
-	emit changeSplitterState(splitterState);
+    QByteArray splitterState = qobject_cast<QtChatWindow*>(sender())->getSplitterState();
+    qtOnlySettings_->getQSettings()->setValue(SPLITTER_STATE, QVariant(splitterState));
+    emit changeSplitterState(splitterState);
 }
 
 }