24 files changed, 754 insertions, 43 deletions
diff --git a/Swift/QtUI/.gitignore b/Swift/QtUI/.gitignore
index f539e86..53acb9f 100644
--- a/Swift/QtUI/.gitignore
+++ b/Swift/QtUI/.gitignore
@@ -1,3 +1,4 @@
 Swift
 BuildVersion.h
 *.dmg
+swift-open-uri
diff --git a/Swift/QtUI/QtAdHocCommandWindow.cpp b/Swift/QtUI/QtAdHocCommandWindow.cpp
new file mode 100644
index 0000000..a3bb077
--- /dev/null
+++ b/Swift/QtUI/QtAdHocCommandWindow.cpp
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2010-2011 Kevin Smith
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <Swift/QtUI/QtAdHocCommandWindow.h>
+
+#include <boost/bind.hpp>
+#include <QBoxLayout>
+#include <Swift/QtUI/QtFormWidget.h>
+#include <Swiften/Elements/Command.h>
+
+namespace Swift {
+QtAdHocCommandWindow::QtAdHocCommandWindow(boost::shared_ptr<OutgoingAdHocCommandSession> command) : command_(command) {
+
+	formWidget_ = NULL;
+
+	setAttribute(Qt::WA_DeleteOnClose);
+	command->onNextStageReceived.connect(boost::bind(&QtAdHocCommandWindow::handleNextStageReceived, this, _1));
+	command->onError.connect(boost::bind(&QtAdHocCommandWindow::handleError, this, _1));
+	command->start();
+
+	QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+	layout->setContentsMargins(0,0,0,0);
+	layout->setSpacing(2);
+	label_ = new QLabel(this);
+	layout->addWidget(label_);
+	QWidget* formContainer = new QWidget(this);
+	layout->addWidget(formContainer);
+	formLayout_ = new QBoxLayout(QBoxLayout::TopToBottom, formContainer);
+	QWidget* buttonsWidget = new QWidget(this);
+	layout->addWidget(buttonsWidget);
+
+	QBoxLayout* buttonsLayout = new QBoxLayout(QBoxLayout::LeftToRight, buttonsWidget);
+	cancelButton_ = new QPushButton(tr("Cancel"), buttonsWidget);
+	buttonsLayout->addWidget(cancelButton_);
+	connect(cancelButton_, SIGNAL(clicked()), this, SLOT(handleCancelClicked()));
+	backButton_ = new QPushButton(tr("Back"), buttonsWidget);
+	buttonsLayout->addWidget(backButton_);
+	connect(backButton_, SIGNAL(clicked()), this, SLOT(handlePrevClicked()));
+	nextButton_ = new QPushButton(tr("Next"), buttonsWidget);
+	buttonsLayout->addWidget(nextButton_);
+	connect(nextButton_, SIGNAL(clicked()), this, SLOT(handleNextClicked()));
+	completeButton_ = new QPushButton(tr("Complete"), buttonsWidget);
+	buttonsLayout->addWidget(completeButton_);
+	connect(completeButton_, SIGNAL(clicked()), this, SLOT(handleCompleteClicked()));
+	nextButton_->setEnabled(false);
+	backButton_->setEnabled(false);
+	completeButton_->setEnabled(false);
+	actions_[Command::Next] = nextButton_;
+	actions_[Command::Prev] = backButton_;
+	actions_[Command::Complete] = completeButton_;
+	actions_[Command::Cancel] = cancelButton_;
+	show();
+}
+
+QtAdHocCommandWindow::~QtAdHocCommandWindow() {
+
+}
+
+void QtAdHocCommandWindow::handleCancelClicked() {
+	command_->cancel();
+}
+
+void QtAdHocCommandWindow::handlePrevClicked() {
+	command_->goBack();
+}
+
+void QtAdHocCommandWindow::handleNextClicked() {
+	command_->goNext(formWidget_ ? formWidget_->getCompletedForm() : Form::ref());
+}
+
+void QtAdHocCommandWindow::handleCompleteClicked() {
+	command_->complete(formWidget_ ? formWidget_->getCompletedForm() : Form::ref());
+}
+
+void QtAdHocCommandWindow::handleNextStageReceived(Command::ref command) {
+	if (command->getForm()) {
+		setForm(command->getForm());
+	} else {
+		setNoForm();
+	}
+	QString notes;
+	foreach (Command::Note note, command->getNotes()) {
+		if (!notes.isEmpty()) {
+			notes += "\n";
+			QString qNote(note.note.c_str());
+			switch (note.type) {
+				case Command::Note::Error: notes += tr("Error: %1").arg(qNote); break;
+				case Command::Note::Warn: notes += tr("Warning: %1").arg(qNote); break;
+				case Command::Note::Info: notes += qNote; break;
+			}
+		}
+	}
+	label_->setText(notes);
+	setAvailableActions(command);
+}
+
+void QtAdHocCommandWindow::handleError(ErrorPayload::ref /*error*/) {
+	nextButton_->setEnabled(false);
+	backButton_->setEnabled(false);
+	completeButton_->setEnabled(false);
+	label_->setText(tr("Error executing command"));
+}
+
+void QtAdHocCommandWindow::setForm(Form::ref form) {
+	delete formWidget_;
+	formWidget_ = new QtFormWidget(form, this);
+	formLayout_->addWidget(formWidget_);
+}
+
+void QtAdHocCommandWindow::setNoForm() {
+	delete formWidget_;
+}
+
+typedef std::pair<Command::Action, QPushButton*> ActionButton;
+
+void QtAdHocCommandWindow::setAvailableActions(Command::ref /*commandResult*/) {
+	foreach (ActionButton pair, actions_) {
+		OutgoingAdHocCommandSession::ActionState state = command_->getActionState(pair.first);
+		if (state & OutgoingAdHocCommandSession::Present) {
+			pair.second->show();
+		}
+		else {
+			pair.second->hide();
+		}
+		if (state & OutgoingAdHocCommandSession::Enabled) {
+			pair.second->setEnabled(true);
+		}
+		else {
+			pair.second->setEnabled(false);
+		}
+	}
+}
+
+}
diff --git a/Swift/QtUI/QtAdHocCommandWindow.h b/Swift/QtUI/QtAdHocCommandWindow.h
new file mode 100644
index 0000000..adeb3e6
--- /dev/null
+++ b/Swift/QtUI/QtAdHocCommandWindow.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010-2011 Kevin Smith
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <QWidget>
+#include <QPushButton>
+#include <QLabel>
+
+#include <Swift/Controllers/UIInterfaces/AdHocCommandWindow.h>
+#include <Swiften/AdHoc/OutgoingAdHocCommandSession.h>
+
+class QBoxLayout;
+
+namespace Swift {
+	class QtFormWidget;
+	class QtAdHocCommandWindow : public QWidget, public AdHocCommandWindow {
+		Q_OBJECT
+		public:
+			QtAdHocCommandWindow(boost::shared_ptr<OutgoingAdHocCommandSession> command);
+			virtual ~QtAdHocCommandWindow();
+		private:
+			void handleNextStageReceived(Command::ref command);
+			void handleError(ErrorPayload::ref error);
+			void setForm(Form::ref);
+			void setNoForm();
+			void setAvailableActions(Command::ref commandResult);
+		private slots:
+			void handleCancelClicked();
+			void handlePrevClicked();
+			void handleNextClicked();
+			void handleCompleteClicked();
+		private:
+			boost::shared_ptr<OutgoingAdHocCommandSession> command_;
+			QtFormWidget* formWidget_;
+			QBoxLayout* formLayout_;
+			Form::ref form_;
+			QLabel* label_;
+			QPushButton* backButton_;
+			QPushButton* nextButton_;
+			QPushButton* completeButton_;
+			QPushButton* cancelButton_;
+			std::map<Command::Action, QPushButton*> actions_;
+	};
+}
diff --git a/Swift/QtUI/QtChatTabs.cpp b/Swift/QtUI/QtChatTabs.cpp
index 25c7ca2..249080b 100644
--- a/Swift/QtUI/QtChatTabs.cpp
+++ b/Swift/QtUI/QtChatTabs.cpp
@@ -7,6 +7,10 @@
 #include "QtChatTabs.h"
 
 #include <algorithm>
