10 files changed, 155 insertions, 25 deletions
diff --git a/Swift/QtUI/QtAdHocCommandWithJIDWindow.cpp b/Swift/QtUI/QtAdHocCommandWithJIDWindow.cpp
new file mode 100644
index 0000000..7f33f77
--- /dev/null
+++ b/Swift/QtUI/QtAdHocCommandWithJIDWindow.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2010-2014 Kevin Smith
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <boost/bind.hpp>
+#include <QLabel>
+#include <QPushButton>
+#include <QBoxLayout>
+#include <QDialogButtonBox>
+#include <Swiften/Elements/Command.h>
+#include <Swift/Controllers/UIEvents/UIEventStream.h>
+#include <Swift/Controllers/UIEvents/RequestAdHocWithJIDUIEvent.h>
+#include <Swift/QtUI/QtAdHocCommandWithJIDWindow.h>
+#include <Swift/QtUI/QtFormWidget.h>
+#include <Swift/QtUI/QtSwiftUtil.h>
+
+const int FormLayoutIndex = 1;
+
+namespace Swift {
+QtAdHocCommandWithJIDWindow::QtAdHocCommandWithJIDWindow(UIEventStream* uiEventStream) : uiEventStream_(uiEventStream) {
+	QVBoxLayout* hlayout = new QVBoxLayout(this);
+
+	QLabel* jidLabel = new QLabel("JID:", this);
+	hlayout->addWidget(jidLabel);
+	jid_ = new QLineEdit(this);
+	hlayout->addWidget(jid_);
+
+	QLabel* commandLabel = new QLabel("Command:", this);
+	hlayout->addWidget(commandLabel);
+	node_ = new QLineEdit(this);
+	hlayout->addWidget(node_);
+
+	QDialogButtonBox* buttonBox = new QDialogButtonBox(this);
+	QPushButton* rejectButton = buttonBox->addButton("Cancel", QDialogButtonBox::RejectRole);
+	connect(rejectButton, SIGNAL(clicked()), this, SLOT(handleRejectClick()));
+	QPushButton* acceptButton = buttonBox->addButton("Complete", QDialogButtonBox::AcceptRole);
+	connect(acceptButton, SIGNAL(clicked()), this, SLOT(handleAcceptClick()));
+	hlayout->addWidget(buttonBox);
+
+	setLayout(hlayout);
+	show();
+}
+
+QtAdHocCommandWithJIDWindow::~QtAdHocCommandWithJIDWindow() {
+}
+
+void QtAdHocCommandWithJIDWindow::handleAcceptClick() {
+	const JID jid = JID(Q2PSTRING(jid_->text()));
+	const std::string node = Q2PSTRING(node_->text());
+	boost::shared_ptr<UIEvent> event(new RequestAdHocWithJIDUIEvent(jid, node));
+	uiEventStream_->send(event);
+	accept();
+}
+
+void QtAdHocCommandWithJIDWindow::handleRejectClick() {
+	reject();
+}
+
+}
diff --git a/Swift/QtUI/QtAdHocCommandWithJIDWindow.h b/Swift/QtUI/QtAdHocCommandWithJIDWindow.h
new file mode 100644
index 0000000..b168827
--- /dev/null
+++ b/Swift/QtUI/QtAdHocCommandWithJIDWindow.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2010-2012 Kevin Smith
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <QDialog>
+#include <QLineEdit>
+
+#include <Swiften/AdHoc/OutgoingAdHocCommandSession.h>
+
+class QBoxLayout;
+
+namespace Swift {
+	class UIEventStream;
+	class QtFormWidget;
+	class QtAdHocCommandWithJIDWindow : public QDialog {
+		Q_OBJECT
+		public:
+			QtAdHocCommandWithJIDWindow(UIEventStream* eventStream);
+			virtual ~QtAdHocCommandWithJIDWindow();
+		public slots:
+			void handleAcceptClick();
+			void handleRejectClick();
+		private:
+			UIEventStream* uiEventStream_;
+			QLineEdit* jid_;
+			QLineEdit* node_;
+	};
+}
diff --git a/Swift/QtUI/QtFormWidget.cpp b/Swift/QtUI/QtFormWidget.cpp
index 874c8a1..b4840e9 100644
--- a/Swift/QtUI/QtFormWidget.cpp
+++ b/Swift/QtUI/QtFormWidget.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010-2013 Kevin Smith
+ * Copyright (c) 2010-2014 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>
@@ -31,23 +31,39 @@ QtFormWidget::QtFormWidget(Form::ref form, QWidget* parent) : QWidget(parent), f
 	}
 	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);
