1 files changed, 31 insertions, 3 deletions
diff --git a/Swift/QtUI/QtUIFactory.cpp b/Swift/QtUI/QtUIFactory.cpp
index 35fbfcd..bd936d4 100644
--- a/Swift/QtUI/QtUIFactory.cpp
+++ b/Swift/QtUI/QtUIFactory.cpp
@@ -23,10 +23,14 @@
 #include "UserSearch/QtUserSearchWindow.h"
 #include "QtProfileWindow.h"
 #include "QtContactEditWindow.h"
+#include "QtAdHocCommandWindow.h"
+
+#define CHATWINDOW_FONT_SIZE "chatWindowFontSize"
 
 namespace Swift {
 
 QtUIFactory::QtUIFactory(QtSettingsProvider* settings, QtChatTabs* tabs, QSplitter* netbookSplitter, QtSystemTray* systemTray, QtChatWindowFactory* chatWindowFactory, bool startMinimized) : settings(settings), tabs(tabs), netbookSplitter(netbookSplitter), systemTray(systemTray), chatWindowFactory(chatWindowFactory), lastMainWindow(NULL), loginWindow(NULL), startMinimized(startMinimized)  {
+	chatFontSize = settings->getIntSetting(CHATWINDOW_FONT_SIZE, 0);
 }
 
 XMLConsoleWidget* QtUIFactory::createXMLConsoleWidget() {
@@ -80,15 +84,36 @@ MUCSearchWindow* QtUIFactory::createMUCSearchWindow() {
 }
 
 ChatWindow* QtUIFactory::createChatWindow(const JID& contact, UIEventStream* eventStream) {
-	return chatWindowFactory->createChatWindow(contact, 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;
+}
+
+void QtUIFactory::handleChatWindowFontResized(int size) {
+	chatFontSize = size;
+	settings->storeInt(CHATWINDOW_FONT_SIZE, size);
 }
 
 UserSearchWindow* QtUIFactory::createUserSearchWindow(UserSearchWindow::Type type, UIEventStream* eventStream, const std::set<std::string>& groups) {
 	return new QtUserSearchWindow(eventStream, type, groups);
 };
 
-JoinMUCWindow* QtUIFactory::createJoinMUCWindow() {
-	return new QtJoinMUCWindow();
+JoinMUCWindow* QtUIFactory::createJoinMUCWindow(UIEventStream* uiEventStream) {
+	return new QtJoinMUCWindow(uiEventStream);
 }
 
 ProfileWindow* QtUIFactory::createProfileWindow() {
@@ -99,5 +124,8 @@ ContactEditWindow* QtUIFactory::createContactEditWindow() {
 	return new QtContactEditWindow();
 }
 
+void QtUIFactory::createAdHocCommandWindow(boost::shared_ptr<OutgoingAdHocCommandSession> command) {
+	new QtAdHocCommandWindow(command);
+}
 
 }