8 files changed, 134 insertions, 15 deletions
diff --git a/Swift/QtUI/QtChatView.cpp b/Swift/QtUI/QtChatView.cpp
index 81820a3..25b786f 100644
--- a/Swift/QtUI/QtChatView.cpp
+++ b/Swift/QtUI/QtChatView.cpp
@@ -443,8 +443,50 @@ void QtChatView::setWhiteboardSessionStatus(QString id, const ChatWindow::Whiteb
 	}
 	divElement.setInnerXml(newInnerHTML);
 }
 
+void QtChatView::setScreenSharingStatus(QString id, ScreenSharing::SCState state, const QString& /*msg*/)
+{
+	QWebElement ftElement = findDivElementWithID(document_, id);
+	if (ftElement.isNull()) {
+		SWIFT_LOG(debug) << "Tried to access screen sharing UI via invalid id! id = " << Q2PSTRING(id) << std::endl;
+		return;
+	}
+
+	QString newInnerHTML = "";
+	if (state == ScreenSharing::WaitingForAccept) {
+		newInnerHTML =	tr("Waiting for other side to accept the sharing.") + "<br/>" +
+			QtChatWindow::buildChatWindowButton(tr("Cancel"), QtChatWindow::ButtonScreenSharingCancel, id);
+	}
+	if (state == ScreenSharing::Negotiating) {
+		newInnerHTML =	tr("Negotiating...") + "<br/>" +
+			QtChatWindow::buildChatWindowButton(tr("Cancel"), QtChatWindow::ButtonScreenSharingCancel, id);
+	}
+	if (state == ScreenSharing::Connecting) {
+		newInnerHTML =	tr("Connecting...") + "<br/>" +
+			QtChatWindow::buildChatWindowButton(tr("Cancel"), QtChatWindow::ButtonScreenSharingCancel, id);
+	}
+	if (state == ScreenSharing::BroadCasting) {
+		newInnerHTML =	tr("Broadcasting the desktop...") + "<br/>" +
+			QtChatWindow::buildChatWindowButton(tr("Terminate"), QtChatWindow::ButtonScreenSharingStop, id);
+	}
+	else if (state == ScreenSharing::Receiving) {
+		newInnerHTML =	tr("Receiving desktop from the other party...") + "<br/>" +
+			QtChatWindow::buildChatWindowButton(tr("Terminate"), QtChatWindow::ButtonScreenSharingStop, id);
+	}
+	else if (state == ScreenSharing::Canceled) {
+		newInnerHTML = tr("Sharing has been canceled!");
+	}
+	else if (state == ScreenSharing::Finished) {
+		newInnerHTML = tr("Sharing finished.");
+	}
+	else if (state == ScreenSharing::Failed) {
+		newInnerHTML = tr("Sharing failed.");
+	}
+
+	ftElement.setInnerXml(newInnerHTML);
+}
+
 void QtChatView::setMUCInvitationJoined(QString id) {
 	QWebElement divElement = findElementWithID(document_, "div", id);
 	QWebElement buttonElement = findElementWithID(divElement, "input", "mucinvite");
 	if (!buttonElement.isNull()) {
diff --git a/Swift/QtUI/QtChatView.h b/Swift/QtUI/QtChatView.h
index 9080808..403dec0 100644
--- a/Swift/QtUI/QtChatView.h
+++ b/Swift/QtUI/QtChatView.h
@@ -16,8 +16,9 @@
 
 #include "ChatSnippet.h"
 
 #include <Swift/Controllers/UIInterfaces/ChatWindow.h>
+#include <Swiften/ScreenSharing/ScreenSharing.h>
 
 class QWebPage;
 class QUrl;
 class QDate;
@@ -42,9 +43,10 @@ namespace Swift {
 
 			QString getLastSentMessage();
 			void addToJSEnvironment(const QString&, QObject*);
 			void setFileTransferProgress(QString id, const int percentageDone);
-			void setFileTransferStatus(QString id, const ChatWindow::FileTransferState state, const QString& msg);
+			void setFileTransferStatus(QString id, const ChatWindow::FileTransferState state, const QString& /*msg*/);
+			void setScreenSharingStatus(QString id, ScreenSharing::SCState state, const QString& msg);
 			void setWhiteboardSessionStatus(QString id, const ChatWindow::WhiteboardSessionState state);
 			void setMUCInvitationJoined(QString id);
 			void showEmoticons(bool show);
 			int getSnippetPositionByDate(const QDate& date);
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index 314e36c..730195c 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -60,8 +60,11 @@ const QString QtChatWindow::ButtonWhiteboardShowWindow = QString("whiteboard-sho
 const QString QtChatWindow::ButtonFileTransferCancel = QString("filetransfer-cancel");
 const QString QtChatWindow::ButtonFileTransferSetDescription = QString("filetransfer-setdescription");
 const QString QtChatWindow::ButtonFileTransferSendRequest = QString("filetransfer-sendrequest");
 const QString QtChatWindow::ButtonFileTransferAcceptRequest = QString("filetransfer-acceptrequest");
+const QString QtChatWindow::ButtonScreenSharingCancel = QString("screensharing-cancel");
+const QString QtChatWindow::ButtonScreenSharingStop = QString("screensharing-stop");
+const QString QtChatWindow::ButtonScreenSharingAcceptRequest = QString("screensharing-acceptrequest");
 const QString QtChatWindow::ButtonMUCInvite = QString("mucinvite");
 
 
 QtChatWindow::QtChatWindow(const QString &contact, QtChatTheme* theme, UIEventStream* eventStream, SettingsProvider* settings, QMap<QString, QString> emoticons) : QtTabbable(), contact_(contact), previousMessageWasSelf_(false), previousMessageKind_(PreviosuMessageWasNone), eventStream_(eventStream), emoticons_(emoticons) {
@@ -684,8 +687,49 @@ std::string QtChatWindow::addWhiteboardRequest(bool senderIsSelf) {
 void QtChatWindow::setWhiteboardSessionStatus(std::string id, const ChatWindow::WhiteboardSessionState state) {
 	messageLog_->setWhiteboardSessionStatus(QString::fromStdString(id), state);
 }
 
+std::string QtChatWindow::addScreenSharing(const std::string& senderName, bool incoming)
+{
+	SWIFT_LOG(debug) << "addScreenSharing" << std::endl;
+	QString ss_id = QString("ft%1").arg(P2QSTRING(boost::lexical_cast<std::string>(idCounter_++)));
+
+	QString htmlString;
+	if (incoming) {
+		htmlString = P2QSTRING(senderName) + " shares his screen with you" + "<br/>" +
+			"<div id='" + ss_id + "'>" +
+				buildChatWindowButton(tr("Accept"), ButtonScreenSharingAcceptRequest, ss_id) +
+				buildChatWindowButton(tr("Cancel"), ButtonScreenSharingCancel, ss_id) +
+			"</div>";
+	} else {
+		htmlString = tr("Sharing screen with ") + contact_ + "<br/>" +
+			"<div id='" + ss_id + "'>" +
+				buildChatWindowButton(tr("Cancel"), ButtonScreenSharingCancel, ss_id) +
+			"</div>";
+	}
+
+	bool appendToPrevious = appendToPreviousCheck(PreviousMessageWasFileTransfer, senderName, !incoming);
+	if (lastLineTracker_.getShouldMoveLastLine()) {
+		/* should this be queued? */
+		messageLog_->addLastSeenLine();
+		/* if the line is added we should break the snippet */
+		appendToPrevious = false;
+	}
+	QString qAvatarPath = "qrc:/icons/avatar.png";
+	std::string id = "ssmessage" + boost::lexical_cast<std::string>(idCounter_++);
+	messageLog_->addMessage(boost::shared_ptr<ChatSnippet>(new MessageSnippet(htmlString, Qt::escape(P2QSTRING(senderName)), B2QDATE(boost::posix_time::second_clock::local_time()), qAvatarPath, !incoming, appendToPrevious, theme_, P2QSTRING(id))));
+
+	previousMessageWasSelf_ = !incoming;
+	previousSenderName_ = P2QSTRING(senderName);
+	previousMessageKind_ = PreviousMessageWasFileTransfer;
+	return Q2PSTRING(ss_id);
+}
+
+void QtChatWindow::setScreenSharingStatus(std::string id, const ScreenSharing::SCState state, const std::string& msg)
+{
+	messageLog_->setScreenSharingStatus(QString::fromStdString(id), state, QString::fromStdString(msg));
+}
+
 void QtChatWindow::handleHTMLButtonClicked(QString id, QString encodedArgument1, QString encodedArgument2, QString encodedArgument3) {
 	QString arg1 = decodeButtonArgument(encodedArgument1);
 	QString arg2 = decodeButtonArgument(encodedArgument2);
 	QString arg3 = decodeButtonArgument(encodedArgument3);
@@ -730,8 +774,17 @@ void QtChatWindow::handleHTMLButtonClicked(QString id, QString encodedArgument1,
 	else if (id.startsWith(ButtonWhiteboardShowWindow)) {
 		QString id = arg1;
 		onWhiteboardWindowShow();
 	}
+	else if (id.startsWith(ButtonScreenSharingAcceptRequest)) {
+		onScreenSharingAccept(Q2PSTRING(arg1));
+	}
+	else if (id.startsWith(ButtonScreenSharingCancel)) {
+		onScreenSharingCancel(Q2PSTRING(arg1));
+	}
+	else if (id.startsWith(ButtonScreenSharingStop)) {
+		onScreenSharingStop(Q2PSTRING(arg1));
+	}
 	else if (id.startsWith(ButtonMUCInvite)) {
 		QString roomJID = arg1;
 		QString password = arg2;
 		QString elementID = arg3;
diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h
index 3416b42..d802bf9 100644
--- a/Swift/QtUI/QtChatWindow.h
+++ b/Swift/QtUI/QtChatWindow.h
@@ -79,8 +79,11 @@ namespace Swift {
 			static const QString ButtonFileTransferCancel;
 			static const QString ButtonFileTransferSetDescription;
 			static const QString ButtonFileTransferSendRequest;
 			static const QString ButtonFileTransferAcceptRequest;
+			static const QString ButtonScreenSharingCancel;
+			static const QString ButtonScreenSharingStop;
+			static const QString ButtonScreenSharingAcceptRequest;
 			static const QString ButtonMUCInvite;
 
 		public:
 			QtChatWindow(const QString &contact, QtChatTheme* theme, UIEventStream* eventStream, SettingsProvider* settings, QMap<QString, QString> emoticons);
@@ -95,8 +98,12 @@ namespace Swift {
 			// File transfer related stuff
 			std::string addFileTransfer(const std::string& senderName, bool senderIsSelf, const std::string& filename, const boost::uintmax_t sizeInBytes);
 			void setFileTransferProgress(std::string id, const int percentageDone);
 			void setFileTransferStatus(std::string id, const FileTransferState state, const std::string& msg);
+
+			// Screen sharing related stuff
+			virtual std::string addScreenSharing(const std::string& senderName, bool incoming);
+			virtual void setScreenSharingStatus(std::string id, const ScreenSharing::SCState state, const std::string& msg = "");
 			
 			std::string addWhiteboardRequest(bool senderIsSelf);
 			void setWhiteboardSessionStatus(std::string id, const ChatWindow::WhiteboardSessionState state);
 
diff --git a/Swift/QtUI/ScreenSharing/QtRemoteScreenWindow.cpp b/Swift/QtUI/ScreenSharing/QtRemoteScreenWindow.cpp
index e6cd291..a1f1a88 100644
--- a/Swift/QtUI/ScreenSharing/QtRemoteScreenWindow.cpp
+++ b/Swift/QtUI/ScreenSharing/QtRemoteScreenWindow.cpp
@@ -7,17 +7,24 @@
 #include "QtRemoteScreenWindow.h"
 #include "RemoteScreenViewerWidget.h"
 
 #include <QToolBar>
+#include <QVBoxLayout>
 
 #include <Swiften/ScreenSharing/IncomingScreenSharing.h>
 
 namespace Swift {
 
 QtRemoteScreenWindow::QtRemoteScreenWindow(boost::shared_ptr<IncomingScreenSharing> incScreenSharing, QWidget *parent)
-	: QMainWindow(parent), RemoteScreenWindow(incScreenSharing)
+	: QMainWindow(parent), RemoteScreenWindow(incScreenSharing), viewer(new RemoteScreenViewerWidget(iss))
 {
-	setCentralWidget(new RemoteScreenViewerWidget(iss));
+	QVBoxLayout* centralLayout = new QVBoxLayout;
+	centralLayout->addWidget(viewer);
+
+	QWidget* central = new QWidget(this);
+	central->setLayout(centralLayout);
+
+	setCentralWidget(central);
 
 	controlToolBar = addToolBar(tr("Control"));
 	closeAction = controlToolBar->addAction(QIcon::fromTheme("window-close"), tr("&Terminate session"), this, SLOT(handleCloseTriggered()));
 }
@@ -27,8 +34,8 @@ QtRemoteScreenWindow::~QtRemoteScreenWindow()
 }
 
 void QtRemoteScreenWindow::handleCloseTriggered()
 {
-	iss->stop();
+	onStopRequest();
 }
 
 }
diff --git a/Swift/QtUI/ScreenSharing/QtRemoteScreenWindow.h b/Swift/QtUI/ScreenSharing/QtRemoteScreenWindow.h
index 00ac803..d6c783a 100644
--- a/Swift/QtUI/ScreenSharing/QtRemoteScreenWindow.h
+++ b/Swift/QtUI/ScreenSharing/QtRemoteScreenWindow.h
@@ -12,8 +12,9 @@
 
 class QToolBar;
 
 namespace Swift {
+	class RemoteScreenViewerWidget;
 
 	class QtRemoteScreenWindow : public QMainWindow, public RemoteScreenWindow {
 			Q_OBJECT
 
@@ -24,8 +25,9 @@ namespace Swift {
 		private slots:
 			void handleCloseTriggered();
 
 		private:
+			RemoteScreenViewerWidget* viewer;
 			QAction* closeAction;
 			QToolBar* controlToolBar;
 	};
 }
diff --git a/Swift/QtUI/ScreenSharing/RemoteScreenViewerWidget.cpp b/Swift/QtUI/ScreenSharing/RemoteScreenViewerWidget.cpp
index f601f1b..7bb3f26 100644
--- a/Swift/QtUI/ScreenSharing/RemoteScreenViewerWidget.cpp
+++ b/Swift/QtUI/ScreenSharing/RemoteScreenViewerWidget.cpp
@@ -17,9 +17,9 @@
 
 namespace Swift {
 
 RemoteScreenViewerWidget::RemoteScreenViewerWidget(boost::shared_ptr<IncomingScreenSharing> incScreenSharing, QWidget *parent) :
-	QWidget(parent), iss(incScreenSharing)
+	QFrame(parent), iss(incScreenSharing)
 {
 	iss->onNewImageReceived.connect(boost::bind(&RemoteScreenViewerWidget::handleNewImageReceived, this, _1));
 }
 
@@ -27,28 +27,34 @@ RemoteScreenViewerWidget::~RemoteScreenViewerWidget()
 {
 	iss->onNewImageReceived.disconnect(boost::bind(&RemoteScreenViewerWidget::handleNewImageReceived, this, _1));
 }
 
-void RemoteScreenViewerWidget::paintEvent(QPaintEvent *)
+void RemoteScreenViewerWidget::paintEvent(QPaintEvent* event)
 {
-	QPainter painter(this);
+	QFrame::paintEvent(event);
 	if (!pixmap.isNull()) {
+		QPainter painter(this);
 		painter.translate(geometry().center());
 		painter.drawPixmap(-pixmap.rect().center(), pixmap);
 	}
 }
 
 void RemoteScreenViewerWidget::resizeEvent(QResizeEvent *event)
 {
-	if (!pixmap.isNull())
-		pixmap = pixmap.scaled(event->size(), Qt::KeepAspectRatio);
-	QWidget::resizeEvent(event);
+	if (!pixmap.isNull()) {
+		int frameWidth2 = frameWidth() * 2;
+		QSize borders(frameWidth2, frameWidth2);
+		pixmap = pixmap.scaled(event->size() - borders, Qt::KeepAspectRatio);
+	}
+	QFrame::resizeEvent(event);
 }
 
 void RemoteScreenViewerWidget::handleNewImageReceived(const Image& image)
 {
 	QImage qImg(image.data.data(), image.width, image.height, QImage::Format_RGB888);
-	pixmap = QPixmap::fromImage(qImg).scaled(size(), Qt::KeepAspectRatio);
+	int frameWidth2 = frameWidth() * 2;
+	QSize borders(frameWidth2, frameWidth2);
+	pixmap = QPixmap::fromImage(qImg).scaled(size() - borders, Qt::KeepAspectRatio);
 	update();
 }
 
 }
diff --git a/Swift/QtUI/ScreenSharing/RemoteScreenViewerWidget.h b/Swift/QtUI/ScreenSharing/RemoteScreenViewerWidget.h
index 622bd26..c074e9f 100644
--- a/Swift/QtUI/ScreenSharing/RemoteScreenViewerWidget.h
+++ b/Swift/QtUI/ScreenSharing/RemoteScreenViewerWidget.h
@@ -5,25 +5,25 @@
  */
 
 #pragma once
 
-#include <QWidget>
+#include <QFrame>
 
 #include <boost/shared_ptr.hpp>
 
 namespace Swift {
 	class IncomingScreenSharing;
 	class Image;
 
-	class RemoteScreenViewerWidget : public QWidget {
+	class RemoteScreenViewerWidget : public QFrame {
 			Q_OBJECT
 		public:
 			RemoteScreenViewerWidget(boost::shared_ptr<IncomingScreenSharing> incScreenSharing, QWidget *parent = 0);
 			~RemoteScreenViewerWidget();
 
 		protected:
-			void paintEvent(QPaintEvent *);
-			void resizeEvent(QResizeEvent *event);
+			void paintEvent(QPaintEvent* event);
+			void resizeEvent(QResizeEvent* event);
 
 		private:
 			void handleNewImageReceived(const Image& image);