+	const std::vector<Form::FormItem> items = form->getItems();
+	if (items.empty()) { /* single item forms */
+		foreach (FormField::ref field, form->getFields()) {
+			QWidget* widget = createWidget(field, field->getType(), 0);
+			if (widget) {
+				layout->addWidget(new QLabel(field->getLabel().c_str(), this), row, 0);
+				layout->addWidget(widget, row++, 1);
+			}
+		}
+	} else { /* multi-item forms */
+		const Form::FormItem& headers = form->getFields();
+		for (size_t i = 0; i < items.size(); ++i) {
+			const Form::FormItem& item = items[i];
+			assert(item.size() == headers.size());
+			for (size_t j = 0; j < item.size(); ++j) {
+				QWidget* widget = createWidget(item[j], headers[j]->getType(), i);
+				if (widget) {
+					layout->addWidget(new QLabel(item[j]->getLabel().c_str(), this), row, 0);
+					layout->addWidget(widget, row++, 1);
+				}
+			}
 		}
 	}
 	scrollArea->setWidget(scroll);
 	scrollArea->setWidgetResizable(true);
 	setEditable(form->getType() != Form::CancelType && form->getType() != Form::ResultType);
 }
 
 QtFormWidget::~QtFormWidget() {
 
@@ -77,62 +93,67 @@ QListWidget* QtFormWidget::createList(FormField::ref field) {
 		}
 	}
 	for (int i = 0; i < listWidget->count(); i++) {
 		QListWidgetItem* item = listWidget->item(i);
 		item->setSelected(selected[i]);
 	}
 	return listWidget;
 }
 