+#include <vector>
+
+#include <Swift/Controllers/ChatMessageSummarizer.h>
+#include <Swift/QtUI/QtSwiftUtil.h>
 
 #include <QCloseEvent>
 #include <QDesktopWidget>
@@ -236,16 +240,18 @@ void QtChatTabs::handleTabTitleUpdated(QWidget* widget) {
 	default : tabTextColor = QColor();
 	}
 	tabs_->tabBar()->setTabTextColor(index, tabTextColor);
-	int unread = 0;
+
+	std::vector<std::pair<std::string, int> > unreads;
 	for (int i = 0; i < tabs_->count(); i++) {
 		QtTabbable* tab = qobject_cast<QtTabbable*>(tabs_->widget(i));
 		if (tab) {
-			unread += tab->getCount();
+			unreads.push_back(std::pair<std::string, int>(Q2PSTRING(tab->windowTitle()), tab->getCount()));
 		}
 	}
 
-	QtTabbable* current = qobject_cast<QtTabbable*>(tabs_->currentWidget());
-	setWindowTitle(unread > 0 ? QString("(%1) %2").arg(unread).arg(current->windowTitle()) : current->windowTitle());
+	std::string current(Q2PSTRING(qobject_cast<QtTabbable*>(tabs_->currentWidget())->windowTitle()));
+	ChatMessageSummarizer summary;
+	setWindowTitle(summary.getSummary(current, unreads).c_str());
 }
 
 void QtChatTabs::flash() {
diff --git a/Swift/QtUI/QtChatView.cpp b/Swift/QtUI/QtChatView.cpp
index 521b072..4846af6 100644
--- a/Swift/QtUI/QtChatView.cpp
+++ b/Swift/QtUI/QtChatView.cpp
@@ -106,6 +106,19 @@ void QtChatView::addToDOM(boost::shared_ptr<ChatSnippet> snippet) {
 	//qApp->processEvents();
 }
 
+void QtChatView::addLastSeenLine() {
+	if (lineSeparator_.isNull()) {
+		lineSeparator_ = newInsertPoint_.clone();
+		lineSeparator_.setInnerXml(QString("<hr/>"));
+		newInsertPoint_.prependOutside(lineSeparator_);
+	}
+	else {
+		QWebElement lineSeparatorC = lineSeparator_.clone();
+		lineSeparatorC.removeFromDocument();
+	}
+	newInsertPoint_.prependOutside(lineSeparator_);
+}
+
 void QtChatView::replaceLastMessage(const QString& newMessage) {
 	assert(viewReady_);
 	/* FIXME: must be queued? */
diff --git a/Swift/QtUI/QtChatView.h b/Swift/QtUI/QtChatView.h
index 58b33df..ce12ca8 100644
--- a/Swift/QtUI/QtChatView.h
+++ b/Swift/QtUI/QtChatView.h
@@ -26,8 +26,8 @@ namespace Swift {
 			Q_OBJECT
 		public:
 			QtChatView(QtChatTheme* theme, QWidget* parent);
-
 			void addMessage(boost::shared_ptr<ChatSnippet> snippet);
+			void addLastSeenLine();
 			void replaceLastMessage(const QString& newMessage);
 			void replaceLastMessage(const QString& newMessage, const QString& note);
 			void rememberScrolledToBottom();
@@ -63,6 +63,7 @@ namespace Swift {
 
 			QtChatTheme* theme_;
 			QWebElement newInsertPoint_;
+			QWebElement lineSeparator_;
 			QWebElement lastElement_;
 			QWebElement document_;
 	};
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index 1a909fd..312ec65 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -40,7 +40,7 @@ QtChatWindow::QtChatWindow(const QString &contact, QtChatTheme* theme, UIEventSt
 	QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
 	layout->setContentsMargins(0,0,0,0);
 	layout->setSpacing(2);
-	
+
 
 	QSplitter *logRosterSplitter = new QSplitter(this);
 	logRosterSplitter->setAutoFillBackground(true);
@@ -72,7 +72,7 @@ QtChatWindow::QtChatWindow(const QString &contact, QtChatTheme* theme, UIEventSt
 	input_ = new QtTextEdit(this);
 	input_->setAcceptRichText(false);
 	layout->addWidget(input_);
-	
+
 	inputClearing_ = false;
 	contactIsTyping_ = false;
 
@@ -150,7 +150,7 @@ void QtChatWindow::tabComplete() {
 }
 
 void QtChatWindow::setRosterModel(Roster* roster) {
-	treeWidget_->setRosterModel(roster);	
+	treeWidget_->setRosterModel(roster);
 }
 
 void QtChatWindow::setAvailableSecurityLabels(const std::vector<SecurityLabelsCatalog::Item>& labels) {
@@ -204,10 +204,13 @@ void QtChatWindow::qAppFocusChanged(QWidget *old, QWidget *now) {
 	Q_UNUSED(old);
 	Q_UNUSED(now);
 	if (isWidgetSelected()) {
+		lastLineTracker_.setHasFocus(true);
 		input_->setFocus();
 		onAllMessagesRead();
 	}
-	
+	else {
+		lastLineTracker_.setHasFocus(false);
+	}
 }
 
 void QtChatWindow::setInputEnabled(bool enabled) {
@@ -236,7 +239,7 @@ void QtChatWindow::setContactChatState(ChatState::ChatStateType state) {
 QtTabbable::AlertType QtChatWindow::getWidgetAlertState() {
 	if (contactIsTyping_) {
 		return ImpendingActivity;
-	} 
+	}
 	if (unreadCount_ > 0) {
 		return WaitingActivity;
 	}
@@ -265,7 +268,6 @@ std::string QtChatWindow::addMessage(const std::string &message, const std::stri
 	if (isWidgetSelected()) {
 		onAllMessagesRead();
 	}
-
 	QString scaledAvatarPath = QtScaledAvatarCache(32).getScaledAvatarPath(avatarPath.c_str());
 
 	QString htmlString;
@@ -281,6 +283,12 @@ std::string QtChatWindow::addMessage(const std::string &message, const std::stri
 	htmlString += styleSpanStart + messageHTML + styleSpanEnd;
 
 	bool appendToPrevious = !previousMessageWasSystem_ && !previousMessageWasPresence_ && ((senderIsSelf && previousMessageWasSelf_) || (!senderIsSelf && !previousMessageWasSelf_ && previousSenderName_ == P2QSTRING(senderName)));
+	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_.generateID();
 	messageLog_->addMessage(boost::shared_ptr<ChatSnippet>(new MessageSnippet(htmlString, Qt::escape(P2QSTRING(senderName)), B2QDATE(time), qAvatarPath, senderIsSelf, appendToPrevious, theme_, P2QSTRING(id))));
@@ -399,7 +407,7 @@ void QtChatWindow::resizeEvent(QResizeEvent*) {
 }
 
 void QtChatWindow::moveEvent(QMoveEvent*) {
-	emit geometryChanged();	
+	emit geometryChanged();
 }
 
 void QtChatWindow::replaceLastMessage(const std::string& message) {
diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h
index 910019b..9e3aeb3 100644
--- a/Swift/QtUI/QtChatWindow.h
+++ b/Swift/QtUI/QtChatWindow.h
@@ -4,13 +4,14 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#ifndef SWIFT_QtChatWindow_H
-#define SWIFT_QtChatWindow_H
+#pragma once
 
 #include "Swift/Controllers/UIInterfaces/ChatWindow.h"
 
 #include "QtTabbable.h"
 
+#include "SwifTools/LastLineTracker.h"
+
 #include "Swiften/Base/IDGenerator.h"
 
 class QTextEdit;
@@ -79,6 +80,7 @@ namespace Swift {
 
 			int unreadCount_;
 			bool contactIsTyping_;
+			LastLineTracker lastLineTracker_;
 			QString contact_;
 			QtChatView* messageLog_;
 			QtChatTheme* theme_;
@@ -97,5 +99,3 @@ namespace Swift {
 			IDGenerator id_;
 	};
 }
-
-#endif
diff --git a/Swift/QtUI/QtDBUSURIHandler.cpp b/Swift/QtUI/QtDBUSURIHandler.cpp
new file mode 100644
index 0000000..9b69ca6
--- /dev/null
+++ b/Swift/QtUI/QtDBUSURIHandler.cpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2011 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include "QtDBUSURIHandler.h"
+
+#include <QDBusAbstractAdaptor>
+#include <QDBusConnection>
+
+#include "QtSwiftUtil.h"
+
+using namespace Swift;
+
+namespace {
+	class DBUSAdaptor: public QDBusAbstractAdaptor {
+			Q_OBJECT
+			Q_CLASSINFO("D-Bus Interface", "im.swift.Swift.URIHandler");
+		public:
+			DBUSAdaptor(QtDBUSURIHandler* uriHandler) : QDBusAbstractAdaptor(uriHandler), uriHandler(uriHandler) {
+			}
+
+		public slots:
+			void openURI(const QString& uri) {
+				uriHandler->onURI(Q2PSTRING(uri));
+			}
+
+		private:
+			QtDBUSURIHandler* uriHandler;
+	};
+}
+
+QtDBUSURIHandler::QtDBUSURIHandler() {
+	new DBUSAdaptor(this);
+	QDBusConnection connection = QDBusConnection::sessionBus();
+	connection.registerService("im.swift.Swift.URIHandler");
+	connection.registerObject("/", this);
+}
+
+#include "QtDBUSURIHandler.moc"
diff --git a/Swift/QtUI/QtDBUSURIHandler.h b/Swift/QtUI/QtDBUSURIHandler.h
new file mode 100644
index 0000000..be1872e
--- /dev/null
+++ b/Swift/QtUI/QtDBUSURIHandler.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2011 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <QObject>
+#include <SwifTools/URIHandler/URIHandler.h>
+
+namespace Swift {
+	class QtDBUSURIHandler : public QObject, public URIHandler {
+		public:
+			QtDBUSURIHandler();
+	};
+}
diff --git a/Swift/QtUI/QtFormWidget.cpp b/Swift/QtUI/QtFormWidget.cpp
new file mode 100644
index 0000000..050ff27
--- /dev/null
+++ b/Swift/QtUI/QtFormWidget.cpp
@@ -0,0 +1,242 @@
+/*
+ * Copyright (c) 2010-2011 Kevin Smith
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <Swift/QtUI/QtFormWidget.h>
+
+#include <QGridLayout>
+#include <QLabel>
+#include <QListWidget>
+#include <QLineEdit>
+#include <QTextEdit>
+#include <QCheckBox>
+#include <QScrollArea>
+
+#include <Swift/QtUI/QtSwiftUtil.h>
+#include <Swiften/Base/foreach.h>
+
+namespace Swift {
+
+QtFormWidget::QtFormWidget(Form::ref form, QWidget* parent) : QWidget(parent), form_(form) {
+	QGridLayout* thisLayout = new QGridLayout(this);
+	int row = 0;
+	if (!form->getTitle().empty()) {
+		QLabel* instructions = new QLabel(("<b>" + form->getTitle() + "</b>").c_str(), this);
+		thisLayout->addWidget(instructions, row++, 0, 1, 2);
+	}
+	if (!form->getInstructions().empty()) {
+		QLabel* instructions = new QLabel(form->getInstructions().c_str(), this);
+		thisLayout->addWidget(instructions, row++, 0, 1, 2);
+	}
+	QScrollArea* scrollArea = new QScrollArea(this);
+	thisLayout->addWidget(scrollArea);
+	QWidget* scroll = new QWidget(this);
+	QGridLayout* layout = new QGridLayout(scroll);
+	foreach (boost::shared_ptr<FormField> field, form->getFields()) {
+		QWidget* widget = createWidget(field);
+		if (widget) {
+			layout->addWidget(new QLabel(field->getLabel().c_str(), this), row, 0);
+			layout->addWidget(widget, row++, 1);
+		}
+	}
+	scrollArea->setWidget(scroll);
+	scrollArea->setWidgetResizable(true);
+}
+
+QtFormWidget::~QtFormWidget() {
+
+}
+
+QListWidget* QtFormWidget::createList(FormField::ref field) {
+	QListWidget* listWidget = new QListWidget(this);
+	listWidget->setSortingEnabled(false);
+	listWidget->setSelectionMode(boost::dynamic_pointer_cast<ListMultiFormField>(field) ? QAbstractItemView::MultiSelection : QAbstractItemView::SingleSelection);
+	foreach (FormField::Option option, field->getOptions()) {
+		listWidget->addItem(option.label.c_str());
+	}
+	boost::shared_ptr<ListMultiFormField> listMultiField = boost::dynamic_pointer_cast<ListMultiFormField>(field);
+	boost::shared_ptr<ListSingleFormField> listSingleField = boost::dynamic_pointer_cast<ListSingleFormField>(field);
+	for (int i = 0; i < listWidget->count(); i++) {
+		QListWidgetItem* item = listWidget->item(i);
+		bool selected = false;
+		if (listSingleField) {
+			selected = (item->text() == QString(listSingleField->getValue().c_str()));
+		}
+		else if (listMultiField) {
+			std::string text = Q2PSTRING(item->text());
+			selected = (std::find(listMultiField->getValue().begin(), listMultiField->getValue().end(), text) != listMultiField->getValue().end());
+		}
+		item->setSelected(selected);
+	}
+	return listWidget;
+}
+
+QWidget* QtFormWidget::createWidget(FormField::ref field) {
+	QWidget* widget = NULL;
+	boost::shared_ptr<BooleanFormField> booleanField = boost::dynamic_pointer_cast<BooleanFormField>(field);
+	if (booleanField) {
+		QCheckBox* checkWidget = new QCheckBox(this);
+		checkWidget->setCheckState(booleanField->getValue() ? Qt::Checked : Qt::Unchecked);
+		widget = checkWidget;
+	}
+	boost::shared_ptr<FixedFormField> fixedField = boost::dynamic_pointer_cast<FixedFormField>(field);
+	if (fixedField) {
+		QString value = fixedField->getValue().c_str();
+		widget = new QLabel(value, this);
+	}
+	boost::shared_ptr<ListSingleFormField> listSingleField = boost::dynamic_pointer_cast<ListSingleFormField>(field);
+	if (listSingleField) {
+		widget = createList(field);
+	}
+	boost::shared_ptr<TextMultiFormField> textMultiField = boost::dynamic_pointer_cast<TextMultiFormField>(field);
+	if (textMultiField) {
+		QString value = textMultiField->getValue().c_str();
+		widget = new QTextEdit(value, this);
+	}
+	boost::shared_ptr<TextPrivateFormField> textPrivateField = boost::dynamic_pointer_cast<TextPrivateFormField>(field);
+	if (textPrivateField) {
+		QString value = textPrivateField->getValue().c_str();
+		QLineEdit* lineWidget = new QLineEdit(value, this);
+		lineWidget->setEchoMode(QLineEdit::Password);
+		widget = lineWidget;
+	}
+	boost::shared_ptr<TextSingleFormField> textSingleField = boost::dynamic_pointer_cast<TextSingleFormField>(field);
+	if (textSingleField) {
+		QString value = textSingleField->getValue().c_str();
+		widget = new QLineEdit(value, this);
+	}
+	boost::shared_ptr<JIDSingleFormField> jidSingleField = boost::dynamic_pointer_cast<JIDSingleFormField>(field);
+	if (jidSingleField) {
+		QString value = jidSingleField->getValue().toString().c_str();
+		widget = new QLineEdit(value, this);
+	}
+	boost::shared_ptr<JIDMultiFormField> jidMultiField = boost::dynamic_pointer_cast<JIDMultiFormField>(field);
+	if (jidMultiField) {
+		QString text;
+		bool prev = false;
+		foreach (JID line, jidMultiField->getValue()) {
+			if (prev) {
+				text += "\n";
+			}
+			prev = true;
+			text += line.toString().c_str();
+		}
+		widget = new QTextEdit(text, this);
+	}
+	boost::shared_ptr<ListMultiFormField> listMultiField = boost::dynamic_pointer_cast<ListMultiFormField>(field);
+	if (listMultiField) {
+		widget = createList(field);
+	}
+	boost::shared_ptr<HiddenFormField> hiddenField = boost::dynamic_pointer_cast<HiddenFormField>(field);
+	if (hiddenField) {
+	}
+	fields_[field->getName()] = widget;
+	return widget;
+}
+
+Form::ref QtFormWidget::getCompletedForm() {
+	Form::ref result(new Form(Form::SubmitType));
+	foreach (boost::shared_ptr<FormField> field, form_->getFields()) {
+		boost::shared_ptr<FormField> resultField;
+		boost::shared_ptr<BooleanFormField> booleanField = boost::dynamic_pointer_cast<BooleanFormField>(field);
+		if (booleanField) {
+			resultField = FormField::ref(BooleanFormField::create(qobject_cast<QCheckBox*>(fields_[field->getName()])->checkState() == Qt::Checked));
+		}
+		boost::shared_ptr<FixedFormField> fixedField = boost::dynamic_pointer_cast<FixedFormField>(field);
+		if (fixedField) {
+			resultField = FormField::ref(FixedFormField::create(fixedField->getValue()));
+		}
+		boost::shared_ptr<ListSingleFormField> listSingleField = boost::dynamic_pointer_cast<ListSingleFormField>(field);
+		if (listSingleField) {
+			QListWidget* listWidget = qobject_cast<QListWidget*>(fields_[field->getName()]);
+			if (listWidget->selectedItems().size() > 0) {
+				int i = listWidget->row(listWidget->selectedItems()[0]);
+				resultField = FormField::ref(ListSingleFormField::create(field->getOptions()[i].value));
+			}
+			else {
+				resultField = FormField::ref(ListSingleFormField::create());
+			}
+		}
+		boost::shared_ptr<TextMultiFormField> textMultiField = boost::dynamic_pointer_cast<TextMultiFormField>(field);
+		if (textMultiField) {
+			QTextEdit* widget = qobject_cast<QTextEdit*>(fields_[field->getName()]);
+			QString string = widget->toPlainText();
+			if (string.isEmpty()) {
+				resultField = FormField::ref(TextMultiFormField::create());
+			}
+			else {
+				resultField = FormField::ref(TextMultiFormField::create(Q2PSTRING(string)));
+			}
+		}
+		boost::shared_ptr<TextPrivateFormField> textPrivateField = boost::dynamic_pointer_cast<TextPrivateFormField>(field);
+		if (textPrivateField) {
+			QLineEdit* widget = qobject_cast<QLineEdit*>(fields_[field->getName()]);
+			QString string = widget->text();
+			if (string.isEmpty()) {
+				resultField = FormField::ref(TextPrivateFormField::create());
+			}
+			else {
+				resultField = FormField::ref(TextPrivateFormField::create(Q2PSTRING(string)));
+			}
+		}
+		boost::shared_ptr<TextSingleFormField> textSingleField = boost::dynamic_pointer_cast<TextSingleFormField>(field);
+		if (textSingleField) {
+			QLineEdit* widget = qobject_cast<QLineEdit*>(fields_[field->getName()]);
+			QString string = widget->text();
+			if (string.isEmpty()) {
+				resultField = FormField::ref(TextSingleFormField::create());
+			}
+			else {
+				resultField = FormField::ref(TextSingleFormField::create(Q2PSTRING(string)));
+			}
+		}
+		boost::shared_ptr<JIDSingleFormField> jidSingleField = boost::dynamic_pointer_cast<JIDSingleFormField>(field);
+		if (jidSingleField) {
+			QLineEdit* widget = qobject_cast<QLineEdit*>(fields_[field->getName()]);
+			QString string = widget->text();
+			JID jid(Q2PSTRING(string));
+			if (string.isEmpty()) {
+				resultField = FormField::ref(JIDSingleFormField::create());
+			}
+			else {
+				resultField = FormField::ref(JIDSingleFormField::create(jid));
+			}
+		}
+		boost::shared_ptr<JIDMultiFormField> jidMultiField = boost::dynamic_pointer_cast<JIDMultiFormField>(field);
+		if (jidMultiField) {
+			QTextEdit* widget = qobject_cast<QTextEdit*>(fields_[field->getName()]);
+			QString string = widget->toPlainText();
+			if (string.isEmpty()) {
+				resultField = FormField::ref(JIDMultiFormField::create());
+			}
+			else {
+				QStringList lines = string.split("\n");
+				std::vector<JID> value;
+				foreach (QString line, lines) {
+					value.push_back(JID(Q2PSTRING(line)));
+				}
+				resultField = FormField::ref(JIDMultiFormField::create(value));
+			}
+		}
+		boost::shared_ptr<ListMultiFormField> listMultiField = boost::dynamic_pointer_cast<ListMultiFormField>(field);
+		if (listMultiField) {
+			QListWidget* listWidget = qobject_cast<QListWidget*>(fields_[field->getName()]);
+			std::vector<std::string> values;
+			foreach (QListWidgetItem* item, listWidget->selectedItems()) {
+				values.push_back(field->getOptions()[listWidget->row(item)].value);
+			}
+			resultField = FormField::ref(ListMultiFormField::create(values));
+		}
+		boost::shared_ptr<HiddenFormField> hiddenField = boost::dynamic_pointer_cast<HiddenFormField>(field);
+		if (hiddenField) {
+			resultField = FormField::ref(HiddenFormField::create(hiddenField->getValue()));
+		}
+		resultField->setName(field->getName());
+		result->addField(resultField);
+	}
+	return result;
+}
+
+}
diff --git a/Swift/QtUI/QtFormWidget.h b/Swift/QtUI/QtFormWidget.h
new file mode 100644
index 0000000..2fb7b98
--- /dev/null
+++ b/Swift/QtUI/QtFormWidget.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2011 Kevin Smith
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <QWidget>
+
+#include <map>
+#include <Swiften/Elements/Form.h>
+
+class QListWidget;
+
+namespace Swift {
+
+class QtFormWidget : public QWidget {
+	Q_OBJECT
+	public:
+		QtFormWidget(Form::ref form, QWidget* parent = NULL);
+		virtual ~QtFormWidget();
+		Form::ref getCompletedForm();
+	private:
+		QWidget* createWidget(FormField::ref field);
+		QListWidget* createList(FormField::ref field);
+		std::map<std::string, QWidget*> fields_;
+		Form::ref form_;
+};
+
+}
diff --git a/Swift/QtUI/QtLoginWindow.cpp b/Swift/QtUI/QtLoginWindow.cpp
index d0ab61e..4302c10 100644
--- a/Swift/QtUI/QtLoginWindow.cpp
+++ b/Swift/QtUI/QtLoginWindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Kevin Smith
+ * Copyright (c) 2010-2011 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -56,9 +56,9 @@ QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream) : QMainWindow() {
 	stack_ = new QStackedWidget(centralWidget);
 	topLayout->addWidget(stack_);
 	topLayout->setMargin(0);
-	QWidget *wrapperWidget = new QWidget(this);
-	wrapperWidget->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
-	QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom, wrapperWidget);
+	loginWidgetWrapper_ = new QWidget(this);
+	loginWidgetWrapper_->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
+	QBoxLayout *layout = new QBoxLayout(QBoxLayout::TopToBottom, loginWidgetWrapper_);
 	layout->addStretch(2);
 
 	QLabel* logo = new QLabel(this);
@@ -139,7 +139,7 @@ QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream) : QMainWindow() {
 	layout->addWidget(loginAutomatically_);
 
 	connect(loginButton_, SIGNAL(clicked()), SLOT(loginClicked()));
-	stack_->addWidget(wrapperWidget);
+	stack_->addWidget(loginWidgetWrapper_);
 #ifdef SWIFTEN_PLATFORM_MACOSX
 	menuBar_ = new QMenuBar(NULL);
 #else
@@ -284,11 +284,9 @@ void QtLoginWindow::handleUsernameTextChanged() {
 }
 
 void QtLoginWindow::loggedOut() {
-	if (stack_->count() > 1) {
-		QWidget* current = stack_->currentWidget();
-		stack_->setCurrentIndex(0);
-		stack_->removeWidget(current);
-	}
+	stack_->removeWidget(stack_->currentWidget());
+	stack_->addWidget(loginWidgetWrapper_);
+	stack_->setCurrentWidget(loginWidgetWrapper_);
 	setInitialMenus();
 	setIsLoggingIn(false);
 }
@@ -370,6 +368,7 @@ void QtLoginWindow::setInitialMenus() {
 void QtLoginWindow::morphInto(MainWindow *mainWindow) {
 	QtMainWindow *qtMainWindow = dynamic_cast<QtMainWindow*>(mainWindow);
 	assert(qtMainWindow);
+	stack_->removeWidget(loginWidgetWrapper_);
 	stack_->addWidget(qtMainWindow);
 	stack_->setCurrentWidget(qtMainWindow);
 	setEnabled(true);
diff --git a/Swift/QtUI/QtLoginWindow.h b/Swift/QtUI/QtLoginWindow.h
index 3f3b5f8..b667a4b 100644
--- a/Swift/QtUI/QtLoginWindow.h
+++ b/Swift/QtUI/QtLoginWindow.h
@@ -1,11 +1,10 @@
 /*
- * Copyright (c) 2010 Kevin Smith
+ * Copyright (c) 2010-2011 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#ifndef SWIFT_QtLoginWindow_H
-#define SWIFT_QtLoginWindow_H
+#pragma once
 
 #include <QMainWindow>
 #include <QPointer>
@@ -65,6 +64,7 @@ namespace Swift {
 
 		private:
 			void setInitialMenus();
+			QWidget* loginWidgetWrapper_;
 			QStringList usernames_;
 			QStringList passwords_;
 			QStringList certificateFiles_;
@@ -87,5 +87,3 @@ namespace Swift {
 			QPointer<QtAboutWidget> aboutDialog_;
 	};
 }
-
-#endif
diff --git a/Swift/QtUI/QtMainWindow.cpp b/Swift/QtUI/QtMainWindow.cpp
index 6391961..f7dba58 100644
--- a/Swift/QtUI/QtMainWindow.cpp
+++ b/Swift/QtUI/QtMainWindow.cpp
@@ -30,6 +30,7 @@
 #include "Swift/Controllers/UIEvents/RequestProfileEditorUIEvent.h"
 #include "Swift/Controllers/UIEvents/JoinMUCUIEvent.h"
 #include "Swift/Controllers/UIEvents/ToggleShowOfflineUIEvent.h"
+#include "Swift/Controllers/UIEvents/RequestAdHocUIEvent.h"
 
 namespace Swift {
 
@@ -99,6 +100,8 @@ QtMainWindow::QtMainWindow(QtSettingsProvider* settings, UIEventStream* uiEventS
 	chatUserAction_ = new QAction(tr("Start &Chat"), this);
 	connect(chatUserAction_, SIGNAL(triggered(bool)), this, SLOT(handleChatUserActionTriggered(bool)));
 	actionsMenu->addAction(chatUserAction_);
+	serverAdHocMenu_ = new QMenu("Server Commands", this);
+	actionsMenu->addMenu(serverAdHocMenu_);
 	actionsMenu->addSeparator();
 	QAction* signOutAction = new QAction(tr("&Sign Out"), this);
 	connect(signOutAction, SIGNAL(triggered()), SLOT(handleSignOutAction()));
@@ -106,6 +109,12 @@ QtMainWindow::QtMainWindow(QtSettingsProvider* settings, UIEventStream* uiEventS
 
 	connect(treeWidget_, SIGNAL(onSomethingSelectedChanged(bool)), editUserAction_, SLOT(setEnabled(bool)));
 
+	setAvailableAdHocCommands(std::vector<DiscoItems::Item>());
+	QAction* adHocAction = new QAction("Populating commands..", this);
+	adHocAction->setEnabled(false);
+	serverAdHocMenu_->addAction(adHocAction);
+	serverAdHocCommandActions_.append(adHocAction);
+
 	lastOfflineState_ = false;
 	uiEventStream_->onUIEvent.connect(boost::bind(&QtMainWindow::handleUIEvent, this, _1));
 }
@@ -206,6 +215,33 @@ void QtMainWindow::setConnecting() {
 	meView_->setConnecting();
 }
 
+void QtMainWindow::handleAdHocActionTriggered(bool /*checked*/) {
+	QAction* action = qobject_cast<QAction*>(sender());
+	assert(action);
+	DiscoItems::Item command = serverAdHocCommands_[serverAdHocCommandActions_.indexOf(action)];
+	uiEventStream_->send(boost::shared_ptr<UIEvent>(new RequestAdHocUIEvent(command)));
+}
+
+void QtMainWindow::setAvailableAdHocCommands(const std::vector<DiscoItems::Item>& commands) {
+	serverAdHocCommands_ = commands;
+	foreach (QAction* action, serverAdHocCommandActions_) {
+		delete action;
+	}
+	serverAdHocMenu_->clear();
+	serverAdHocCommandActions_.clear();
+	foreach (DiscoItems::Item command, commands) {
+		QAction* action = new QAction(P2QSTRING(command.getName()), this);
+		connect(action, SIGNAL(triggered(bool)), this, SLOT(handleAdHocActionTriggered(bool)));
+		serverAdHocMenu_->addAction(action);
+		serverAdHocCommandActions_.append(action);
+	}
+	if (serverAdHocCommandActions_.isEmpty()) {
+		QAction* action = new QAction("No available commands", this);
+		action->setEnabled(false);
+		serverAdHocMenu_->addAction(action);
+		serverAdHocCommandActions_.append(action);
+	}
+}
 
 }
 
diff --git a/Swift/QtUI/QtMainWindow.h b/Swift/QtUI/QtMainWindow.h
index 3462bb0..e20d773 100644
--- a/Swift/QtUI/QtMainWindow.h
+++ b/Swift/QtUI/QtMainWindow.h
@@ -8,6 +8,7 @@
 
 #include <QWidget>
 #include <QMenu>
+#include <QList>
 #include "Swift/Controllers/UIInterfaces/MainWindow.h"
 #include "Swift/QtUI/QtRosterHeader.h"
 #include "Swift/QtUI/EventViewer/QtEventWindow.h"
@@ -20,7 +21,7 @@ class QLineEdit;
 class QPushButton;
 class QToolBar;
 class QAction;
-
+class QMenu;
 class QTabWidget;
 
 namespace Swift {
@@ -46,6 +47,7 @@ namespace Swift {
 			QtEventWindow* getEventWindow();
 			QtChatListWindow* getChatListWindow();
 			void setRosterModel(Roster* roster);
+			void setAvailableAdHocCommands(const std::vector<DiscoItems::Item>& commands);
 		private slots:
 			void handleStatusChanged(StatusShow::Type showType, const QString &statusMessage);
 			void handleUIEvent(boost::shared_ptr<UIEvent> event);
@@ -55,6 +57,7 @@ namespace Swift {
 			void handleEditProfileAction();
 			void handleAddUserActionTriggered(bool checked);
 			void handleChatUserActionTriggered(bool checked);
+			void handleAdHocActionTriggered(bool checked);
 			void handleEventCountUpdated(int count);
 			void handleEditProfileRequest();
 
@@ -66,6 +69,7 @@ namespace Swift {
 			QAction* editUserAction_;
 			QAction* chatUserAction_;
 			QAction* showOfflineAction_;
+			QMenu* serverAdHocMenu_;
 			QtTabWidget* tabs_;
 			QWidget* contactsTabWidget_;
 			QWidget* eventsTabWidget_;
@@ -73,5 +77,7 @@ namespace Swift {
 			QtChatListWindow* chatListWindow_;
 			UIEventStream* uiEventStream_;
 			bool lastOfflineState_;
+			std::vector<DiscoItems::Item> serverAdHocCommands_;
+			QList<QAction*> serverAdHocCommandActions_;
 	};
 }
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index d4c306f..d7a1f78 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -18,13 +18,11 @@
 #include "QtUIFactory.h"
 #include "QtChatWindowFactory.h"
 #include <Swiften/Base/Log.h>
-#include <Swift/Controllers/CertificateFileStorageFactory.h>
+#include <Swift/Controllers/Storages/CertificateFileStorageFactory.h>
+#include "Swift/Controllers/Storages/FileStoragesFactory.h"
 #include "SwifTools/Application/PlatformApplicationPathProvider.h"
-#include "Swiften/Avatars/AvatarFileStorage.h"
-#include "Swiften/Disco/CapsFileStorage.h"
 #include <string>
 #include "Swiften/Base/Platform.h"
-#include "Swift/Controllers/FileStoragesFactory.h"
 #include "Swiften/Elements/Presence.h"
 #include "Swiften/Client/Client.h"
 #include "Swift/Controllers/MainController.h"
@@ -32,20 +30,30 @@
 #include "Swift/Controllers/BuildVersion.h"
 #include "SwifTools/AutoUpdater/AutoUpdater.h"
 #include "SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.h"
+
 #if defined(SWIFTEN_PLATFORM_WINDOWS)
 #include "WindowsNotifier.h"
-#endif
-#if defined(HAVE_GROWL)
+#elif defined(HAVE_GROWL)
 #include "SwifTools/Notifier/GrowlNotifier.h"
 #elif defined(SWIFTEN_PLATFORM_LINUX)
 #include "FreeDesktopNotifier.h"
 #else
 #include "SwifTools/Notifier/NullNotifier.h"
 #endif
+
 #if defined(SWIFTEN_PLATFORM_MACOSX)
 #include "SwifTools/Dock/MacOSXDock.h"
-#endif
+#else
 #include "SwifTools/Dock/NullDock.h"
+#endif
+
+#if defined(SWIFTEN_PLATFORM_MACOSX)
+#include "QtURIHandler.h"
+#elif defined(SWIFTEN_PLATFORM_WIN32)
+#include <SwifTools/URIHandler/NullURIHandler.h>
+#else
+#include "QtDBUSURIHandler.h"
+#endif
 
 namespace Swift{
 
@@ -123,6 +131,14 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
 	dock_ = new NullDock();
 #endif
 
+#if defined(SWIFTEN_PLATFORM_MACOSX)
+	uriHandler_ = new QtURIHandler();
+#elif defined(SWIFTEN_PLATFORM_WIN32)
+	uriHandler_ = new NullURIHandler();
+#else
+	uriHandler_ = new QtDBUSURIHandler();
+#endif
+
 	if (splitter_) {
 		splitter_->show();
 	}
@@ -145,6 +161,7 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
 				certificateStorageFactory_,
 				dock_,
 				notifier_,
+				uriHandler_,
 				options.count("latency-debug") > 0);
 		mainControllers_.push_back(mainController);
 	}
@@ -172,6 +189,7 @@ QtSwift::~QtSwift() {
 	}
 	delete tabs_;
 	delete splitter_;
+	delete uriHandler_;
 	delete dock_;
 	delete soundPlayer_;
 	delete chatWindowFactory_;
diff --git a/Swift/QtUI/QtSwift.h b/Swift/QtUI/QtSwift.h
index 978fa14..4bf5c97 100644
--- a/Swift/QtUI/QtSwift.h
+++ b/Swift/QtUI/QtSwift.h
@@ -44,6 +44,7 @@ namespace Swift {
 	class QtMUCSearchWindowFactory;
 	class QtUserSearchWindowFactory;
 	class EventLoop;
+	class URIHandler;
 		
 	class QtSwift : public QObject {
 		Q_OBJECT
@@ -63,6 +64,7 @@ namespace Swift {
 			QSplitter* splitter_;
 			QtSoundPlayer* soundPlayer_;
 			Dock* dock_;
+			URIHandler* uriHandler_;
 			QtChatTabs* tabs_;
 			ApplicationPathProvider* applicationPathProvider_;
 			StoragesFactory* storagesFactory_;
diff --git a/Swift/QtUI/QtUIFactory.cpp b/Swift/QtUI/QtUIFactory.cpp
index 35fbfcd..5c1f78d 100644
--- a/Swift/QtUI/QtUIFactory.cpp
+++ b/Swift/QtUI/QtUIFactory.cpp
@@ -23,6 +23,7 @@
 #include "UserSearch/QtUserSearchWindow.h"
 #include "QtProfileWindow.h"
 #include "QtContactEditWindow.h"
+#include "QtAdHocCommandWindow.h"
 
 namespace Swift {
 
@@ -99,5 +100,8 @@ ContactEditWindow* QtUIFactory::createContactEditWindow() {
 	return new QtContactEditWindow();
 }
 
+void QtUIFactory::createAdHocCommandWindow(boost::shared_ptr<OutgoingAdHocCommandSession> command) {
+	new QtAdHocCommandWindow(command);
+}
 
 }
diff --git a/Swift/QtUI/QtUIFactory.h b/Swift/QtUI/QtUIFactory.h
index ddaaf6e..9ef228a 100644
--- a/Swift/QtUI/QtUIFactory.h
+++ b/Swift/QtUI/QtUIFactory.h
@@ -37,6 +37,7 @@ namespace Swift {
 			virtual JoinMUCWindow* createJoinMUCWindow();
 			virtual ProfileWindow* createProfileWindow();
 			virtual ContactEditWindow* createContactEditWindow();
+			virtual void createAdHocCommandWindow(boost::shared_ptr<OutgoingAdHocCommandSession> command);
 
 		private slots:
 			void handleLoginWindowGeometryChanged();
diff --git a/Swift/QtUI/QtURIHandler.cpp b/Swift/QtUI/QtURIHandler.cpp
new file mode 100644
index 0000000..43f3ed1
--- /dev/null
+++ b/Swift/QtUI/QtURIHandler.cpp
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2011 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include "QtURIHandler.h"
+
+#include <QCoreApplication>
+#include <QFileOpenEvent>
+#include <QUrl>
+
+#include "QtSwiftUtil.h"
+#ifdef Q_WS_MAC
+#include <SwifTools/URIHandler/MacOSXURIHandlerHelpers.h>
+#endif
+
+using namespace Swift;
+
+QtURIHandler::QtURIHandler() {
+	qApp->installEventFilter(this);
+#ifdef Q_WS_MAC
+	registerAppAsDefaultXMPPURIHandler();
+#endif
+}
+
+bool QtURIHandler::eventFilter(QObject*, QEvent* event) {
+	if (event->type() == QEvent::FileOpen) {
+		QFileOpenEvent* fileOpenEvent = static_cast<QFileOpenEvent*>(event);
+		if (fileOpenEvent->url().scheme() == "xmpp") {
+			onURI(Q2PSTRING(fileOpenEvent->url().toString()));
+			return true;
+		}
+	}
+	return false;
+}
diff --git a/Swift/QtUI/QtURIHandler.h b/Swift/QtUI/QtURIHandler.h
new file mode 100644
index 0000000..a02114a
--- /dev/null
+++ b/Swift/QtUI/QtURIHandler.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2011 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <QObject>
+#include <SwifTools/URIHandler/URIHandler.h>
+
+class QUrl;
+
+namespace Swift {
+	class QtURIHandler : public QObject, public URIHandler {
+		public:
+			QtURIHandler();
+
+		private:
+			bool eventFilter(QObject* obj, QEvent* event);
+	};
+}
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 494731c..2f138cd 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -77,6 +77,7 @@ sources = [
     "QtStatusWidget.cpp",
 		"QtScaledAvatarCache.cpp",
     "QtSwift.cpp",
+    "QtURIHandler.cpp",
     "QtChatView.cpp",
     "QtChatTheme.cpp",
     "QtChatTabs.cpp",
@@ -87,6 +88,7 @@ sources = [
     "QtTabWidget.cpp",
     "QtTextEdit.cpp",
     "QtXMLConsoleWidget.cpp",
+    "QtAdHocCommandWindow.cpp",
     "QtUtilities.cpp",
     "QtBookmarkDetailWindow.cpp",
     "QtAddBookmarkWindow.cpp",
@@ -97,6 +99,7 @@ sources = [
     "MessageSnippet.cpp",
     "SystemMessageSnippet.cpp",
     "QtElidingLabel.cpp",
+    "QtFormWidget.cpp",
     "QtLineEdit.cpp",
     "QtJoinMUCWindow.cpp",
     "Roster/RosterModel.cpp",
@@ -136,20 +139,31 @@ sources = [
 myenv["SWIFT_VERSION"] = Version.getBuildVersion(env.Dir("#").abspath, "swift")
 
 if env["PLATFORM"] == "win32" :
-  myenv.RES("../resources/Windows/Swift.rc")
+  res = myenv.RES("../resources/Windows/Swift.rc")
+  # For some reason, SCons isn't picking up the dependency correctly
+	# Adding it explicitly until i figure out why
+  myenv.Depends(res, "../Controllers/BuildVersion.h")
   sources += [
 			"WindowsNotifier.cpp",
 			"../resources/Windows/Swift.res"
 		]
 
 if env["PLATFORM"] == "posix" :
-	sources += ["FreeDesktopNotifier.cpp"]
+	sources += [
+			"FreeDesktopNotifier.cpp",
+			"QtDBUSURIHandler.cpp",
+	]
 
 if env["PLATFORM"] == "darwin" or env["PLATFORM"] == "win32" :
   swiftProgram = myenv.Program("Swift", sources)
 else :
   swiftProgram = myenv.Program("swift", sources)
 
+if env["PLATFORM"] != "darwin" and env["PLATFORM"] != "win32" :
+	openURIProgram = myenv.Program("swift-open-uri", "swift-open-uri.cpp")
+else :
+	openURIProgram = []
+
 myenv.Uic4("MUCSearch/QtMUCSearchWindow.ui")
 myenv.Uic4("UserSearch/QtUserSearchWizard.ui")
 myenv.Uic4("UserSearch/QtUserSearchFirstPage.ui")
@@ -215,12 +229,12 @@ if env["PLATFORM"] == "darwin" :
   if env["HAVE_GROWL"] :
     frameworks.append(env["GROWL_FRAMEWORK"])
   commonResources[""] = commonResources.get("", []) + ["../resources/MacOSX/Swift.icns"]
-  app = myenv.AppBundle("Swift", version = myenv["SWIFT_VERSION"], resources = commonResources, frameworks = frameworks)
+  app = myenv.AppBundle("Swift", version = myenv["SWIFT_VERSION"], resources = commonResources, frameworks = frameworks, handlesXMPPURIs = True)
   if env["DIST"] :
     myenv.Command(["Swift-${SWIFT_VERSION}.dmg"], [app], ["Swift/Packaging/MacOSX/package.sh " + app.path + " Swift/Packaging/MacOSX/Swift.dmg.gz $TARGET $QTDIR"])
     
 if env.get("SWIFT_INSTALLDIR", "") :
-  env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "bin"), swiftProgram)
+  env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "bin"), swiftProgram + openURIProgram)
   env.InstallAs(os.path.join(env["SWIFT_INSTALLDIR"], "share", "pixmaps", "swift.xpm"), "../resources/logo/logo-icon-32.xpm")
   icons_path = os.path.join(env["SWIFT_INSTALLDIR"], "share", "icons", "hicolor")
   env.InstallAs(os.path.join(icons_path, "32x32", "apps", "swift.xpm"), "../resources/logo/logo-icon-32.xpm")
diff --git a/Swift/QtUI/swift-open-uri.cpp b/Swift/QtUI/swift-open-uri.cpp
new file mode 100644
index 0000000..2d5ef19
--- /dev/null
+++ b/Swift/QtUI/swift-open-uri.cpp
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2011 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <QCoreApplication>
+#include <QDBusConnection>
+#include <QDBusMessage>
+#include <iostream>
+
+int main(int argc, char* argv[]) {
+	QCoreApplication app(argc, argv);
+
+	QDBusConnection bus = QDBusConnection::sessionBus();
+	if (!bus.isConnected()) {
+		return -1;
+	}
+	if (argc != 2) {
+		std::cerr << "Usage: " << argv[0] << " uri" << std::endl;
+		return -1;
+	}
+
+	QDBusMessage msg = QDBusMessage::createMethodCall("im.swift.Swift.URIHandler", "/", "im.swift.Swift.URIHandler", "openURI");
+	msg << argv[1];
+
+	bus.call(msg);
+
+	return 0;
+}