7 files changed, 100 insertions, 2 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index cb43057..d9bb249 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -42,6 +42,7 @@
 #include "Swift/Controllers/PresenceNotifier.h"
 #include "Swift/Controllers/EventNotifier.h"
 #include "Swift/Controllers/Storages/StoragesFactory.h"
+#include "Swift/Controllers/WhiteboardManager.h"
 #include "SwifTools/Dock/Dock.h"
 #include "SwifTools/Notifier/TogglableNotifier.h"
 #include "Swiften/Base/foreach.h"
@@ -240,6 +241,8 @@ void MainController::resetClient() {
 	userSearchControllerAdd_ = NULL;
 	delete adHocManager_;
 	adHocManager_ = NULL;
+	delete whiteboardManager_;
+	whiteboardManager_ = NULL;
 	clientInitialized_ = false;
 }
 
@@ -317,6 +320,7 @@ void MainController::handleConnected() {
 		userSearchControllerChat_ = new UserSearchController(UserSearchController::StartChat, jid_, uiEventStream_, client_->getVCardManager(), uiFactory_, client_->getIQRouter(), rosterController_);
 		userSearchControllerAdd_ = new UserSearchController(UserSearchController::AddContact, jid_, uiEventStream_, client_->getVCardManager(), uiFactory_, client_->getIQRouter(), rosterController_);
 		adHocManager_ = new AdHocManager(JID(boundJID_.getDomain()), uiFactory_, client_->getIQRouter(), uiEventStream_, rosterController_->getWindow());
+		whiteboardManager_ = new WhiteboardManager(uiFactory_, uiEventStream_, client_->getStanzaChannel());
 	}
 	loginWindow_->setIsLoggingIn(false);
 
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h
index eeba9f3..4395c67 100644
--- a/Swift/Controllers/MainController.h
+++ b/Swift/Controllers/MainController.h
@@ -68,6 +68,7 @@ namespace Swift {
 	class AdHocManager;
 	class AdHocCommandWindowFactory;
 	class FileTransferOverview;
+	class WhiteboardManager;
 
 	class MainController {
 		public:
@@ -167,5 +168,6 @@ namespace Swift {
 			bool offlineRequested_;
 			static const int SecondsToWaitBeforeForceQuitting;
 			FileTransferOverview* ftOverview_;
+			WhiteboardManager* whiteboardManager_;
 	};
 }
diff --git a/Swift/Controllers/SConscript b/Swift/Controllers/SConscript
index 1e18d65..91a8949 100644
--- a/Swift/Controllers/SConscript
+++ b/Swift/Controllers/SConscript
@@ -71,7 +71,7 @@ if env["SCONS_STAGE"] == "build" :
 			"XMPPURIController.cpp",
 			"ChatMessageSummarizer.cpp",
 			"SettingConstants.cpp",
-			"WhiteboardController.cpp"
+			"WhiteboardManager.cpp"
 		])
 
 	env.Append(UNITTEST_SOURCES = [
diff --git a/Swift/Controllers/UIEvents/RequestWhiteboardUIEvent.h b/Swift/Controllers/UIEvents/RequestWhiteboardUIEvent.h
new file mode 100644
index 0000000..679bdc2
--- /dev/null
+++ b/Swift/Controllers/UIEvents/RequestWhiteboardUIEvent.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include "Swiften/JID/JID.h"
+
+#include "Swift/Controllers/UIEvents/UIEvent.h"
+
+namespace Swift {
+	class RequestWhiteboardUIEvent : public UIEvent {
+	public:
+		RequestWhiteboardUIEvent(const JID& contact) : contact_(contact) {};
+		JID getContact() {return contact_;}
+	private:
+		JID contact_;
+	};
+}
diff --git a/Swift/Controllers/UIInterfaces/WhiteboardWindowFactory.h b/Swift/Controllers/UIInterfaces/WhiteboardWindowFactory.h
index a16b083..8b52ee1 100644
--- a/Swift/Controllers/UIInterfaces/WhiteboardWindowFactory.h
+++ b/Swift/Controllers/UIInterfaces/WhiteboardWindowFactory.h
@@ -6,12 +6,16 @@
 
 #pragma once
 
+#include "Swiften/JID/JID.h"
+
 namespace Swift {
 	class WhiteboardWindow;
+	class StanzaChannel;
+
 	class WhiteboardWindowFactory {
 	public :
 		virtual ~WhiteboardWindowFactory() {};
 
-		virtual WhiteboardWindow* createWhiteboardWindow() = 0;
+		virtual WhiteboardWindow* createWhiteboardWindow(StanzaChannel* stanzaChannel, const JID& jid) = 0;
 	};
 }
diff --git a/Swift/Controllers/WhiteboardManager.cpp b/Swift/Controllers/WhiteboardManager.cpp
new file mode 100644
index 0000000..3a87387
--- /dev/null
+++ b/Swift/Controllers/WhiteboardManager.cpp
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <Swift/Controllers/WhiteboardManager.h>
+
+#include <boost/bind.hpp>
+
+#include <Swift/Controllers/UIEvents/RequestWhiteboardUIEvent.h>
+#include <Swiften/Client/StanzaChannel.h>
+
+namespace Swift {
+	WhiteboardManager::WhiteboardManager(WhiteboardWindowFactory* whiteboardWindowFactory, UIEventStream* uiEventStream, StanzaChannel* stanzaChannel) : whiteboardWindowFactory_(whiteboardWindowFactory), uiEventStream_(uiEventStream), stanzaChannel_(stanzaChannel) {
+		uiEventConnection_ = uiEventStream_->onUIEvent.connect(boost::bind(&WhiteboardManager::handleUIEvent, this, _1));
+	}
+
+	WhiteboardManager::~WhiteboardManager() {
+	}
+
+	void WhiteboardManager::handleUIEvent(boost::shared_ptr<UIEvent> event) {
+		boost::shared_ptr<RequestWhiteboardUIEvent> whiteboardEvent = boost::dynamic_pointer_cast<RequestWhiteboardUIEvent>(event);
+		if(whiteboardEvent) {
+			WhiteboardWindow* window = whiteboardWindowFactory_->createWhiteboardWindow(stanzaChannel_, whiteboardEvent->getContact());
+			window->show();
+		}
+	}
+}
diff --git a/Swift/Controllers/WhiteboardManager.h b/Swift/Controllers/WhiteboardManager.h
new file mode 100644
index 0000000..5876adf
--- /dev/null
+++ b/Swift/Controllers/WhiteboardManager.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2012 Mateusz Piękos
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+
+#pragma once
+
+#include <map>
+
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/JID/JID.h>
+
+#include <Swift/Controllers/UIEvents/UIEventStream.h>
+#include <Swift/Controllers/UIInterfaces/WhiteboardWindowFactory.h>
+#include <Swift/Controllers/UIInterfaces/WhiteboardWindow.h>
+
+namespace Swift {
+	class StanzaChannel;
+
+	class WhiteboardManager {
+	public:
+		WhiteboardManager(WhiteboardWindowFactory* whiteboardWindowFactory, UIEventStream* uiEventStream, StanzaChannel* stanzaChannel);
+		~WhiteboardManager();
+
+	private:
+		void handleUIEvent(boost::shared_ptr<UIEvent> event);
+
+	private:
+		std::map<JID, WhiteboardWindow*> whiteboardWindows_;
+		UIEventStream* uiEventStream_;
+		WhiteboardWindowFactory* whiteboardWindowFactory_;
+		boost::bsignals::scoped_connection uiEventConnection_;
+		StanzaChannel* stanzaChannel_;
+	};
+}