4 files changed, 42 insertions, 8 deletions
diff --git a/Swift/QtUI/QtUIFactory.cpp b/Swift/QtUI/QtUIFactory.cpp
index e0fc532..38e065c 100644
--- a/Swift/QtUI/QtUIFactory.cpp
+++ b/Swift/QtUI/QtUIFactory.cpp
@@ -136,7 +136,7 @@ ContactEditWindow* QtUIFactory::createContactEditWindow() {
 	return new QtContactEditWindow();
 }
 
-WhiteboardWindow* QtUIFactory::createWhiteboardWindow(WhiteboardSession* whiteboardSession) {
+WhiteboardWindow* QtUIFactory::createWhiteboardWindow(boost::shared_ptr<WhiteboardSession> whiteboardSession) {
 	return new QtWhiteboardWindow(whiteboardSession);
 }
 
diff --git a/Swift/QtUI/QtUIFactory.h b/Swift/QtUI/QtUIFactory.h
index 951b19c..d307759 100644
--- a/Swift/QtUI/QtUIFactory.h
+++ b/Swift/QtUI/QtUIFactory.h
@@ -43,7 +43,7 @@ namespace Swift {
 			virtual ProfileWindow* createProfileWindow();
 			virtual ContactEditWindow* createContactEditWindow();
 			virtual FileTransferListWidget* createFileTransferListWidget();
-			virtual WhiteboardWindow* createWhiteboardWindow(WhiteboardSession* whiteboardSession);
+			virtual WhiteboardWindow* createWhiteboardWindow(boost::shared_ptr<WhiteboardSession> whiteboardSession);
 			virtual void createAdHocCommandWindow(boost::shared_ptr<OutgoingAdHocCommandSession> command);
 
 		private slots:
diff --git a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp
index e0e68ba..3527eba 100644
--- a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp
+++ b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp
@@ -13,10 +13,11 @@
 #include <Swiften/Whiteboard/WhiteboardSession.h>
 #include <Swiften/Elements/WhiteboardPayload.h>
 
+#include <QMessageBox>
 using namespace std;
 
 namespace Swift {
-	QtWhiteboardWindow::QtWhiteboardWindow(WhiteboardSession* whiteboardSession) : QWidget(), whiteboardSession_(whiteboardSession) {
+	QtWhiteboardWindow::QtWhiteboardWindow(WhiteboardSession::ref whiteboardSession) : QWidget() {
 		layout = new QVBoxLayout(this);
 		hLayout = new QHBoxLayout;
 		sidebarLayout = new QVBoxLayout;
@@ -121,7 +122,7 @@ namespace Swift {
 		layout->addLayout(hLayout);
 		this->setLayout(layout);
 
-		whiteboardSession_->onDataReceived.connect(boost::bind(&QtWhiteboardWindow::addItem, this, _1));		
+		setSession(whiteboardSession);
 	}
 
 	void QtWhiteboardWindow::addItem(const std::string& item) {
@@ -222,10 +223,19 @@ namespace Swift {
 	{
 		graphicsView->setMode(GView::Select);
 	}
+
 	void QtWhiteboardWindow::show()
 	{
 		QWidget::show();
 	}
+
+	void QtWhiteboardWindow::setSession(WhiteboardSession::ref session) {
+		whiteboardSession_ = session;
+		whiteboardSession_->onDataReceived.connect(boost::bind(&QtWhiteboardWindow::addItem, this, _1));		
+		whiteboardSession_->onRequestAccepted.connect(boost::bind(&QWidget::show, this));
+		whiteboardSession_->onSessionTerminateReceived.connect(boost::bind(&QtWhiteboardWindow::handleSessionTerminate, this));
+	}
+
 	void QtWhiteboardWindow::handleLastItemChanged(QGraphicsItem* item) {
 		std::string serialized;
 		QGraphicsLineItem* lineItem = qgraphicsitem_cast<QGraphicsLineItem*>(item);
@@ -261,6 +271,25 @@ namespace Swift {
 //			stanzaChannel_->sendMessage(mes);*/
 			whiteboardSession_->sendData(serialized);
 		}
+	}
 
+	void QtWhiteboardWindow::handleSessionTerminate() {
+		QMessageBox box(this);
+		box.setText(tr("Session was terminated by other user"));
+		box.setIcon(QMessageBox::Information);
+		box.exec();
+		hide();
+	}
+
+	void QtWhiteboardWindow::closeEvent(QCloseEvent* event) {
+		QMessageBox box(this);
+		box.setText(tr("Closing window is equivalent closing the session. Are you sure you want to do this?"));
+		box.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+		box.setIcon(QMessageBox::Question);
+		if (box.exec() == QMessageBox::Yes) {
+			whiteboardSession_->cancel();
+		} else {
+			event->ignore();
+		}
 	}
 }
diff --git a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.h b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.h
index f1a9ed5..4c0a065 100644
--- a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.h
+++ b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.h
@@ -8,6 +8,7 @@
 
 #include <Swift/Controllers/UIInterfaces/WhiteboardWindow.h>
 #include <Swiften/Elements/Message.h>
+#include <Swiften/Whiteboard/WhiteboardSession.h>
 
 #include <QWidget>
 #include <QGraphicsView>
@@ -20,19 +21,19 @@
 #include <QSpinBox>
 #include <QColorDialog>
 #include <QToolButton>
+#include <QCloseEvent>
 
 #include "GView.h"
 
 namespace Swift {
-	class WhiteboardSession;
-
 	class QtWhiteboardWindow : public QWidget, public WhiteboardWindow
 	{
 		Q_OBJECT;
 	public:
-		QtWhiteboardWindow(WhiteboardSession* whiteboardSession);
+		QtWhiteboardWindow(WhiteboardSession::ref whiteboardSession);
 		void addItem(const std::string& item);
 		void show();
+		void setSession(WhiteboardSession::ref session);
 
 	private slots:
 		void changeLineWidth(int i);
@@ -50,6 +51,10 @@ namespace Swift {
 		void handleLastItemChanged(QGraphicsItem* item);
 
 	private:
+		void handleSessionTerminate();
+		void closeEvent(QCloseEvent* event);
+
+	private:
 		QGraphicsScene* scene;
 		GView* graphicsView;
 		QVBoxLayout* layout;
@@ -72,6 +77,6 @@ namespace Swift {
 		QToolButton* polygonButton;
 		QToolButton* selectButton;
 
-		WhiteboardSession* whiteboardSession_;
+		WhiteboardSession::ref whiteboardSession_;
 	};
 }