1 files changed, 194 insertions, 431 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index 28549f8..49f57c9 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -1,73 +1,62 @@
 /*
- * Copyright (c) 2010-2012 Kevin Smith
+ * Copyright (c) 2010-2013 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include "QtChatWindow.h"
-#include "Swift/Controllers/Roster/Roster.h"
-#include "Swift/Controllers/Roster/RosterItem.h"
-#include "Swift/Controllers/Roster/ContactRosterItem.h"
-#include "Roster/QtOccupantListWidget.h"
-#include "SwifTools/Linkify.h"
-#include "QtChatView.h"
-#include "MessageSnippet.h"
-#include "SystemMessageSnippet.h"
-#include "QtTextEdit.h"
-#include "QtSettingsProvider.h"
-#include "QtScaledAvatarCache.h"
-#include "QtInviteToChatWindow.h"
-#include <Swift/QtUI/QtUISettingConstants.h>
-
-#include <Swiften/StringCodecs/Base64.h>
-#include "SwifTools/TabComplete.h"
-#include <Swift/Controllers/UIEvents/UIEventStream.h>
-#include <Swift/Controllers/UIEvents/SendFileUIEvent.h>
-#include <Swift/Controllers/UIEvents/JoinMUCUIEvent.h>
-#include "QtChatWindowJSBridge.h"
+#include <Swift/QtUI/QtChatWindow.h>
 
 #include <boost/cstdint.hpp>
-#include <boost/format.hpp>
 #include <boost/lexical_cast.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
 
-#include <QLabel>
 #include <qdebug.h>
-#include <QMessageBox>
-#include <QInputDialog>
 #include <QApplication>
 #include <QBoxLayout>
 #include <QCloseEvent>
 #include <QComboBox>
+#include <QFileDialog>
 #include <QFileInfo>
+#include <QInputDialog>
+#include <QLabel>
 #include <QLineEdit>
+#include <QMenu>
+#include <QMessageBox>
+#include <QMimeData>
+#include <QPushButton>
 #include <QSplitter>
 #include <QString>
+#include <QTextDocument>
 #include <QTextEdit>
 #include <QTime>
+#include <QToolButton>
 #include <QUrl>
-#include <QPushButton>
-#include <QFileDialog>
-#include <QMenu>
-#include <QTextDocument>
-#include <Swift/Controllers/Settings/SettingsProvider.h>
+
 #include <Swiften/Base/Log.h>
 
-namespace Swift {
+#include <Swift/Controllers/Roster/ContactRosterItem.h>
+#include <Swift/Controllers/Roster/Roster.h>
+#include <Swift/Controllers/Roster/RosterItem.h>
+#include <Swift/Controllers/Settings/SettingsProvider.h>
+#include <Swift/Controllers/UIEvents/UIEventStream.h>
+#include <Swift/Controllers/UIEvents/SendFileUIEvent.h>
+#include <Swift/Controllers/UIEvents/JoinMUCUIEvent.h>
 
-const QString QtChatWindow::ButtonWhiteboardSessionCancel = QString("whiteboard-cancel");
-const QString QtChatWindow::ButtonWhiteboardSessionAcceptRequest = QString("whiteboard-acceptrequest");
-const QString QtChatWindow::ButtonWhiteboardShowWindow = QString("whiteboard-showwindow");
-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::ButtonMUCInvite = QString("mucinvite");
+#include <SwifTools/TabComplete.h>
 
+#include <Swift/QtUI/Roster/QtOccupantListWidget.h>
+#include <Swift/QtUI/QtSettingsProvider.h>
+#include <Swift/QtUI/QtScaledAvatarCache.h>
+#include <Swift/QtUI/QtTextEdit.h>
+#include <Swift/QtUI/QtUISettingConstants.h>
+#include <Swift/QtUI/QtUtilities.h>
+#include <Swift/QtUI/QtWebKitChatView.h>
 
-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) {
+namespace Swift {
+
+QtChatWindow::QtChatWindow(const QString &contact, QtChatTheme* theme, UIEventStream* eventStream, SettingsProvider* settings) : QtTabbable(), contact_(contact), eventStream_(eventStream), blockingState_(BlockingUnsupported), isMUC_(false), supportsImpromptuChat_(false) {
 	settings_ = settings;
 	unreadCount_ = 0;
-	idCounter_ = 0;
 	inputEnabled_ = true;
 	completer_ = NULL;
 	affiliationEditor_ = NULL;
@@ -75,7 +64,6 @@ QtChatWindow::QtChatWindow(const QString &contact, QtChatTheme* theme, UIEventSt
 	isCorrection_ = false;
 	labelModel_ = NULL;
 	correctionEnabled_ = Maybe;
-	showEmoticons_ = true;
 	updateTitleWithUnreadCount();
 
 #ifdef SWIFT_EXPERIMENTAL_FT
@@ -103,26 +91,23 @@ QtChatWindow::QtChatWindow(const QString &contact, QtChatTheme* theme, UIEventSt
 	alertLabel_->setStyleSheet(alertStyleSheet_);
 	alertWidget_->hide();
 
-	QBoxLayout* subjectLayout = new QBoxLayout(QBoxLayout::LeftToRight);
+	subjectLayout_ = new QBoxLayout(QBoxLayout::LeftToRight);
 	subject_ = new QLineEdit(this);
-	subjectLayout->addWidget(subject_);
+	subjectLayout_->addWidget(subject_);
 	setSubject("");
 	subject_->setReadOnly(true);
 
-	actionButton_ = new QPushButton(this);
+	QPushButton* actionButton_ = new QPushButton(this);
 	actionButton_->setIcon(QIcon(":/icons/actions.png"));
 	connect(actionButton_, SIGNAL(clicked()), this, SLOT(handleActionButtonClicked()));
-	subjectLayout->addWidget(actionButton_);
-
 	subject_->hide();
-	actionButton_->hide();
 
-	layout->addLayout(subjectLayout);
+	layout->addLayout(subjectLayout_);
 
 	logRosterSplitter_ = new QSplitter(this);
 	logRosterSplitter_->setAutoFillBackground(true);
 	layout->addWidget(logRosterSplitter_);
-	messageLog_ = new QtChatView(theme, this);
+	messageLog_ = new QtWebKitChatView(this, eventStream_, theme, this); // I accept that passing the ChatWindow in so that the view can call the signals is somewhat inelegant, but it saves a lot of boilerplate. This patch is unpleasant enough already. So let's fix this soon (it at least needs fixing by the time history is sorted), but not now.
 	logRosterSplitter_->addWidget(messageLog_);
 
 	treeWidget_ = new QtOccupantListWidget(eventStream_, settings_, this);
@@ -150,13 +135,19 @@ QtChatWindow::QtChatWindow(const QString &contact, QtChatTheme* theme, UIEventSt
 	QHBoxLayout* inputBarLayout = new QHBoxLayout();
 	inputBarLayout->setContentsMargins(0,0,0,0);
 	inputBarLayout->setSpacing(2);
-	input_ = new QtTextEdit(this);
+	input_ = new QtTextEdit(settings_, this);
 	input_->setAcceptRichText(false);
 	inputBarLayout->addWidget(midBar_);
 	inputBarLayout->addWidget(input_);
 	correctingLabel_ = new QLabel(tr("Correcting"), this);
 	inputBarLayout->addWidget(correctingLabel_);
 	correctingLabel_->hide();
+
+	// using an extra layout to work around Qt margin glitches on OS X
+	QHBoxLayout* actionLayout = new QHBoxLayout();
+	actionLayout->addWidget(actionButton_);
+
+	inputBarLayout->addLayout(actionLayout);
 	layout->addLayout(inputBarLayout);
 
 	inputClearing_ = false;
@@ -180,17 +171,12 @@ QtChatWindow::QtChatWindow(const QString &contact, QtChatTheme* theme, UIEventSt
 	treeWidget_->onSomethingSelectedChanged.connect(boost::bind(&QtChatWindow::handleOccupantSelectionChanged, this, _1));
 	treeWidget_->onOccupantActionSelected.connect(boost::bind(boost::ref(onOccupantActionSelected), _1, _2));
 
-	jsBridge = new QtChatWindowJSBridge();
-	messageLog_->addToJSEnvironment("chatwindow", jsBridge);
-	connect(jsBridge, SIGNAL(buttonClicked(QString,QString,QString,QString)), this, SLOT(handleHTMLButtonClicked(QString,QString,QString,QString)));
-
 	settings_->onSettingChanged.connect(boost::bind(&QtChatWindow::handleSettingChanged, this, _1));
-	showEmoticons_ = settings_->getSetting(QtUISettingConstants::SHOW_EMOTICONS);
+	messageLog_->showEmoticons(settings_->getSetting(QtUISettingConstants::SHOW_EMOTICONS));
 
 }
 
 QtChatWindow::~QtChatWindow() {
-	delete jsBridge;
 	if (mucConfigurationWindow_) {
 		delete mucConfigurationWindow_.data();
 	}
@@ -198,8 +184,8 @@ QtChatWindow::~QtChatWindow() {
 
 void QtChatWindow::handleSettingChanged(const std::string& setting) {
 	if (setting == QtUISettingConstants::SHOW_EMOTICONS.getKey()) {
-		showEmoticons_ = settings_->getSetting(QtUISettingConstants::SHOW_EMOTICONS);
-		messageLog_->showEmoticons(showEmoticons_);
+		bool showEmoticons = settings_->getSetting(QtUISettingConstants::SHOW_EMOTICONS);
+		messageLog_->showEmoticons(showEmoticons);
 	}
 }
 
@@ -211,10 +197,6 @@ void QtChatWindow::handleOccupantSelectionChanged(RosterItem* item) {
 	onOccupantSelectionChanged(dynamic_cast<ContactRosterItem*>(item));
 }
 
-bool QtChatWindow::appendToPreviousCheck(QtChatWindow::PreviousMessageKind messageKind, const std::string& senderName, bool senderIsSelf) const {
-	return previousMessageKind_ == messageKind && ((senderIsSelf && previousMessageWasSelf_) || (!senderIsSelf && !previousMessageWasSelf_&& previousSenderName_ == P2QSTRING(senderName)));
-}
-
 void QtChatWindow::handleFontResized(int fontSizeSteps) {
 	messageLog_->resizeFont(fontSizeSteps);
 }
@@ -244,7 +226,6 @@ void QtChatWindow::setTabComplete(TabComplete* completer) {
 
 void QtChatWindow::handleKeyPressEvent(QKeyEvent* event) {
 	event->ignore();
-	QtTabbable::handleKeyPressEvent(event);
 	if (event->isAccepted()) {
 		return;
 	}
@@ -409,11 +390,11 @@ void QtChatWindow::closeEvent(QCloseEvent* event) {
 	onClosed();
 }
 
-void QtChatWindow::convertToMUC() {
-	setAcceptDrops(false);
+void QtChatWindow::convertToMUC(bool impromptuMUC) {
+	impromptu_ = impromptuMUC;
+	isMUC_ = true;
 	treeWidget_->show();
-	subject_->show();
-	actionButton_->show();
+	subject_->setVisible(!impromptu_);
 }
 
 void QtChatWindow::qAppFocusChanged(QWidget* /*old*/, QWidget* /*now*/) {
@@ -481,333 +462,16 @@ void QtChatWindow::updateTitleWithUnreadCount() {
 	emit titleUpdated();
 }
 
-std::string QtChatWindow::addMessage(const std::string &message, const std::string &senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const boost::posix_time::ptime& time) {
-	return addMessage(linkimoticonify(P2QSTRING(message)), senderName, senderIsSelf, label, avatarPath, "", time);
-}
 
-QString QtChatWindow::linkimoticonify(const QString& message) const {
-	QString messageHTML(message);
-	messageHTML = Qt::escape(messageHTML);
-	QMapIterator<QString, QString> it(emoticons_);
-	QString textStyle = showEmoticons_ ? "style='display:none'" : "";
-	QString imageStyle = showEmoticons_ ? "" : "style='display:none'";
-	if (messageHTML.length() < 500) {
-		while (it.hasNext()) {
-			it.next();
-			messageHTML.replace(it.key(), "<span class='swift_emoticon_image' " + imageStyle + "><img src='" + it.value() + "'/></span><span class='swift_emoticon_text' " + textStyle + ">"+it.key() + "</span>");
-		}
-		messageHTML = P2QSTRING(Linkify::linkify(Q2PSTRING(messageHTML)));
-	}
-	messageHTML.replace("\n","<br/>");
-	return messageHTML;
-}
-
-std::string QtChatWindow::addMessage(const QString &message, const std::string &senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const QString& style, const boost::posix_time::ptime& time) {
-	if (isWidgetSelected()) {
-		onAllMessagesRead();
-	}
-	QString scaledAvatarPath = QtScaledAvatarCache(32).getScaledAvatarPath(avatarPath.c_str());
-
-	QString htmlString;
-	if (label) {
-		htmlString = QString("<span style=\"border: thin dashed grey; padding-left: .5em; padding-right: .5em; color: %1; background-color: %2; font-size: 90%; margin-right: .5em; \" class='swift_label'>").arg(Qt::escape(P2QSTRING(label->getForegroundColor()))).arg(Qt::escape(P2QSTRING(label->getBackgroundColor())));
-		htmlString += QString("%1</span> ").arg(Qt::escape(P2QSTRING(label->getDisplayMarking())));
-	}
-	QString messageHTML(message);
-	QString styleSpanStart = style == "" ? "" : "<span style=\"" + style + "\">";
-	QString styleSpanEnd = style == "" ? "" : "</span>";
-	htmlString += "<span class='swift_inner_message'>" + styleSpanStart + messageHTML + styleSpanEnd + "</span>" ;
-
-	bool appendToPrevious = appendToPreviousCheck(PreviousMessageWasMessage, senderName, senderIsSelf);
-	if (lastLineTracker_.getShouldMoveLastLine()) {
-		/* should this be queued? */
-		messageLog_->addLastSeenLine();
-		/* if the line is added we should break the snippet */
-		appendToPrevious = false;
-	}
-	QString qAvatarPath =  scaledAvatarPath.isEmpty() ? "qrc:/icons/avatar.png" : QUrl::fromLocalFile(scaledAvatarPath).toEncoded();
-	std::string id = "id" + boost::lexical_cast<std::string>(idCounter_++);
-	messageLog_->addMessageBottom(boost::shared_ptr<ChatSnippet>(new MessageSnippet(htmlString, Qt::escape(P2QSTRING(senderName)), B2QDATE(time), qAvatarPath, senderIsSelf, appendToPrevious, theme_, P2QSTRING(id))));
-
-	previousMessageWasSelf_ = senderIsSelf;
-	previousSenderName_ = P2QSTRING(senderName);
-	previousMessageKind_ = PreviousMessageWasMessage;
-	return id;
-}
 
 void QtChatWindow::flash() {
 	emit requestFlash();
 }
 
-void QtChatWindow::setAckState(std::string const& id, ChatWindow::AckState state) {
-	QString xml;
-	switch (state) {
-		case ChatWindow::Pending:
-			xml = "<img src='qrc:/icons/throbber.gif' title='" + tr("This message has not been received by your server yet.") + "'/>";
-			messageLog_->displayReceiptInfo(P2QSTRING(id), false);
-			break;
-		case ChatWindow::Received:
-			xml = "";
-			messageLog_->displayReceiptInfo(P2QSTRING(id), true);
-			break;
-		case ChatWindow::Failed: xml = "<img src='qrc:/icons/error.png' title='" + tr("This message may not have been transmitted.") + "'/>"; break;
-	}
-	messageLog_->setAckXML(P2QSTRING(id), xml);
-}
-
-void QtChatWindow::setMessageReceiptState(const std::string& id, ChatWindow::ReceiptState state) {
-	QString xml;
-	switch (state) {
-		case ChatWindow::ReceiptReceived:
-			xml = "<img src='qrc:/icons/check.png' title='" + tr("The receipt for this message has been received.") + "'/>";
-			break;
-		case ChatWindow::ReceiptRequested:
-			xml = "<img src='qrc:/icons/warn.png' title='" + tr("The receipt for this message has not yet been received. The recipient(s) might not have received this message.") + "'/>";
-			break;
-	}
-	messageLog_->setReceiptXML(P2QSTRING(id), xml);
-}
-
 int QtChatWindow::getCount() {
 	return unreadCount_;
 }
 
-std::string QtChatWindow::addAction(const std::string &message, const std::string &senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const boost::posix_time::ptime& time) {
-	return addMessage(" *" + linkimoticonify(P2QSTRING(message)) + "*", senderName, senderIsSelf, label, avatarPath, "font-style:italic ", time);
-}
-
-std::string formatSize(const boost::uintmax_t bytes) {
-	static const char *siPrefix[] = {"k", "M", "G", "T", "P", "E", "Z", "Y", NULL};
-	int power = 0;
-	double engBytes = bytes;
-	while (engBytes >= 1000) {
-		++power;
-		engBytes = engBytes / 1000.0;
-	}
-	return str( boost::format("%.1lf %sB") % engBytes % (power > 0 ? siPrefix[power-1] : "") );
-}
-
-QString encodeButtonArgument(const QString& str) {
-	return Qt::escape(P2QSTRING(Base64::encode(createByteArray(Q2PSTRING(str)))));
-}
-
-QString decodeButtonArgument(const QString& str) {
-	return P2QSTRING(byteArrayToString(Base64::decode(Q2PSTRING(str))));
-}
-
-QString QtChatWindow::buildChatWindowButton(const QString& name, const QString& id, const QString& arg1, const QString& arg2, const QString& arg3) {
-	QRegExp regex("[A-Za-z][A-Za-z0-9\\-\\_]+");
-	Q_ASSERT(regex.exactMatch(id));
-	QString html = QString("<input id='%2' type='submit' value='%1' onclick='chatwindow.buttonClicked(\"%2\", \"%3\", \"%4\", \"%5\");' />").arg(name).arg(id).arg(encodeButtonArgument(arg1)).arg(encodeButtonArgument(arg2)).arg(encodeButtonArgument(arg3));
-	return html;
-}
-
-std::string QtChatWindow::addFileTransfer(const std::string& senderName, bool senderIsSelf, const std::string& filename, const boost::uintmax_t sizeInBytes) {
-	SWIFT_LOG(debug) << "addFileTransfer" << std::endl;
-	QString ft_id = QString("ft%1").arg(P2QSTRING(boost::lexical_cast<std::string>(idCounter_++)));
-	
-	QString htmlString;
-	QString formattedFileSize = P2QSTRING(formatSize(sizeInBytes));
-	if (senderIsSelf) {
-		// outgoing
-		htmlString = tr("Send file") + ": " + P2QSTRING(filename) + " ( " + formattedFileSize + ") <br/>" +
-			"<div id='" + ft_id + "'>" +
-				buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, ft_id) +
-				buildChatWindowButton(tr("Set Description"), ButtonFileTransferSetDescription, ft_id) +
-				buildChatWindowButton(tr("Send"), ButtonFileTransferSendRequest, ft_id) +
-			"</div>";
-	} else {
-		// incoming
-		htmlString = tr("Receiving file") + ": " + P2QSTRING(filename) + " ( " + formattedFileSize  + ") <br/>" +
-			"<div id='" + ft_id + "'>" +
-				buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, ft_id) +
-				buildChatWindowButton(tr("Accept"), ButtonFileTransferAcceptRequest, ft_id, P2QSTRING(filename)) +
-			"</div>";
-	}
-
-	//addMessage(message, senderName, senderIsSelf, boost::shared_ptr<SecurityLabel>(), "", boost::posix_time::second_clock::local_time());
-
-	bool appendToPrevious = appendToPreviousCheck(PreviousMessageWasFileTransfer, senderName, senderIsSelf);
-	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 = "ftmessage" + boost::lexical_cast<std::string>(idCounter_++);
-	messageLog_->addMessageBottom(boost::shared_ptr<ChatSnippet>(new MessageSnippet(htmlString, Qt::escape(P2QSTRING(senderName)), B2QDATE(boost::posix_time::second_clock::local_time()), qAvatarPath, senderIsSelf, appendToPrevious, theme_, P2QSTRING(id))));
-
-	previousMessageWasSelf_ = senderIsSelf;
-	previousSenderName_ = P2QSTRING(senderName);
-	previousMessageKind_ = PreviousMessageWasFileTransfer;
-	return Q2PSTRING(ft_id);
-}
-
-void QtChatWindow::setFileTransferProgress(std::string id, const int percentageDone) {
-	messageLog_->setFileTransferProgress(QString::fromStdString(id), percentageDone);
-}
-
-void QtChatWindow::setFileTransferStatus(std::string id, const FileTransferState state, const std::string& msg) {
-	messageLog_->setFileTransferStatus(QString::fromStdString(id), state, QString::fromStdString(msg));
-}
-
-std::string QtChatWindow::addWhiteboardRequest(bool senderIsSelf) {
-	QString wb_id = QString("wb%1").arg(P2QSTRING(boost::lexical_cast<std::string>(idCounter_++)));
-	QString htmlString;
-	if (senderIsSelf) {
-		htmlString = "<div id='" + wb_id + "'>" + tr("Starting whiteboard chat") + "<br />"+
-				buildChatWindowButton(tr("Cancel"), ButtonWhiteboardSessionCancel, wb_id) +
-			"</div>";
-	} else {
-		htmlString = "<div id='" + wb_id + "'>" + tr("%1 would like to start a whiteboard chat").arg(Qt::escape(contact_)) + ": <br/>" +
-				buildChatWindowButton(tr("Cancel"), ButtonWhiteboardSessionCancel, wb_id) +
-				buildChatWindowButton(tr("Accept"), ButtonWhiteboardSessionAcceptRequest, wb_id) +
-			"</div>";
-	}
-
-	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 = "wbmessage" + boost::lexical_cast<std::string>(idCounter_++);
-	messageLog_->addMessageBottom(boost::shared_ptr<ChatSnippet>(new MessageSnippet(htmlString, Qt::escape(contact_), B2QDATE(boost::posix_time::second_clock::local_time()), qAvatarPath, false, false, theme_, P2QSTRING(id))));
-
-	previousMessageWasSelf_ = false;
-	previousSenderName_ = contact_;
-	return Q2PSTRING(wb_id);
-}
-
-void QtChatWindow::setWhiteboardSessionStatus(std::string id, const ChatWindow::WhiteboardSessionState state) {
-	messageLog_->setWhiteboardSessionStatus(QString::fromStdString(id), state);
-}
-
-void QtChatWindow::handleHTMLButtonClicked(QString id, QString encodedArgument1, QString encodedArgument2, QString encodedArgument3) {
-	QString arg1 = decodeButtonArgument(encodedArgument1);
-	QString arg2 = decodeButtonArgument(encodedArgument2);
-	QString arg3 = decodeButtonArgument(encodedArgument3);
-
-	if (id.startsWith(ButtonFileTransferCancel)) {
-		QString ft_id = arg1;
-		onFileTransferCancel(Q2PSTRING(ft_id));
-	}
-	else if (id.startsWith(ButtonFileTransferSetDescription)) {
-		QString ft_id = arg1;
-		bool ok = false;
-		QString text = QInputDialog::getText(this, tr("File transfer description"),
-			tr("Description:"), QLineEdit::Normal, "", &ok);
-		if (ok) {
-			descriptions[ft_id] = text;
-		}
-	}
-	else if (id.startsWith(ButtonFileTransferSendRequest)) {
-		QString ft_id = arg1;
-		QString text = descriptions.find(ft_id) == descriptions.end() ? QString() : descriptions[ft_id];
-		onFileTransferStart(Q2PSTRING(ft_id), Q2PSTRING(text));
-	}
-	else if (id.startsWith(ButtonFileTransferAcceptRequest)) {
-		QString ft_id = arg1;
-		QString filename = arg2;
-
-		QString path = QFileDialog::getSaveFileName(this, tr("Save File"), filename);
-		if (!path.isEmpty()) {
-			onFileTransferAccept(Q2PSTRING(ft_id), Q2PSTRING(path));
-		}
-	}
-	else if (id.startsWith(ButtonWhiteboardSessionAcceptRequest)) {
-		QString id = arg1;
-		messageLog_->setWhiteboardSessionStatus(QString::fromStdString(Q2PSTRING(id)), ChatWindow::WhiteboardAccepted);
-		onWhiteboardSessionAccept();
-	}
-	else if (id.startsWith(ButtonWhiteboardSessionCancel)) {
-		QString id = arg1;
-		messageLog_->setWhiteboardSessionStatus(QString::fromStdString(Q2PSTRING(id)), ChatWindow::WhiteboardTerminated);
-		onWhiteboardSessionCancel();
-	}
-	else if (id.startsWith(ButtonWhiteboardShowWindow)) {
-		QString id = arg1;
-		onWhiteboardWindowShow();
-	}
-	else if (id.startsWith(ButtonMUCInvite)) {
-		QString roomJID = arg1;
-		QString password = arg2;
-		QString elementID = arg3;
-
-		eventStream_->send(boost::make_shared<JoinMUCUIEvent>(Q2PSTRING(roomJID), Q2PSTRING(password)));
-		messageLog_->setMUCInvitationJoined(elementID);
-	}
-	else {
-		SWIFT_LOG(debug) << "Unknown HTML button! ( " << Q2PSTRING(id) << " )" << std::endl;
-	}
-}
-
-void QtChatWindow::addErrorMessage(const std::string& errorMessage) {
-	if (isWidgetSelected()) {
-		onAllMessagesRead();
-	}
-
-	QString errorMessageHTML(Qt::escape(P2QSTRING(errorMessage)));
-	errorMessageHTML.replace("\n","<br/>");
-	messageLog_->addMessageBottom(boost::shared_ptr<ChatSnippet>(new SystemMessageSnippet("<span class=\"error\">" + errorMessageHTML + "</span>", QDateTime::currentDateTime(), false, theme_)));
-
-	previousMessageWasSelf_ = false;
-	previousMessageKind_ = PreviousMessageWasSystem;
-}
-
-void QtChatWindow::addSystemMessage(const std::string& message) {
-	if (isWidgetSelected()) {
-		onAllMessagesRead();
-	}
-
-	QString messageHTML(P2QSTRING(message));
-	messageHTML = linkimoticonify(messageHTML);
-	messageLog_->addMessageBottom(boost::shared_ptr<ChatSnippet>(new SystemMessageSnippet(messageHTML, QDateTime::currentDateTime(), false, theme_)));
-
-	previousMessageKind_ = PreviousMessageWasSystem;
-}
-
-void QtChatWindow::replaceWithAction(const std::string& message, const std::string& id, const boost::posix_time::ptime& time) {
-	replaceMessage(" *" + linkimoticonify(P2QSTRING(message)) + "*", id, time, "font-style:italic ");
-}
-
-void QtChatWindow::replaceMessage(const std::string& message, const std::string& id, const boost::posix_time::ptime& time) {
-	replaceMessage(linkimoticonify(P2QSTRING(message)), id, time, "");
-}
-
-void QtChatWindow::replaceMessage(const QString& message, const std::string& id, const boost::posix_time::ptime& time, const QString& style) {
-	if (!id.empty()) {
-		if (isWidgetSelected()) {
-			onAllMessagesRead();
-		}
-
-		QString messageHTML(message);
-
-		QString styleSpanStart = style == "" ? "" : "<span style=\"" + style + "\">";
-		QString styleSpanEnd = style == "" ? "" : "</span>";
-		messageHTML = styleSpanStart + messageHTML + styleSpanEnd;
-
-		messageLog_->replaceMessage(messageHTML, P2QSTRING(id), B2QDATE(time));
-	}
-	else {
-		std::cerr << "Trying to replace a message with no id";
-	}
-}
-
-void QtChatWindow::addPresenceMessage(const std::string& message) {
-	if (isWidgetSelected()) {
-		onAllMessagesRead();
-	}
-
-	QString messageHTML(P2QSTRING(message));
-	messageHTML = linkimoticonify(messageHTML);
-	messageLog_->addMessageBottom(boost::shared_ptr<ChatSnippet>(new SystemMessageSnippet(messageHTML, QDateTime::currentDateTime(), false, theme_)));
-
-	previousMessageKind_ = PreviousMessageWasPresence;
-}
-
 
 void QtChatWindow::returnPressed() {
 	if (!inputEnabled_) {
@@ -866,21 +530,35 @@ void QtChatWindow::moveEvent(QMoveEvent*) {
 void QtChatWindow::dragEnterEvent(QDragEnterEvent *event) {
 	if (event->mimeData()->hasUrls() && event->mimeData()->urls().size() == 1) {
 		// TODO: check whether contact actually supports file transfer
-		event->acceptProposedAction();
+		if (!isMUC_) {
+			event->acceptProposedAction();
+		}
+	} else if (event->mimeData()->hasFormat("application/vnd.swift.contact-jid")) {
+		if (isMUC_ || supportsImpromptuChat_) {
+			event->acceptProposedAction();
+		}
 	}
 }
 
 void QtChatWindow::dropEvent(QDropEvent *event) {
-	if (event->mimeData()->urls().size() == 1) {
-		onSendFileRequest(Q2PSTRING(event->mimeData()->urls().at(0).toLocalFile()));
-	} else {
-		addSystemMessage("Sending of multiple files at once isn't supported at this time.");
+	if (event->mimeData()->hasUrls()) {
+		if (event->mimeData()->urls().size() == 1) {
+			onSendFileRequest(Q2PSTRING(event->mimeData()->urls().at(0).toLocalFile()));
+		} else {
+			std::string messageText(Q2PSTRING(tr("Sending of multiple files at once isn't supported at this time.")));
+			ChatMessage message;
+			message.append(boost::make_shared<ChatTextMessagePart>(messageText));
+			addSystemMessage(message, DefaultDirection);
+		}
+	} else if (event->mimeData()->hasFormat("application/vnd.swift.contact-jid")) {
+		QByteArray dataBytes = event->mimeData()->data("application/vnd.swift.contact-jid");
+		QDataStream dataStream(&dataBytes, QIODevice::ReadOnly);
+		QString jidString;
+		dataStream >> jidString;
+		onInviteToChat(std::vector<JID>(1, JID(Q2PSTRING(jidString))));
 	}
 }
 
-void QtChatWindow::replaceLastMessage(const std::string& message) {
-	messageLog_->replaceLastMessage(linkimoticonify(P2QSTRING(message)));
-}
 
 void QtChatWindow::setAvailableOccupantActions(const std::vector<OccupantAction>& actions) {
 	treeWidget_->setAvailableOccupantActions(actions);
@@ -901,15 +579,40 @@ void QtChatWindow::handleActionButtonClicked() {
 	QAction* destroy = NULL;
 	QAction* invite = NULL;
 
-	foreach(ChatWindow::RoomAction availableAction, availableRoomActions_)
-	{
-		switch(availableAction)
+	QAction* block = NULL;
+	QAction* unblock = NULL;
+
+	if (availableRoomActions_.empty()) {
+		if (blockingState_ == IsBlocked) {
+			unblock = contextMenu.addAction(tr("Unblock"));
+		} else if (blockingState_ == IsUnblocked) {
+			block = contextMenu.addAction(tr("Block"));
+		}
+
+		if (supportsImpromptuChat_) {
+			invite = contextMenu.addAction(tr("Invite person to this chat…"));
+		}
+
+	} else {
+		foreach(ChatWindow::RoomAction availableAction, availableRoomActions_)
 		{
-			case ChatWindow::ChangeSubject: changeSubject = contextMenu.addAction(tr("Change subject…")); break;
-			case ChatWindow::Configure: configure = contextMenu.addAction(tr("Configure room…")); break;
-			case ChatWindow::Affiliations: affiliations = contextMenu.addAction(tr("Edit affiliations…")); break;
-			case ChatWindow::Destroy: destroy = contextMenu.addAction(tr("Destroy room")); break;
-			case ChatWindow::Invite: invite = contextMenu.addAction(tr("Invite person to this room…")); break;
+			if (impromptu_) {
+				// hide options we don't need in impromptu chats
+				if (availableAction == ChatWindow::ChangeSubject ||
+					availableAction == ChatWindow::Configure ||
+					availableAction == ChatWindow::Affiliations ||
+					availableAction == ChatWindow::Destroy) {
+					continue;
+				}
+			}
+			switch(availableAction)
+			{
+				case ChatWindow::ChangeSubject: changeSubject = contextMenu.addAction(tr("Change subject…")); break;
+				case ChatWindow::Configure: configure = contextMenu.addAction(tr("Configure room…")); break;
+				case ChatWindow::Affiliations: affiliations = contextMenu.addAction(tr("Edit affiliations…")); break;
+				case ChatWindow::Destroy: destroy = contextMenu.addAction(tr("Destroy room")); break;
+				case ChatWindow::Invite: invite = contextMenu.addAction(tr("Invite person to this room…")); break;
+			}
 		}
 	}
 
@@ -947,7 +650,13 @@ void QtChatWindow::handleActionButtonClicked() {
 		}
 	}
 	else if (result == invite) {
-		onInvitePersonToThisMUCRequest();
+		onInviteToChat(std::vector<JID>());
+	}
+	else if (result == block) {
+		onBlockUserRequest();
+	}
+	else if (result == unblock) {
+		onUnblockUserRequest();
 	}
 }
 
@@ -960,11 +669,18 @@ void QtChatWindow::setAffiliations(MUCOccupant::Affiliation affiliation, const s
 	affiliationEditor_->setAffiliations(affiliation, jids);
 }
 
-void QtChatWindow::setAvailableRoomActions(const std::vector<RoomAction> &actions)
-{
+void QtChatWindow::setAvailableRoomActions(const std::vector<RoomAction>& actions) {
 	availableRoomActions_ = actions;
 }
 
+void QtChatWindow::setBlockingState(BlockingState state) {
+	blockingState_ = state;
+}
+
+void QtChatWindow::setCanInitiateImpromptuChats(bool supportsImpromptu) {
+	supportsImpromptuChat_ = supportsImpromptu;
+}
+
 void QtChatWindow::showRoomConfigurationForm(Form::ref form) {
 	if (mucConfigurationWindow_) {
 		delete mucConfigurationWindow_.data();
@@ -974,44 +690,91 @@ void QtChatWindow::showRoomConfigurationForm(Form::ref form) {
 	mucConfigurationWindow_->onFormCancelled.connect(boost::bind(boost::ref(onConfigurationFormCancelled)));
 }
 
-void QtChatWindow::addMUCInvitation(const std::string& senderName, const JID& jid, const std::string& reason, const std::string& password, bool direct) {
+void QtChatWindow::handleAppendedToLog() {
+	if (lastLineTracker_.getShouldMoveLastLine()) {
+		/* should this be queued? */
+		messageLog_->addLastSeenLine();
+	}
 	if (isWidgetSelected()) {
 		onAllMessagesRead();
 	}
+}
 
-	QString htmlString = QObject::tr("You've been invited to enter the %1 room.").arg(P2QSTRING(jid.toString())) + " <br/>";
-	if (!reason.empty()) {
-		htmlString += QObject::tr("Reason: %1").arg(P2QSTRING(reason)) + "<br/>";
-	}
-	if (!direct) {
-		htmlString += QObject::tr("This person may not have really sent this invitation!") + "<br/>";
-	}
+void QtChatWindow::addMUCInvitation(const std::string& senderName, const JID& jid, const std::string& reason, const std::string& password, bool direct, bool isImpromptu, bool isContinuation) {
+	handleAppendedToLog();
+	messageLog_->addMUCInvitation(senderName, jid, reason, password, direct, isImpromptu, isContinuation);
+}
 
-	QString id = QString(ButtonMUCInvite + "%1").arg(P2QSTRING(boost::lexical_cast<std::string>(idCounter_++)));
+std::string QtChatWindow::addMessage(const ChatMessage& message, const std::string& senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const boost::posix_time::ptime& time, const HighlightAction& highlight) {
+	handleAppendedToLog();
+	return messageLog_->addMessage(message, senderName, senderIsSelf, label, avatarPath, time, highlight);
+}
 
-	htmlString += "<div id='" + id + "'>" +
-			buildChatWindowButton(tr("Accept Invite"), ButtonMUCInvite, Qt::escape(P2QSTRING(jid.toString())), Qt::escape(P2QSTRING(password)), id) +
-		"</div>";
+std::string QtChatWindow::addAction(const ChatMessage& message, const std::string& senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const boost::posix_time::ptime& time, const HighlightAction& highlight) {
+	handleAppendedToLog();
+	return messageLog_->addAction(message, senderName, senderIsSelf, label, avatarPath, time, highlight);
+}
 
-	bool appendToPrevious = appendToPreviousCheck(PreviousMessageWasMUCInvite, senderName, false);
-	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";
 
-	messageLog_->addMessageBottom(boost::shared_ptr<ChatSnippet>(new MessageSnippet(htmlString, Qt::escape(P2QSTRING(senderName)), B2QDATE(boost::posix_time::second_clock::local_time()), qAvatarPath, false, appendToPrevious, theme_, id)));
-	previousMessageWasSelf_ = false;
-	previousSenderName_ = P2QSTRING(senderName);
-	previousMessageKind_ = PreviousMessageWasMUCInvite;
+void QtChatWindow::addSystemMessage(const ChatMessage& message, Direction direction) {
+	handleAppendedToLog();
+	messageLog_->addSystemMessage(message, direction);
+}
+
+void QtChatWindow::addPresenceMessage(const ChatMessage& message, Direction direction) {
+	handleAppendedToLog();
+	messageLog_->addPresenceMessage(message, direction);
+}
+
+void QtChatWindow::addErrorMessage(const ChatMessage& message) {
+	handleAppendedToLog();
+	messageLog_->addErrorMessage(message);
+}
+
+
+void QtChatWindow::replaceMessage(const ChatMessage& message, const std::string& id, const boost::posix_time::ptime& time, const HighlightAction& highlight) {
+	handleAppendedToLog();
+	messageLog_->replaceMessage(message, id, time, highlight);
+}
+
+void QtChatWindow::replaceWithAction(const ChatMessage& message, const std::string& id, const boost::posix_time::ptime& time, const HighlightAction& highlight) {
+	handleAppendedToLog();
+	messageLog_->replaceWithAction(message, id, time, highlight);
 }
 
+std::string QtChatWindow::addFileTransfer(const std::string& senderName, bool senderIsSelf, const std::string& filename, const boost::uintmax_t sizeInBytes) {
+	handleAppendedToLog();
+	return messageLog_->addFileTransfer(senderName, senderIsSelf, filename, sizeInBytes);
+}
 
-InviteToChatWindow* QtChatWindow::createInviteToChatWindow() {
-	return new QtInviteToChatWindow(this);
+void QtChatWindow::setFileTransferProgress(std::string id, const int percentageDone) {
+	messageLog_->setFileTransferProgress(id, percentageDone);
+}
+
+void QtChatWindow::setFileTransferStatus(std::string id, const FileTransferState state, const std::string& msg) {
+	messageLog_->setFileTransferStatus(id, state, msg);
 }
 
 
+std::string QtChatWindow::addWhiteboardRequest(bool senderIsSelf) {
+	handleAppendedToLog();
+	return messageLog_->addWhiteboardRequest(contact_, senderIsSelf);
+}
+
+void QtChatWindow::setWhiteboardSessionStatus(std::string id, const ChatWindow::WhiteboardSessionState state) {
+	messageLog_->setWhiteboardSessionStatus(id, state);
+}
+
+void QtChatWindow::replaceLastMessage(const ChatMessage& message) {
+	messageLog_->replaceLastMessage(message);
+}
+
+void QtChatWindow::setAckState(const std::string& id, AckState state) {
+	messageLog_->setAckState(id, state);
+}
+
+void QtChatWindow::setMessageReceiptState(const std::string& id, ChatWindow::ReceiptState state) {
+	messageLog_->setMessageReceiptState(id, state);
+}
+
 }