11 files changed, 1066 insertions, 469 deletions
diff --git a/Swift/QtUI/QtHighlightEditor.cpp b/Swift/QtUI/QtHighlightEditor.cpp
new file mode 100644
index 0000000..3900cf9
--- /dev/null
+++ b/Swift/QtUI/QtHighlightEditor.cpp
@@ -0,0 +1,524 @@
+/*
+ * Copyright (c) 2012 Maciej Niedzielski
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+/*
+ * Copyright (c) 2014 Kevin Smith and Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <cassert>
+
+#include <boost/lexical_cast.hpp>
+
+#include <Swift/QtUI/UserSearch/QtSuggestingJIDInput.h>
+#include <Swift/Controllers/HighlightManager.cpp>
+#include <Swift/QtUI/QtHighlightEditor.h>
+#include <Swift/QtUI/QtSwiftUtil.h>
+#include <Swift/QtUI/QtSettingsProvider.h>
+
+#include <QTreeWidgetItem>
+#include <QFileDialog>
+
+namespace Swift {
+
+QtHighlightEditor::QtHighlightEditor(QtSettingsProvider* settings, QWidget* parent)
+	: QWidget(parent), settings_(settings), previousRow_(-1)
+{
+	ui_.setupUi(this);
+
+	connect(ui_.listWidget, SIGNAL(currentRowChanged(int)), SLOT(onCurrentRowChanged(int)));
+
+	connect(ui_.newButton, SIGNAL(clicked()), SLOT(onNewButtonClicked()));
+	connect(ui_.deleteButton, SIGNAL(clicked()), SLOT(onDeleteButtonClicked()));
+
+	connect(ui_.buttonBox->button(QDialogButtonBox::Apply), SIGNAL(clicked()), SLOT(onApplyButtonClick()));
+	connect(ui_.buttonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), SLOT(onCancelButtonClick()));
+	connect(ui_.buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), SLOT(onOkButtonClick()));
+
+	connect(ui_.noColorRadio, SIGNAL(clicked()), SLOT(colorOtherSelect()));
+	connect(ui_.defaultColorRadio, SIGNAL(clicked()), SLOT(colorOtherSelect()));
+	connect(ui_.customColorRadio, SIGNAL(clicked()), SLOT(colorCustomSelect()));
+
+	connect(ui_.noSoundRadio, SIGNAL(clicked()), SLOT(soundOtherSelect()));
+	connect(ui_.defaultSoundRadio, SIGNAL(clicked()), SLOT(soundOtherSelect()));
+	connect(ui_.customSoundRadio, SIGNAL(clicked()), SLOT(soundCustomSelect()));
+
+	/* replace the static line-edit control with the roster autocompleter */
+	ui_.dummySenderName->setVisible(false);
+	jid_ = new QtSuggestingJIDInput(this, settings);
+	ui_.senderName->addWidget(jid_);
+	jid_->onUserSelected.connect(boost::bind(&QtHighlightEditor::handleOnUserSelected, this, _1));
+
+	/* handle autocomplete */
+	connect(jid_, SIGNAL(textEdited(QString)), SLOT(handleContactSuggestionRequested(QString)));
+
+	/* we need to be notified if any of the state changes so that we can update our textual rule description */
+	connect(ui_.chatRadio, SIGNAL(clicked()), SLOT(widgetClick()));
+	connect(ui_.roomRadio, SIGNAL(clicked()), SLOT(widgetClick()));
+	connect(ui_.nickIsKeyword, SIGNAL(clicked()), SLOT(widgetClick()));
+	connect(ui_.allMsgRadio, SIGNAL(clicked()), SLOT(widgetClick()));
+	connect(ui_.senderRadio, SIGNAL(clicked()), SLOT(widgetClick()));
+	connect(jid_, SIGNAL(textChanged(const QString&)), SLOT(widgetClick()));
+	connect(ui_.keywordRadio, SIGNAL(clicked()), SLOT(widgetClick()));
+	connect(ui_.keyword, SIGNAL(textChanged(const QString&)), SLOT(widgetClick()));
+	connect(ui_.matchPartialWords, SIGNAL(clicked()), SLOT(widgetClick()));
+	connect(ui_.matchCase, SIGNAL(clicked()), SLOT(widgetClick()));
+	connect(ui_.noColorRadio, SIGNAL(clicked()), SLOT(widgetClick()));
+	connect(ui_.defaultColorRadio, SIGNAL(clicked()), SLOT(widgetClick()));
+	connect(ui_.customColorRadio, SIGNAL(clicked()), SLOT(widgetClick()));
+	connect(ui_.noSoundRadio, SIGNAL(clicked()), SLOT(widgetClick()));
+	connect(ui_.defaultSoundRadio, SIGNAL(clicked()), SLOT(widgetClick()));
+	connect(ui_.customSoundRadio, SIGNAL(clicked()), SLOT(widgetClick()));
+
+	/* allow selection of a custom sound file */
+	connect(ui_.soundFileButton, SIGNAL(clicked()), SLOT(selectSoundFile()));
+
+	/* if these are not needed, then they should be removed */
+	ui_.moveUpButton->setVisible(false);
+	ui_.moveDownButton->setVisible(false);
+
+	setWindowTitle(tr("Highlight Rules"));
+}
+
+QtHighlightEditor::~QtHighlightEditor()
+{
+}
+
+std::string formatShortDescription(const HighlightRule &rule)
+{
+	const std::string chatOrRoom = (rule.getMatchChat() ? "chat" : "room");
+
+	std::vector<std::string> senders = rule.getSenders();
+	std::vector<std::string> keywords = rule.getKeywords();
+
+	if (senders.empty() && keywords.empty() && !rule.getNickIsKeyword()) {
+		return std::string("All ") + chatOrRoom + " messages.";
+	}
+
+	if (rule.getNickIsKeyword()) {
+		return std::string("All ") + chatOrRoom + " messages that mention my name.";
+	}
+
+	if (!senders.empty()) {
+		return std::string("All ") + chatOrRoom + " messages from " + senders[0] + ".";
+	}
+
+	if (!keywords.empty()) {
+		return std::string("All ") + chatOrRoom + " messages mentioning the keyword '" + keywords[0] + "'.";
+	}
+
+	return "Unknown Rule";
+}
+
+void QtHighlightEditor::show()
+{
+	highlightManager_->loadSettings();
+
+	populateList();
+
+	if (ui_.listWidget->count()) {
+		selectRow(0);
+	}
+
+	/* prepare default states */
+	widgetClick();
+
+	QWidget::show();
+	QWidget::activateWindow();
+}
+
+void QtHighlightEditor::setHighlightManager(HighlightManager* highlightManager)
+{
+	highlightManager_ = highlightManager;
+}
+
+void QtHighlightEditor::setContactSuggestions(const std::vector<Contact::ref>& suggestions)
+{
+	jid_->setSuggestions(suggestions);
+}
+
+void QtHighlightEditor::colorOtherSelect()
+{
+	ui_.foregroundColor->setEnabled(false);
+	ui_.backgroundColor->setEnabled(false);
+}
+
+void QtHighlightEditor::colorCustomSelect()
+{
+	ui_.foregroundColor->setEnabled(true);
+	ui_.backgroundColor->setEnabled(true);
+}
+
+void QtHighlightEditor::soundOtherSelect()
+{
+	ui_.soundFile->setEnabled(false);
+	ui_.soundFileButton->setEnabled(false);
+}
+
+void QtHighlightEditor::soundCustomSelect()
+{
+	ui_.soundFile->setEnabled(true);
+	ui_.soundFileButton->setEnabled(true);
+}
+
+void QtHighlightEditor::onNewButtonClicked()
+{
+	int row = getSelectedRow() + 1;
+	populateList();
+	HighlightRule newRule;
+	newRule.setMatchChat(true);
+	highlightManager_->insertRule(row, newRule);
+	QListWidgetItem *item = new QListWidgetItem();
+	item->setText(P2QSTRING(formatShortDescription(newRule)));
+	ui_.listWidget->insertItem(row, item);
+	selectRow(row);
+}
+
+void QtHighlightEditor::onDeleteButtonClicked()
+{
+	int selectedRow = getSelectedRow();
+	assert(selectedRow>=0 && selectedRow<ui_.listWidget->count());
+	delete ui_.listWidget->takeItem(selectedRow);
+	highlightManager_->removeRule(selectedRow);
+
+	if (!ui_.listWidget->count()) {
+		disableDialog();
+		ui_.deleteButton->setEnabled(false);
+	} else {
+		if (selectedRow == ui_.listWidget->count()) {
+			selectRow(ui_.listWidget->count() - 1);
+		} else {
+			selectRow(selectedRow);
+		}
+	}
+}
+
+void QtHighlightEditor::onCurrentRowChanged(int currentRow)
+{
+	ui_.deleteButton->setEnabled(currentRow != -1);
+	ui_.moveUpButton->setEnabled(currentRow != -1 && currentRow != 0);
+	ui_.moveDownButton->setEnabled(currentRow != -1 && currentRow != (ui_.listWidget->count()-1));
+
+	if (previousRow_ != -1) {
+		if (ui_.listWidget->count() > previousRow_) {
+			highlightManager_->setRule(previousRow_, ruleFromDialog());
+		}
+	}
+
+	if (currentRow != -1) {
+		HighlightRule rule = highlightManager_->getRule(currentRow);
+		ruleToDialog(rule);
+		if (ui_.listWidget->currentItem()) {
+			ui_.listWidget->currentItem()->setText(P2QSTRING(formatShortDescription(rule)));
+		}
+	}
+
+	/* grey the dialog if we have nothing selected */
+	if (currentRow == -1) {
+		disableDialog();
+	}
+
+	previousRow_ = currentRow;
+}
+
+void QtHighlightEditor::onApplyButtonClick()
+{
+	selectRow(getSelectedRow()); /* force save */
+	highlightManager_->storeSettings();
+}
+
+void QtHighlightEditor::onCancelButtonClick()
+{
+	close();
+}
+
+void QtHighlightEditor::onOkButtonClick()
+{
+	onApplyButtonClick();
+	close();
+}
+
+void QtHighlightEditor::setChildWidgetStates()
+{
+	/* disable appropriate radio button child widgets */
+
+	if (ui_.chatRadio->isChecked()) {
+		if (ui_.nickIsKeyword->isChecked()) {
+			/* switch to another choice before we disable this button */
+			ui_.allMsgRadio->setChecked(true);
+		}
+		ui_.nickIsKeyword->setEnabled(false);
+	} else if (ui_.roomRadio->isChecked()) {
+		ui_.nickIsKeyword->setEnabled(true);
+	} else { /* chats and rooms */
+		ui_.nickIsKeyword->setEnabled(true);
+	}
+
+	if (ui_.senderRadio->isChecked()) {
+		jid_->setEnabled(true);
+	} else {
+		jid_->setEnabled(false);
+	}
+
+	if (ui_.keywordRadio->isChecked()) {
+		ui_.keyword->setEnabled(true);
+		ui_.matchPartialWords->setEnabled(true);
+		ui_.matchCase->setEnabled(true);
+	} else {
+		ui_.keyword->setEnabled(false);
+		ui_.matchPartialWords->setEnabled(false);
+		ui_.matchCase->setEnabled(false);
+	}
+
+	if (ui_.chatRadio->isChecked()) {
+		ui_.allMsgRadio->setText(tr("Apply to all chat messages"));
+	} else {
+		ui_.allMsgRadio->setText(tr("Apply to all room messages"));
+	}
+}
+
+void QtHighlightEditor::widgetClick()
+{
+	setChildWidgetStates();
+
+	HighlightRule rule = ruleFromDialog();
+
+	if (ui_.listWidget->currentItem()) {
+		ui_.listWidget->currentItem()->setText(P2QSTRING(formatShortDescription(rule)));
+	}
+}
+
+void QtHighlightEditor::disableDialog()
+{
+	ui_.chatRadio->setEnabled(false);
+	ui_.roomRadio->setEnabled(false);
+	ui_.allMsgRadio->setEnabled(false);
+	ui_.nickIsKeyword->setEnabled(false);
+	ui_.senderRadio->setEnabled(false);
+	ui_.dummySenderName->setEnabled(false);
+	ui_.keywordRadio->setEnabled(false);
+	ui_.keyword->setEnabled(false);
+	ui_.matchPartialWords->setEnabled(false);
+	ui_.matchCase->setEnabled(false);
+	ui_.noColorRadio->setEnabled(false);
+	ui_.defaultColorRadio->setEnabled(false);
+	ui_.customColorRadio->setEnabled(false);
+	ui_.foregroundColor->setEnabled(false);
+	ui_.backgroundColor->setEnabled(false);
+	ui_.noSoundRadio->setEnabled(false);
+	ui_.defaultSoundRadio->setEnabled(false);
+	ui_.customSoundRadio->setEnabled(false);
+	ui_.soundFile->setEnabled(false);
+	ui_.soundFileButton->setEnabled(false);
+}
+
+void QtHighlightEditor::handleContactSuggestionRequested(const QString& text)
+{
+	std::string stdText = Q2PSTRING(text);
+	onContactSuggestionsRequested(stdText);
+}
+
+void QtHighlightEditor::selectSoundFile()
+{
+	QString path = QFileDialog::getOpenFileName(this, tr("Select sound file..."), QString(), "Sounds (*.wav)");
+	ui_.soundFile->setText(path);
+}
+
+void QtHighlightEditor::handleOnUserSelected(const JID& jid) {
+	/* this might seem like it should be standard behaviour for the suggesting input box, but is not desirable in all cases */
+	jid_->setText(P2QSTRING(jid.toString()));
+}
+
+void QtHighlightEditor::populateList()
+{
+	previousRow_ = -1;
+	ui_.listWidget->clear();
+	HighlightRulesListPtr rules = highlightManager_->getRules();
+	for (size_t i = 0; i < rules->getSize(); ++i) {
+		const HighlightRule& rule = rules->getRule(i);
+		QListWidgetItem *item = new QListWidgetItem();
+		item->setText(P2QSTRING(formatShortDescription(rule)));
+		ui_.listWidget->addItem(item);
+	}
+}
+
+void QtHighlightEditor::selectRow(int row)
+{
+	for (int i = 0; i < ui_.listWidget->count(); ++i) {
+		if (i == row) {
+			ui_.listWidget->item(i)->setSelected(true);
+			onCurrentRowChanged(i);
+		} else {
+			ui_.listWidget->item(i)->setSelected(false);
+		}
+	}
+	ui_.listWidget->setCurrentRow(row);
+}
+
+int QtHighlightEditor::getSelectedRow() const
+{
+	for (int i = 0; i < ui_.listWidget->count(); ++i) {
+		if (ui_.listWidget->item(i)->isSelected()) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+HighlightRule QtHighlightEditor::ruleFromDialog()
+{
+	HighlightRule rule;
+
+	if (ui_.chatRadio->isChecked()) {
+		rule.setMatchChat(true);
+		rule.setMatchMUC(false);
+	} else {
+		rule.setMatchChat(false);
+		rule.setMatchMUC(true);
+	}
+
+	if (ui_.senderRadio->isChecked()) {
+		QString senderName = jid_->text();
+		if (!senderName.isEmpty()) {
+			std::vector<std::string> senders;
+			senders.push_back(Q2PSTRING(senderName));
+			rule.setSenders(senders);
+		}
+	}
+
+	if (ui_.keywordRadio->isChecked()) {
+		QString keywordString = ui_.keyword->text();
+		if (!keywordString.isEmpty()) {
+			std::vector<std::string> keywords;
+			keywords.push_back(Q2PSTRING(keywordString));
+			rule.setKeywords(keywords);
+		}
+	}
+
+	rule.setNickIsKeyword(ui_.nickIsKeyword->isChecked());
+	rule.setMatchWholeWords(!ui_.matchPartialWords->isChecked());
+	rule.setMatchCase(ui_.matchCase->isChecked());
+
+	HighlightAction& action = rule.getAction();
+
+	if (ui_.noColorRadio->isChecked()) {
+		action.setHighlightText(false);
+		action.setTextColor("");
+		action.setTextBackground("");
+	} else if (ui_.defaultColorRadio->isChecked()) {
+		action.setHighlightText(true);
+		action.setTextColor("");
+		action.setTextBackground("");
+	} else {
+		action.setHighlightText(true);
+		action.setTextColor(Q2PSTRING(ui_.foregroundColor->getColor().name()));
+		action.setTextBackground(Q2PSTRING(ui_.backgroundColor->getColor().name()));
+	}
+
+	if (ui_.noSoundRadio->isChecked()) {
+		action.setPlaySound(false);
+	} else if (ui_.defaultSoundRadio->isChecked()) {
+		action.setPlaySound(true);
+		action.setSoundFile("");
+	} else {
+		action.setPlaySound(true);
+		action.setSoundFile(Q2PSTRING(ui_.soundFile->text()));
+	}
+
+	return rule;
+}
+
+void QtHighlightEditor::ruleToDialog(const HighlightRule& rule)
+{
+	ui_.chatRadio->setEnabled(true);
+	ui_.roomRadio->setEnabled(true);
+
+	if (rule.getMatchMUC()) {
+		ui_.chatRadio->setChecked(false);
+		ui_.roomRadio->setChecked(true);
+	} else {
+		ui_.chatRadio->setChecked(true);
+		ui_.roomRadio->setChecked(false);
+	}
+
+	ui_.allMsgRadio->setEnabled(true);
+	ui_.allMsgRadio->setChecked(true); /* this is the default radio button */
+	jid_->setText("");
+	ui_.keyword->setText("");
+	ui_.matchPartialWords->setChecked(false);
+	ui_.matchCase->setChecked(false);
+
+	ui_.nickIsKeyword->setEnabled(true);
+	if (rule.getNickIsKeyword()) {
+		ui_.nickIsKeyword->setChecked(true);
+	}
+
+	ui_.senderRadio->setEnabled(true);
+	std::vector<std::string> senders = rule.getSenders();
+	if (!senders.empty()) {
+		ui_.senderRadio->setChecked(true);
+		jid_->setText(P2QSTRING(senders[0]));
+	}
+
+	ui_.keywordRadio->setEnabled(true);
+	std::vector<std::string> keywords = rule.getKeywords();
+	if (!keywords.empty()) {
+		ui_.keywordRadio->setChecked(true);
+		ui_.keyword->setText(P2QSTRING(keywords[0]));
+		ui_.matchPartialWords->setChecked(!rule.getMatchWholeWords());
+		ui_.matchCase->setChecked(rule.getMatchCase());
+	}
+
+	const HighlightAction& action = rule.getAction();
+
+	ui_.noColorRadio->setEnabled(true);
+	ui_.defaultColorRadio->setEnabled(true);
+	ui_.customColorRadio->setEnabled(true);
+	if (action.highlightText()) {
+		if (action.getTextColor().empty() && action.getTextBackground().empty()) {
+			ui_.defaultColorRadio->setChecked(true);
+			ui_.foregroundColor->setEnabled(false);
+			ui_.backgroundColor->setEnabled(false);
+		} else {
+			ui_.foregroundColor->setEnabled(true);
+			ui_.backgroundColor->setEnabled(true);
+			QColor foregroundColor(P2QSTRING(action.getTextColor()));
+			ui_.foregroundColor->setColor(foregroundColor);
+			QColor backgroundColor(P2QSTRING(action.getTextBackground()));
+			ui_.backgroundColor->setColor(backgroundColor);
+			ui_.customColorRadio->setChecked(true);
+		}
+	} else {
+		ui_.noColorRadio->setChecked(true);
+		ui_.foregroundColor->setEnabled(false);
+		ui_.backgroundColor->setEnabled(false);
+	}
+
+	ui_.noSoundRadio->setEnabled(true);
+	ui_.defaultSoundRadio->setEnabled(true);
+	ui_.customSoundRadio->setEnabled(true);
+	ui_.soundFile->setText("");
+	ui_.soundFile->setEnabled(false);
+	ui_.soundFileButton->setEnabled(false);
+	if (action.playSound()) {
+		if (action.getSoundFile().empty()) {
+			ui_.defaultSoundRadio->setChecked(true);
+		} else {
+			ui_.customSoundRadio->setChecked(true);
+			ui_.soundFile->setText(P2QSTRING(action.getSoundFile()));
+			ui_.soundFile->setEnabled(true);
+			ui_.soundFileButton->setEnabled(true);
+		}
+	} else {
+		ui_.noSoundRadio->setChecked(true);
+	}
+
+	/* set radio button child option states */
+	setChildWidgetStates();
+}
+
+}
diff --git a/Swift/QtUI/QtHighlightEditor.h b/Swift/QtUI/QtHighlightEditor.h
new file mode 100644
index 0000000..c7db464
--- /dev/null
+++ b/Swift/QtUI/QtHighlightEditor.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2012 Maciej Niedzielski
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+/*
+ * Copyright (c) 2014 Kevin Smith and Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <Swift/Controllers/HighlightRule.h>
+#include <Swift/Controllers/UIInterfaces/HighlightEditorWindow.h>
+#include <Swift/QtUI/ui_QtHighlightEditor.h>
+
+namespace Swift {
+
+	class QtSettingsProvider;
+	class QtSuggestingJIDInput;
+	class QtWebKitChatView;
+
+	class QtHighlightEditor : public QWidget, public HighlightEditorWindow {
+		Q_OBJECT
+
+		public:
+			QtHighlightEditor(QtSettingsProvider* settings, QWidget* parent = NULL);
+			virtual ~QtHighlightEditor();
+
+			virtual void show();
+			virtual void setHighlightManager(HighlightManager* highlightManager);
+			virtual void setContactSuggestions(const std::vector<Contact::ref>& suggestions);
+
+		private slots:
+			void colorOtherSelect();
+			void colorCustomSelect();
+			void soundOtherSelect();
+			void soundCustomSelect();
+			void onNewButtonClicked();
+			void onDeleteButtonClicked();
+			void onCurrentRowChanged(int currentRow);
+			void onApplyButtonClick();
+			void onCancelButtonClick();
+			void onOkButtonClick();
+			void setChildWidgetStates();
+			void widgetClick();
+			void disableDialog();
+			void handleContactSuggestionRequested(const QString& text);
+			void selectSoundFile();
+
+		private:
+			void handleOnUserSelected(const JID& jid);
+			void populateList();
+			void updateChatPreview();
+			void selectRow(int row);
+			int getSelectedRow() const;
+			HighlightRule ruleFromDialog();
+			void ruleToDialog(const HighlightRule& rule);
+
+			Ui::QtHighlightEditor ui_;
+			QtSettingsProvider* settings_;
+			HighlightManager* highlightManager_;
+			QtSuggestingJIDInput* jid_;
+			int previousRow_;
+		};
+
+}
diff --git a/Swift/QtUI/QtHighlightEditor.ui b/Swift/QtUI/QtHighlightEditor.ui
new file mode 100644
index 0000000..09a7297
--- /dev/null
+++ b/Swift/QtUI/QtHighlightEditor.ui
@@ -0,0 +1,446 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>QtHighlightEditor</class>
+ <widget class="QWidget" name="QtHighlightEditor">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>439</width>
+    <height>836</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>439</width>
+    <height>836</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>Incoming messages are checked against the following rules. First rule that matches will be executed.</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QListWidget" name="listWidget"/>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <spacer name="horizontalSpacer_8">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="newButton">
+       <property name="text">
+        <string>New Rule</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="deleteButton">
+       <property name="text">
+        <string>Remove Rule</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="moveUpButton">
+       <property name="text">
+        <string>Move Up</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="moveDownButton">
+       <property name="text">
+        <string>Move Down</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="Line" name="line_3">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Apply Rule To</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QRadioButton" name="chatRadio">
+        <property name="text">
+         <string>Chats</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="roomRadio">
+        <property name="text">
+         <string>Rooms</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>246</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_6">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Rule Conditions</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QRadioButton" name="allMsgRadio">
+        <property name="text">
+         <string>Apply to all messages</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="nickIsKeyword">
+        <property name="text">
+         <string>Only messages mentioning me</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="senderRadio">
+        <property name="text">
+         <string>Messages from this sender:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="senderName">
+        <property name="sizeConstraint">
+         <enum>QLayout::SetMinimumSize</enum>
+        </property>
+        <item>
+         <widget class="QLineEdit" name="dummySenderName"/>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="keywordRadio">
+        <property name="text">
+         <string>Messages containing this keyword:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="keyword"/>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="matchPartialWords">
+        <property name="text">
+         <string>Match keyword within longer words</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="matchCase">
+        <property name="text">
+         <string>Keyword is case sensitive</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_3">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Highlight Action</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_5">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_5">
+        <item>
+         <widget class="QRadioButton" name="noColorRadio">
+          <property name="text">
+           <string>No Highlight</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="defaultColorRadio">
+          <property name="text">
+           <string>Default Color</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="customColorRadio">
+          <property name="text">
+           <string>Custom Color</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_5">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_6">
+        <item>
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="Swift::QtColorToolButton" name="foregroundColor">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>&amp;Text</string>
+          </property>
+          <property name="toolButtonStyle">
+           <enum>Qt::ToolButtonTextBesideIcon</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="Swift::QtColorToolButton" name="backgroundColor">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>&amp;Background</string>
+          </property>
+          <property name="toolButtonStyle">
+           <enum>Qt::ToolButtonTextBesideIcon</enum>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_4">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Sound Action</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_6">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_7">
+        <item>
+         <widget class="QRadioButton" name="noSoundRadio">
+          <property name="text">
+           <string>No Sound</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="defaultSoundRadio">
+          <property name="text">
+           <string>Default Sound</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="customSoundRadio">
+          <property name="text">
+           <string>Custom Sound</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_6">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_8">
+        <item>
+         <spacer name="horizontalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="soundFile">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="readOnly">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="soundFileButton">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>...</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="Line" name="line_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_9">
+     <item>
+      <spacer name="horizontalSpacer_4">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>Swift::QtColorToolButton</class>
+   <extends>QToolButton</extends>
+   <header>QtColorToolButton.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Swift/QtUI/QtHighlightRuleWidget.cpp b/Swift/QtUI/QtHighlightRuleWidget.cpp
deleted file mode 100644
index 9c0df5e..0000000
--- a/Swift/QtUI/QtHighlightRuleWidget.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2012 Maciej Niedzielski
- * Licensed under the simplified BSD license.
- * See Documentation/Licenses/BSD-simplified.txt for more information.
- */
-
-#include <QDataWidgetMapper>
-#include <QStringListModel>
-#include <QFileDialog>
-
-#include <Swift/QtUI/QtHighlightRuleWidget.h>
-#include <Swift/QtUI/QtHighlightRulesItemModel.h>
-
-namespace Swift {
-
-QtHighlightRuleWidget::QtHighlightRuleWidget(QWidget* parent)
-	: QWidget(parent)
-{
-	ui_.setupUi(this);
-
-	QStringList applyToItems;
-	for (int i = 0; i < QtHighlightRulesItemModel::ApplyToEOL; ++i) {
-		applyToItems << QtHighlightRulesItemModel::getApplyToString(i);
-	}
-	QStringListModel * applyToModel = new QStringListModel(applyToItems, this);
-	ui_.applyTo->setModel(applyToModel);
-
-	connect(ui_.highlightText, SIGNAL(toggled(bool)), SLOT(onHighlightTextToggled(bool)));
-	connect(ui_.customColors, SIGNAL(toggled(bool)), SLOT(onCustomColorsToggled(bool)));
-	connect(ui_.playSound, SIGNAL(toggled(bool)), SLOT(onPlaySoundToggled(bool)));
-	connect(ui_.customSound, SIGNAL(toggled(bool)), SLOT(onCustomSoundToggled(bool)));
-	connect(ui_.soundFileButton, SIGNAL(clicked()), SLOT(onSoundFileButtonClicked()));
-
-	mapper_ = new QDataWidgetMapper(this);
-	hasValidIndex_ = false;
-	model_ = NULL;
-}
-
-QtHighlightRuleWidget::~QtHighlightRuleWidget()
-{
-}
-
-/** Widget does not gain ownership over the model */
-void QtHighlightRuleWidget::setModel(QtHighlightRulesItemModel* model)
-{
-	model_ = model;
-	mapper_->setModel(model_);
-}
-
-void QtHighlightRuleWidget::setActiveIndex(const QModelIndex& index)
-{
-	if (index.isValid()) {
-		if (!hasValidIndex_) {
-			mapper_->addMapping(ui_.applyTo, QtHighlightRulesItemModel::ApplyTo, "currentIndex");
-			mapper_->addMapping(ui_.senders, QtHighlightRulesItemModel::Sender, "plainText");
-			mapper_->addMapping(ui_.keywords, QtHighlightRulesItemModel::Keyword, "plainText");
-			mapper_->addMapping(ui_.nickIsKeyword, QtHighlightRulesItemModel::NickIsKeyword);
-			mapper_->addMapping(ui_.matchCase, QtHighlightRulesItemModel::MatchCase);
-			mapper_->addMapping(ui_.matchWholeWords, QtHighlightRulesItemModel::MatchWholeWords);
-			mapper_->addMapping(ui_.highlightText, QtHighlightRulesItemModel::HighlightText);
-			mapper_->addMapping(ui_.foreground, QtHighlightRulesItemModel::TextColor, "color");
-			mapper_->addMapping(ui_.background, QtHighlightRulesItemModel::TextBackground, "color");
-			mapper_->addMapping(ui_.playSound, QtHighlightRulesItemModel::PlaySound);
-			mapper_->addMapping(ui_.soundFile, QtHighlightRulesItemModel::SoundFile);
-		}
-		mapper_->setCurrentModelIndex(index);
-		ui_.customColors->setChecked(ui_.foreground->getColor().isValid() || ui_.background->getColor().isValid());
-		ui_.customSound->setChecked(!ui_.soundFile->text().isEmpty());
-		ui_.applyTo->focusWidget();
-	} else {
-		if (hasValidIndex_) {
-			mapper_->clearMapping();
-		}
-	}
-
-	hasValidIndex_ = index.isValid();
-}
-
-void QtHighlightRuleWidget::onCustomColorsToggled(bool enabled)
-{
-	if (!enabled) {
-		ui_.foreground->setColor(QColor());
-		ui_.background->setColor(QColor());
-	}
-	ui_.foreground->setEnabled(enabled);
-	ui_.background->setEnabled(enabled);
-}
-
-void QtHighlightRuleWidget::onCustomSoundToggled(bool enabled)
-{
-	if (enabled) {
-		if (ui_.soundFile->text().isEmpty()) {
-			onSoundFileButtonClicked();
-		}
-	} else {
-		ui_.soundFile->clear();
-	}
-	ui_.soundFile->setEnabled(enabled);
-	ui_.soundFileButton->setEnabled(enabled);
-}
-
-void QtHighlightRuleWidget::onSoundFileButtonClicked()
-{
-	QString s = QFileDialog::getOpenFileName(this, tr("Choose sound file"), QString(), tr("Sound files (*.wav)"));
-	if (!s.isEmpty()) {
-		ui_.soundFile->setText(s);
-	}
-}
-
-void QtHighlightRuleWidget::onHighlightTextToggled(bool enabled)
-{
-	ui_.customColors->setEnabled(enabled);
-}
-
-void QtHighlightRuleWidget::onPlaySoundToggled(bool enabled)
-{
-	ui_.customSound->setEnabled(enabled);
-}
-
-void QtHighlightRuleWidget::save()
-{
-	if (hasValidIndex_) {
-		mapper_->submit();
-	}
-}
-
-void QtHighlightRuleWidget::revert()
-{
-	if (hasValidIndex_) {
-		mapper_->revert();
-	}
-}
-
-}
diff --git a/Swift/QtUI/QtHighlightRuleWidget.h b/Swift/QtUI/QtHighlightRuleWidget.h
deleted file mode 100644
index 8a59a14..0000000
--- a/Swift/QtUI/QtHighlightRuleWidget.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2012 Maciej Niedzielski
- * Licensed under the simplified BSD license.
- * See Documentation/Licenses/BSD-simplified.txt for more information.
- */
-
-#pragma once
-
-#include <QWidget>
-#include <QModelIndex>
-
-#include <Swift/QtUI/ui_QtHighlightRuleWidget.h>
-
-class QDataWidgetMapper;
-
-namespace Swift {
-
-	class QtHighlightRulesItemModel;
-
-	class QtHighlightRuleWidget : public QWidget
-	{
-		Q_OBJECT
-
-		public:
-			explicit QtHighlightRuleWidget(QWidget* parent = NULL);
-			~QtHighlightRuleWidget();
-
-			void setModel(QtHighlightRulesItemModel* model);
-
-		public slots:
-			void setActiveIndex(const QModelIndex&);
-			void save();
-			void revert();
-
-		private slots:
-			void onHighlightTextToggled(bool);
-			void onCustomColorsToggled(bool);
-			void onPlaySoundToggled(bool);
-			void onCustomSoundToggled(bool);
-			void onSoundFileButtonClicked();
-
-		private:
-			QDataWidgetMapper * mapper_;
-			QtHighlightRulesItemModel * model_;
-			bool hasValidIndex_;
-			Ui::QtHighlightRuleWidget ui_;
-	};
-
-}
diff --git a/Swift/QtUI/QtHighlightRuleWidget.ui b/Swift/QtUI/QtHighlightRuleWidget.ui
deleted file mode 100644
index 9c465f9..0000000
--- a/Swift/QtUI/QtHighlightRuleWidget.ui
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>QtHighlightRuleWidget</class>
- <widget class="QWidget" name="QtHighlightRuleWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>361</width>
-    <height>524</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Rule conditions</string>
-     </property>
-     <layout class="QFormLayout" name="formLayout">
-      <property name="fieldGrowthPolicy">
-       <enum>QFormLayout::ExpandingFieldsGrow</enum>
-      </property>
-      <item row="0" column="0" colspan="2">
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>Choose when this rule should be applied.
-If you want to provide more than one sender or keyword, input them in separate lines.</string>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" colspan="2">
-       <widget class="Line" name="line">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>&amp;Apply to:</string>
-        </property>
-        <property name="buddy">
-         <cstring>applyTo</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QComboBox" name="applyTo"/>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>&amp;Senders:</string>
-        </property>
-        <property name="buddy">
-         <cstring>senders</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="QPlainTextEdit" name="senders"/>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>&amp;Keywords:</string>
-        </property>
-        <property name="buddy">
-         <cstring>keywords</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="QPlainTextEdit" name="keywords"/>
-      </item>
-      <item row="5" column="1">
-       <widget class="QCheckBox" name="nickIsKeyword">
-        <property name="text">
-         <string>Treat &amp;nick as a keyword (in MUC)</string>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="1">
-       <widget class="QCheckBox" name="matchWholeWords">
-        <property name="text">
-         <string>Match whole &amp;words</string>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="1">
-       <widget class="QCheckBox" name="matchCase">
-        <property name="text">
-         <string>Match &amp;case</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="title">
-      <string>Actions</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="QCheckBox" name="highlightText">
-        <property name="text">
-         <string>&amp;Highlight text</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>28</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="customColors">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="text">
-           <string>Custom c&amp;olors:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="Swift::QtColorToolButton" name="foreground">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="text">
-           <string>&amp;Foreground</string>
-          </property>
-          <property name="toolButtonStyle">
-           <enum>Qt::ToolButtonTextBesideIcon</enum>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="Swift::QtColorToolButton" name="background">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="text">
-           <string>&amp;Background</string>
-          </property>
-          <property name="toolButtonStyle">
-           <enum>Qt::ToolButtonTextBesideIcon</enum>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="playSound">
-        <property name="text">
-         <string>&amp;Play sound</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>28</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="customSound">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="text">
-           <string>Custom soun&amp;d:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="soundFile">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="readOnly">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QToolButton" name="soundFileButton">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="text">
-           <string>...</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>101</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>Swift::QtColorToolButton</class>
-   <extends>QToolButton</extends>
-   <header>QtColorToolButton.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/Swift/QtUI/QtUIFactory.cpp b/Swift/QtUI/QtUIFactory.cpp
index 701170c..b0c1492 100644
--- a/Swift/QtUI/QtUIFactory.cpp
+++ b/Swift/QtUI/QtUIFactory.cpp
@@ -25,7 +25,7 @@
 #include <Swift/QtUI/QtContactEditWindow.h>
 #include <Swift/QtUI/QtAdHocCommandWindow.h>
 #include <Swift/QtUI/QtFileTransferListWidget.h>
-#include <Swift/QtUI/QtHighlightEditorWidget.h>
+#include <Swift/QtUI/QtHighlightEditor.h>
 #include <Swift/QtUI/Whiteboard/QtWhiteboardWindow.h>
 #include <Swift/Controllers/Settings/SettingsProviderHierachy.h>
 #include <Swift/QtUI/QtUISettingConstants.h>
@@ -164,8 +164,8 @@ WhiteboardWindow* QtUIFactory::createWhiteboardWindow(boost::shared_ptr<Whiteboa
 	return new QtWhiteboardWindow(whiteboardSession);
 }
 
-HighlightEditorWidget* QtUIFactory::createHighlightEditorWidget() {
-	return new QtHighlightEditorWidget();
+HighlightEditorWindow* QtUIFactory::createHighlightEditorWindow() {
+	return new QtHighlightEditor(qtOnlySettings);
 }
 
 BlockListEditorWidget *QtUIFactory::createBlockListEditorWidget() {
diff --git a/Swift/QtUI/QtUIFactory.h b/Swift/QtUI/QtUIFactory.h
index 4c50572..9c07e76 100644
--- a/Swift/QtUI/QtUIFactory.h
+++ b/Swift/QtUI/QtUIFactory.h
@@ -48,7 +48,7 @@ namespace Swift {
 			virtual ContactEditWindow* createContactEditWindow();
 			virtual FileTransferListWidget* createFileTransferListWidget();
 			virtual WhiteboardWindow* createWhiteboardWindow(boost::shared_ptr<WhiteboardSession> whiteboardSession);
-			virtual HighlightEditorWidget* createHighlightEditorWidget();
+			virtual HighlightEditorWindow* createHighlightEditorWindow();
 			virtual BlockListEditorWidget* createBlockListEditorWidget();
 			virtual AdHocCommandWindow* createAdHocCommandWindow(boost::shared_ptr<OutgoingAdHocCommandSession> command);
 
diff --git a/Swift/QtUI/QtWebKitChatView.cpp b/Swift/QtUI/QtWebKitChatView.cpp
index 23bc099..1486293 100644
--- a/Swift/QtUI/QtWebKitChatView.cpp
+++ b/Swift/QtUI/QtWebKitChatView.cpp
@@ -536,6 +536,22 @@ std::string QtWebKitChatView::addMessage(
 	return addMessage(chatMessageToHTML(message), senderName, senderIsSelf, label, avatarPath, "", time, highlight, ChatSnippet::getDirection(message));
 }
 
+QString QtWebKitChatView::getHighlightSpanStart(const std::string& text, const std::string& background) {
+	QString ecsapeColor = QtUtilities::htmlEscape(P2QSTRING(text));
+	QString escapeBackground = QtUtilities::htmlEscape(P2QSTRING(background));
+	if (ecsapeColor.isEmpty()) {
+		ecsapeColor = "black";
+	}
+	if (escapeBackground.isEmpty()) {
+		escapeBackground = "yellow";
+	}
+	return QString("<span style=\"color: %1; background: %2\">").arg(ecsapeColor).arg(escapeBackground);
+}
+
+QString QtWebKitChatView::getHighlightSpanStart(const HighlightAction& highlight) {
+	return getHighlightSpanStart(highlight.getTextColor(), highlight.getTextBackground());
+}
+
 QString QtWebKitChatView::chatMessageToHTML(const ChatWindow::ChatMessage& message) {
 	QString result;
 	foreach (boost::shared_ptr<ChatWindow::ChatMessagePart> part, message.getParts()) {
@@ -562,7 +578,8 @@ QString QtWebKitChatView::chatMessageToHTML(const ChatWindow::ChatMessage& messa
 			continue;
 		}
 		if ((highlightPart = boost::dynamic_pointer_cast<ChatWindow::ChatHighlightingMessagePart>(part))) {
-			//FIXME: Maybe do something here. Anything, really.
+			QString spanStart = getHighlightSpanStart(highlightPart->foregroundColor, highlightPart->backgroundColor);
+			result += spanStart + QtUtilities::htmlEscape(P2QSTRING(highlightPart->text)) + "</span>";
 			continue;
 		}
 
@@ -570,20 +587,6 @@ QString QtWebKitChatView::chatMessageToHTML(const ChatWindow::ChatMessage& messa
 	return result;
 }
 
-
-QString QtWebKitChatView::getHighlightSpanStart(const HighlightAction& highlight) {
-	QString color = QtUtilities::htmlEscape(P2QSTRING(highlight.getTextColor()));
-	QString background = QtUtilities::htmlEscape(P2QSTRING(highlight.getTextBackground()));
-	if (color.isEmpty()) {
-		color = "black";
-	}
-	if (background.isEmpty()) {
-		background = "yellow";
-	}
-
-	return QString("<span style=\"color: %1; background: %2\">").arg(color).arg(background);
-}
-
 std::string QtWebKitChatView::addMessage(
 		const QString& message, 
 		const std::string& senderName, 
diff --git a/Swift/QtUI/QtWebKitChatView.h b/Swift/QtUI/QtWebKitChatView.h
index fb6e4da..925ceeb 100644
--- a/Swift/QtUI/QtWebKitChatView.h
+++ b/Swift/QtUI/QtWebKitChatView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -148,8 +148,9 @@ namespace Swift {
 					const HighlightAction& highlight);
 			bool appendToPreviousCheck(PreviousMessageKind messageKind, const std::string& senderName, bool senderIsSelf);
 			static ChatSnippet::Direction getActualDirection(const ChatWindow::ChatMessage& message, ChatWindow::Direction direction);
-			QString chatMessageToHTML(const ChatWindow::ChatMessage& message);
+			QString getHighlightSpanStart(const std::string& text, const std::string& background);
 			QString getHighlightSpanStart(const HighlightAction& highlight);
+			QString chatMessageToHTML(const ChatWindow::ChatMessage& message);
 			static QString buildChatWindowButton(const QString& name, const QString& id, const QString& arg1 = QString(), const QString& arg2 = QString(), const QString& arg3 = QString(), const QString& arg4 = QString(), const QString& arg5 = QString());
 
 		private:
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index dd7d0c3..26e738a 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -127,9 +127,7 @@ sources = [
     "QtContactEditWindow.cpp",
     "QtContactEditWidget.cpp",
     "QtSingleWindow.cpp",
-    "QtHighlightEditorWidget.cpp",
-    "QtHighlightRulesItemModel.cpp",
-    "QtHighlightRuleWidget.cpp",
+    "QtHighlightEditor.cpp",
     "QtColorToolButton.cpp",
     "QtClosableLineEdit.cpp",
     "ChatSnippet.cpp",
@@ -286,8 +284,7 @@ myenv.Uic4("QtAffiliationEditor.ui")
 myenv.Uic4("QtJoinMUCWindow.ui")
 myenv.Uic4("QtHistoryWindow.ui")
 myenv.Uic4("QtConnectionSettings.ui")
-myenv.Uic4("QtHighlightRuleWidget.ui")
-myenv.Uic4("QtHighlightEditorWidget.ui")
+myenv.Uic4("QtHighlightEditor.ui")
 myenv.Uic4("QtBlockListEditorWindow.ui")
 myenv.Uic4("QtSpellCheckerWindow.ui")
 myenv.Qrc("DefaultTheme.qrc")