-QWidget* QtFormWidget::createWidget(FormField::ref field) {
+QWidget* QtFormWidget::createWidget(FormField::ref field, const FormField::Type type, const size_t index) {
 	QWidget* widget = NULL;
-	if (field->getType() == FormField::BooleanType) {
+	if (type == FormField::BooleanType) {
 		QCheckBox* checkWidget = new QCheckBox(this);
 		checkWidget->setCheckState(field->getBoolValue() ? Qt::Checked : Qt::Unchecked);
 		widget = checkWidget;
 	}
-	if (field->getType() == FormField::FixedType) {
+	if (type == FormField::FixedType) {
 		QString value = field->getFixedValue().c_str();
 		widget = new QLabel(value, this);
 	}
-	if (field->getType() == FormField::ListSingleType) {
+	if (type == FormField::ListSingleType) {
 		widget = createList(field);
 	}
-	if (field->getType() == FormField::TextMultiType) {
+	if (type == FormField::TextMultiType) {
 		QString value = field->getTextMultiValue().c_str();
 		QTextEdit* textWidget = new QTextEdit(this);
 		textWidget->setPlainText(value);
 		widget = textWidget;
 	}
-	if (field->getType() == FormField::TextPrivateType) {
+	if (type == FormField::TextPrivateType) {
 		QString value = field->getTextPrivateValue().c_str();
 		QLineEdit* lineWidget = new QLineEdit(value, this);
 		lineWidget->setEchoMode(QLineEdit::Password);
 		widget = lineWidget;
 	}
-	if (field->getType() == FormField::TextSingleType) {
+	if (type == FormField::TextSingleType) {
 		QString value = field->getTextSingleValue().c_str();
 		widget = new QLineEdit(value, this);
 	}
-	if (field->getType() == FormField::JIDSingleType) {
+	if (type == FormField::JIDSingleType) {
 		QString value = field->getJIDSingleValue().toString().c_str();
 		widget = new QLineEdit(value, this);
 	}
-	if (field->getType() == FormField::JIDMultiType) {
+	if (type == FormField::JIDMultiType) {
 		QString text = boost::join(field->getValues(), "\n").c_str();
 		QTextEdit* textWidget = new QTextEdit(this);
 		textWidget->setPlainText(text);
 		widget = textWidget;
 	}
-	if (field->getType() == FormField::ListMultiType) {
+	if (type == FormField::ListMultiType) {
 		widget = createList(field);
 	}
-	fields_[field->getName()] = widget;
+	std::string indexString;
+	if (index) {
+		/* for multi-item forms we need to distinguish between the different rows */
+		indexString = boost::lexical_cast<std::string>(index);
+	}
+	fields_[field->getName() + indexString] = 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::make_shared<FormField>(field->getType());
 		if (field->getType() == FormField::BooleanType) {
 			resultField->setBoolValue(qobject_cast<QCheckBox*>(fields_[field->getName()])->checkState() == Qt::Checked);
diff --git a/Swift/QtUI/QtFormWidget.h b/Swift/QtUI/QtFormWidget.h
index c7aae73..f58ff4b 100644
--- a/Swift/QtUI/QtFormWidget.h
+++ b/Swift/QtUI/QtFormWidget.h
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2011 Kevin Smith
+ * Copyright (c) 2011-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #pragma once
 
 #include <QWidget>
 
 #include <map>
@@ -17,18 +17,18 @@ namespace Swift {
 
 class QtFormWidget : public QWidget {
 	Q_OBJECT
 	public:
 		QtFormWidget(Form::ref form, QWidget* parent = NULL);
 		virtual ~QtFormWidget();
 		Form::ref getCompletedForm();
 		void setEditable(bool editable);
 	private:
-		QWidget* createWidget(FormField::ref field);
+		QWidget* createWidget(FormField::ref field, const FormField::Type type, const size_t index);
 		QListWidget* createList(FormField::ref field);
 		template<class T> void setEnabled(QWidget* rawWidget, bool editable);
 		template<class T> void setEditable(QWidget* rawWidget, bool editable);
 		std::map<std::string, QWidget*> fields_;
 		Form::ref form_;
 };
 
 }
diff --git a/Swift/QtUI/QtMainWindow.cpp b/Swift/QtUI/QtMainWindow.cpp
index 31a8234..1db8c77 100644
--- a/Swift/QtUI/QtMainWindow.cpp
+++ b/Swift/QtUI/QtMainWindow.cpp
@@ -34,29 +34,30 @@
 #include <Swift/Controllers/SettingConstants.h>
 
 #include <Swift/QtUI/Roster/QtFilterWidget.h>
 #include <Swift/QtUI/QtSwiftUtil.h>
 #include <Swift/QtUI/QtTabWidget.h>
 #include <Swift/QtUI/QtSettingsProvider.h>
 #include <Swift/QtUI/QtLoginWindow.h>
 #include <Swift/QtUI/Roster/QtRosterWidget.h>
 #include <Swift/QtUI/QtUISettingConstants.h>
+#include <Swift/QtUI/QtAdHocCommandWithJIDWindow.h>
 #if defined(SWIFTEN_PLATFORM_MACOSX)
 #include <Swift/QtUI/CocoaUIHelpers.h>
 #elif defined(SWIFTEN_PLATFORM_WINDOWS)
 #include <Swift/QtUI/WinUIHelpers.h>
 #else
 #include <Swift/QtUI/QtCertificateViewerDialog.h>
 #endif
 
 namespace Swift {
 
-QtMainWindow::QtMainWindow(SettingsProvider* settings, UIEventStream* uiEventStream, QtLoginWindow::QtMenus loginMenus, StatusCache* statusCache, bool emoticonsExist) : QWidget(), MainWindow(false), loginMenus_(loginMenus) {
+QtMainWindow::QtMainWindow(SettingsProvider* settings, UIEventStream* uiEventStream, QtLoginWindow::QtMenus loginMenus, StatusCache* statusCache, bool emoticonsExist, bool enableAdHocCommandOnJID) : QWidget(), MainWindow(false), loginMenus_(loginMenus) {
 	uiEventStream_ = uiEventStream;
 	settings_ = settings;
 	setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
 	QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
 	mainLayout->setContentsMargins(0,0,0,0);
 	mainLayout->setSpacing(0);
 	meView_ = new QtRosterHeader(settings, statusCache, this);
 	mainLayout->addWidget(meView_);
 	connect(meView_, SIGNAL(onChangeStatusRequest(StatusShow::Type, const QString&)), this, SLOT(handleStatusChanged(StatusShow::Type, const QString&)));
@@ -169,18 +170,23 @@ QtMainWindow::QtMainWindow(SettingsProvider* settings, UIEventStream* uiEventStr
 	editUserAction_ = new QAction(tr("&Edit Selected Contact…"), this);
 	connect(editUserAction_, SIGNAL(triggered(bool)), treeWidget_, SLOT(handleEditUserActionTriggered(bool)));
 	actionsMenu->addAction(editUserAction_);
 	editUserAction_->setEnabled(false);
 	chatUserAction_ = new QAction(tr("Start &Chat…"), this);
 	chatUserAction_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_N));
 	chatUserAction_->setShortcutContext(Qt::ApplicationShortcut);
 	connect(chatUserAction_, SIGNAL(triggered(bool)), this, SLOT(handleChatUserActionTriggered(bool)));
 	actionsMenu->addAction(chatUserAction_);
+	if (enableAdHocCommandOnJID) {
+		otherAdHocAction_ = new QAction(tr("Run Other Command"), this);
+		connect(otherAdHocAction_, SIGNAL(triggered()), this, SLOT(handleOtherAdHocActionTriggered()));
+		actionsMenu->addAction(otherAdHocAction_);
+	}
 	serverAdHocMenu_ = new QMenu(tr("Run Server Command"), this);
 	actionsMenu->addMenu(serverAdHocMenu_);
 	actionsMenu->addSeparator();
 	QAction* signOutAction = new QAction(tr("&Sign Out"), this);
 	connect(signOutAction, SIGNAL(triggered()), SLOT(handleSignOutAction()));
 	actionsMenu->addAction(signOutAction);
 
 	toggleRequestDeliveryReceipts_ = new QAction(tr("&Request Delivery Receipts"), this);
 	toggleRequestDeliveryReceipts_->setCheckable(true);
@@ -263,18 +269,22 @@ void QtMainWindow::handleAddUserActionTriggered(bool /*checked*/) {
 	boost::shared_ptr<UIEvent> event(new RequestAddUserDialogUIEvent());
 	uiEventStream_->send(event);
 }
 
 void QtMainWindow::handleChatUserActionTriggered(bool /*checked*/) {
 	boost::shared_ptr<UIEvent> event(new RequestChatWithUserDialogUIEvent());
 	uiEventStream_->send(event);
 }
 
+void QtMainWindow::handleOtherAdHocActionTriggered() {
+	new QtAdHocCommandWithJIDWindow(uiEventStream_);
+}
+
 void QtMainWindow::handleSignOutAction() {
 	loginMenus_.generalMenu->removeAction(toggleRequestDeliveryReceipts_);
 	onSignOutRequest();
 }
 
 void QtMainWindow::handleEditProfileAction() {
 	uiEventStream_->send(boost::make_shared<RequestProfileEditorUIEvent>());
 }
 
diff --git a/Swift/QtUI/QtMainWindow.h b/Swift/QtUI/QtMainWindow.h
index f1f6900..84fab15 100644
--- a/Swift/QtUI/QtMainWindow.h
+++ b/Swift/QtUI/QtMainWindow.h
@@ -33,19 +33,19 @@ namespace Swift {
 	class UIEventStream;
 	class QtTabWidget;
 	class SettingsProvider;
 	class QtUIPreferences;
 	class StatusCache;
 
 	class QtMainWindow : public QWidget, public MainWindow {
 		Q_OBJECT
 		public:
-			QtMainWindow(SettingsProvider*, UIEventStream* eventStream, QtLoginWindow::QtMenus loginMenus, StatusCache* statusCache, bool emoticonsExist);
+			QtMainWindow(SettingsProvider*, UIEventStream* eventStream, QtLoginWindow::QtMenus loginMenus, StatusCache* statusCache, bool emoticonsExist, bool enableAdHocCommandOnJID);
 			virtual ~QtMainWindow();
 			std::vector<QMenu*> getMenus() {return menus_;}
 			void setMyNick(const std::string& name);
 			void setMyJID(const JID& jid);
 			void setMyAvatarPath(const std::string& path);
 			void setMyStatusText(const std::string& status);
 			void setMyStatusType(StatusShow::Type type);
 			void setMyContactRosterItem(boost::shared_ptr<ContactRosterItem> contact);
 			void setConnecting();
@@ -63,36 +63,38 @@ namespace Swift {
 			void handleCompactRosterToggled(bool);
 			void handleShowOfflineToggled(bool);
 			void handleShowEmoticonsToggled(bool);
 			void handleJoinMUCAction();
 			void handleViewLogsAction();
 			void handleSignOutAction();
 			void handleEditProfileAction();
 			void handleAddUserActionTriggered(bool checked);
 			void handleChatUserActionTriggered(bool checked);
+			void handleOtherAdHocActionTriggered();
 			void handleAdHocActionTriggered(bool checked);
 			void handleEventCountUpdated(int count);
 			void handleChatCountUpdated(int count);
 			void handleEditProfileRequest();
 			void handleTabChanged(int index);
 			void handleToggleRequestDeliveryReceipts(bool enabled);
 			void handleShowCertificateInfo();
 			void handleEditBlockingList();
 
 		private:
 			SettingsProvider* settings_;
 			QtLoginWindow::QtMenus loginMenus_;
 			std::vector<QMenu*> menus_;
 			QtRosterWidget* treeWidget_;
 			QtRosterHeader* meView_;
 			QAction* addUserAction_;
 			QAction* editUserAction_;
 			QAction* chatUserAction_;
+			QAction* otherAdHocAction_;
 			QAction* showOfflineAction_;
 			QAction* compactRosterAction_;
 			QAction* showEmoticonsAction_;
 			QAction* openBlockingListEditor_;
 			QAction* toggleRequestDeliveryReceipts_;
 			QMenu* serverAdHocMenu_;
 			QtTabWidget* tabs_;
 			QComboBox* tabBarCombo_;
 			QWidget* contactsTabWidget_;
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index 183f64d..d2224ba 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -83,18 +83,19 @@ po::options_description QtSwift::getOptionsDescription() {
 	result.add_options()
 		("debug", "Turn on debug logging")
 		("help", "Show this help message")
 		("version", "Show version information")
 		("netbook-mode", "Use netbook mode display (unsupported)")
 		("no-tabs", "Don't manage chat windows in tabs (unsupported)")
 		("latency-debug", "Use latency debugging (unsupported)")
 		("multi-account", po::value<int>()->default_value(1), "Number of accounts to open windows for (unsupported)")
 		("start-minimized", "Don't show the login/roster window at startup")
+		("enable-jid-adhocs", "Enable AdHoc commands to custom JID's.")
 #if QT_VERSION >= 0x040800
 		("language", po::value<std::string>(), "Use a specific language, instead of the system-wide one")
 #endif
 		;
 	return result;
 }
 
 XMLSettingsProvider* QtSwift::loadSettingsFile(const QString& fileName) {
 	QFile configFile(fileName);
@@ -156,18 +157,19 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
 	} catch (...) {
 		/* This seems to fail on a Mac when the .app is launched directly (the usual path).*/
 		numberOfAccounts = 1;
 	}
 
 	if (options.count("debug")) {
 		Log::setLogLevel(Swift::Log::debug);
 	}
 
+	bool enableAdHocCommandOnJID = options.count("enable-jid-adhocs") > 0;
 	tabs_ = options.count("no-tabs") && !splitter_ ? NULL : new QtChatTabs(splitter_ != NULL);
 	bool startMinimized = options.count("start-minimized") > 0;
 	applicationPathProvider_ = new PlatformApplicationPathProvider(SWIFT_APPLICATION_NAME);
 	storagesFactory_ = new FileStoragesFactory(applicationPathProvider_->getDataDir(), networkFactories_.getCryptoProvider());
 	certificateStorageFactory_ = new CertificateFileStorageFactory(applicationPathProvider_->getDataDir(), tlsFactories_.getCertificateFactory(), networkFactories_.getCryptoProvider());
 	chatWindowFactory_ = new QtChatWindowFactory(splitter_, settingsHierachy_, qtSettings_, tabs_, "");
 	soundPlayer_ = new QtSoundPlayer(applicationPathProvider_);
 
 	// Ugly, because the dock depends on the tray, but the temporary
@@ -204,19 +206,19 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
 	if (splitter_) {
 		splitter_->show();
 	}
 
 	for (int i = 0; i < numberOfAccounts; i++) {
 		if (i > 0) {
 			// Don't add the first tray (see note above)
 			systemTrays_.push_back(new QtSystemTray());
 		}
-		QtUIFactory* uiFactory = new QtUIFactory(settingsHierachy_, qtSettings_, tabs_, splitter_, systemTrays_[i], chatWindowFactory_, networkFactories_.getTimerFactory(), statusCache_, startMinimized, !emoticons.empty());
+		QtUIFactory* uiFactory = new QtUIFactory(settingsHierachy_, qtSettings_, tabs_, splitter_, systemTrays_[i], chatWindowFactory_, networkFactories_.getTimerFactory(), statusCache_, startMinimized, !emoticons.empty(), enableAdHocCommandOnJID);
 		uiFactories_.push_back(uiFactory);
 		MainController* mainController = new MainController(
 				&clientMainThreadCaller_,
 				&networkFactories_,
 				uiFactory,
 				settingsHierachy_,
 				systemTrays_[i],
 				soundPlayer_,
 				storagesFactory_,
diff --git a/Swift/QtUI/QtUIFactory.cpp b/Swift/QtUI/QtUIFactory.cpp
index afd2a9e..701170c 100644
--- a/Swift/QtUI/QtUIFactory.cpp
+++ b/Swift/QtUI/QtUIFactory.cpp
@@ -30,19 +30,19 @@
 #include <Swift/Controllers/Settings/SettingsProviderHierachy.h>
 #include <Swift/QtUI/QtUISettingConstants.h>
 #include <Swift/QtUI/QtHistoryWindow.h>
 #include <Swiften/Whiteboard/WhiteboardSession.h>
 #include <Swift/QtUI/QtSingleWindow.h>
 #include <Swift/QtUI/QtBlockListEditorWindow.h>
 
 namespace Swift {
 
-QtUIFactory::QtUIFactory(SettingsProviderHierachy* settings, QtSettingsProvider* qtOnlySettings, QtChatTabs* tabs, QtSingleWindow* netbookSplitter, QtSystemTray* systemTray, QtChatWindowFactory* chatWindowFactory, TimerFactory* timerFactory, StatusCache* statusCache, bool startMinimized, bool emoticonsExist) : settings(settings), qtOnlySettings(qtOnlySettings), tabs(tabs), netbookSplitter(netbookSplitter), systemTray(systemTray), chatWindowFactory(chatWindowFactory), timerFactory_(timerFactory), lastMainWindow(NULL), loginWindow(NULL), statusCache(statusCache), startMinimized(startMinimized), emoticonsExist_(emoticonsExist) {
+QtUIFactory::QtUIFactory(SettingsProviderHierachy* settings, QtSettingsProvider* qtOnlySettings, QtChatTabs* tabs, QtSingleWindow* netbookSplitter, QtSystemTray* systemTray, QtChatWindowFactory* chatWindowFactory, TimerFactory* timerFactory, StatusCache* statusCache, bool startMinimized, bool emoticonsExist, bool enableAdHocCommandOnJID) : settings(settings), qtOnlySettings(qtOnlySettings), tabs(tabs), netbookSplitter(netbookSplitter), systemTray(systemTray), chatWindowFactory(chatWindowFactory), timerFactory_(timerFactory), lastMainWindow(NULL), loginWindow(NULL), statusCache(statusCache), startMinimized(startMinimized), emoticonsExist_(emoticonsExist), enableAdHocCommandOnJID_(enableAdHocCommandOnJID) {
 	chatFontSize = settings->getSetting(QtUISettingConstants::CHATWINDOW_FONT_SIZE);
 	historyFontSize_ = settings->getSetting(QtUISettingConstants::HISTORYWINDOW_FONT_SIZE);
 }
 
 XMLConsoleWidget* QtUIFactory::createXMLConsoleWidget() {
 	QtXMLConsoleWidget* widget = new QtXMLConsoleWidget();
 	tabs->addTab(widget);
 	if (!tabs->isVisible()) {
 		tabs->show();
@@ -75,19 +75,19 @@ FileTransferListWidget* QtUIFactory::createFileTransferListWidget() {
 	tabs->addTab(widget);
 	if (!tabs->isVisible()) {
 		tabs->show();
 	}
 	widget->show();
 	return widget;
 }
 
 MainWindow* QtUIFactory::createMainWindow(UIEventStream* eventStream) {
-	lastMainWindow  = new QtMainWindow(settings, eventStream, loginWindow->getMenus(), statusCache, emoticonsExist_);
+	lastMainWindow  = new QtMainWindow(settings, eventStream, loginWindow->getMenus(), statusCache, emoticonsExist_, enableAdHocCommandOnJID_);
 	return lastMainWindow;
 }
 
 LoginWindow* QtUIFactory::createLoginWindow(UIEventStream* eventStream) {
 	loginWindow = new QtLoginWindow(eventStream, settings, timerFactory_);
 	if (netbookSplitter) {
 		netbookSplitter->insertAtFront(loginWindow);
 	}
 	connect(systemTray, SIGNAL(clicked()), loginWindow, SLOT(toggleBringToFront()));
diff --git a/Swift/QtUI/QtUIFactory.h b/Swift/QtUI/QtUIFactory.h
index 721aa76..4c50572 100644
--- a/Swift/QtUI/QtUIFactory.h
+++ b/Swift/QtUI/QtUIFactory.h
@@ -26,19 +26,19 @@ namespace Swift {
 	class TimerFactory;
 	class historyWindow_;
 	class WhiteboardSession;
 	class StatusCache;
 	class QtSingleWindow;
 
 	class QtUIFactory : public QObject, public UIFactory {
 			Q_OBJECT
 		public:
-			QtUIFactory(SettingsProviderHierachy* settings, QtSettingsProvider* qtOnlySettings, QtChatTabs* tabs, QtSingleWindow* netbookSplitter, QtSystemTray* systemTray, QtChatWindowFactory* chatWindowFactory, TimerFactory* timerFactory, StatusCache* statusCache, bool startMinimized, bool emoticonsExist);
+			QtUIFactory(SettingsProviderHierachy* settings, QtSettingsProvider* qtOnlySettings, QtChatTabs* tabs, QtSingleWindow* netbookSplitter, QtSystemTray* systemTray, QtChatWindowFactory* chatWindowFactory, TimerFactory* timerFactory, StatusCache* statusCache, bool startMinimized, bool emoticonsExist, bool enableAdHocCommandOnJID);
 
 			virtual XMLConsoleWidget* createXMLConsoleWidget();
 			virtual HistoryWindow* createHistoryWindow(UIEventStream*);
 			virtual MainWindow* createMainWindow(UIEventStream* eventStream);
 			virtual LoginWindow* createLoginWindow(UIEventStream* eventStream);
 			virtual EventWindow* createEventWindow();
 			virtual ChatListWindow* createChatListWindow(UIEventStream*);
 			virtual MUCSearchWindow* createMUCSearchWindow();
 			virtual ChatWindow* createChatWindow(const JID &contact, UIEventStream* eventStream);
@@ -67,11 +67,12 @@ namespace Swift {
 			TimerFactory* timerFactory_;
 			QtMainWindow* lastMainWindow;
 			QtLoginWindow* loginWindow;
 			StatusCache* statusCache;
 			std::vector<QPointer<QtChatWindow> > chatWindows;
 			bool startMinimized;
 			int chatFontSize;
 			int historyFontSize_;
 			bool emoticonsExist_;
+			bool enableAdHocCommandOnJID_;
 	};
 }
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 53dbea9..dd7d0c3 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -113,18 +113,19 @@ sources = [
     "QtCachedImageScaler.cpp",
     "QtTabbable.cpp",
     "QtTabWidget.cpp",
     "QtTextEdit.cpp",
     "QtXMLConsoleWidget.cpp",
     "QtHistoryWindow.cpp",
     "QtFileTransferListWidget.cpp",
     "QtFileTransferListItemModel.cpp",
     "QtAdHocCommandWindow.cpp",
+    "QtAdHocCommandWithJIDWindow.cpp",
     "QtUtilities.cpp",
     "QtBookmarkDetailWindow.cpp",
     "QtAddBookmarkWindow.cpp",
     "QtEditBookmarkWindow.cpp",
     "QtContactEditWindow.cpp",
     "QtContactEditWidget.cpp",
     "QtSingleWindow.cpp",
     "QtHighlightEditorWidget.cpp",
     "QtHighlightRulesItemModel.cpp",