3 files changed, 21 insertions, 39 deletions
diff --git a/Swift/QtUI/QtHighlightEditor.cpp b/Swift/QtUI/QtHighlightEditor.cpp
index ce07003..8488d7d 100644
--- a/Swift/QtUI/QtHighlightEditor.cpp
+++ b/Swift/QtUI/QtHighlightEditor.cpp
@@ -34,19 +34,18 @@ QtHighlightEditor::QtHighlightEditor(QtSettingsProvider* settings, QWidget* pare
 
 	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);
@@ -62,19 +61,18 @@ QtHighlightEditor::QtHighlightEditor(QtSettingsProvider* settings, QWidget* pare
 	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 */
@@ -299,19 +297,18 @@ void QtHighlightEditor::disableDialog()
 	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);
 }
@@ -393,34 +390,33 @@ HighlightRule QtHighlightEditor::ruleFromDialog()
 	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());
+	if (ui_.nickIsKeyword->isChecked()) {
+		rule.setNickIsKeyword(true);
+		rule.setMatchWholeWords(true);
+		rule.setMatchCase(true);
+	} else {
+		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("");
@@ -470,38 +466,31 @@ void QtHighlightEditor::ruleToDialog(const HighlightRule& rule)
 		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 {
+	if (action.getTextColor().empty() && action.getTextBackground().empty()) {
 		ui_.noColorRadio->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);
 	}
 
 	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()) {
diff --git a/Swift/QtUI/QtHighlightEditor.ui b/Swift/QtUI/QtHighlightEditor.ui
index be2e99b..775771f 100644
--- a/Swift/QtUI/QtHighlightEditor.ui
+++ b/Swift/QtUI/QtHighlightEditor.ui
@@ -271,25 +271,18 @@
               <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">
diff --git a/Swift/QtUI/QtWebKitChatView.cpp b/Swift/QtUI/QtWebKitChatView.cpp
index 1486293..a510e34 100644
--- a/Swift/QtUI/QtWebKitChatView.cpp
+++ b/Swift/QtUI/QtWebKitChatView.cpp
@@ -602,20 +602,20 @@ std::string QtWebKitChatView::addMessage(
 
 	QString htmlString;
 	if (label) {
 		htmlString = QString("<span style=\"border: thin dashed grey; padding-left: .5em; padding-right: .5em; color: %1; background-color: %2; font-size: 90%; margin-right: .5em; \" class='swift_label'>").arg(QtUtilities::htmlEscape(P2QSTRING(label->getForegroundColor()))).arg(QtUtilities::htmlEscape(P2QSTRING(label->getBackgroundColor())));
 		htmlString += QString("%1</span> ").arg(QtUtilities::htmlEscape(P2QSTRING(label->getDisplayMarking())));
 	}
 
 	QString styleSpanStart = style == "" ? "" : "<span style=\"" + style + "\">";
 	QString styleSpanEnd = style == "" ? "" : "</span>";
-	QString highlightSpanStart = highlight.highlightText() ? getHighlightSpanStart(highlight) : "";
-	QString highlightSpanEnd = highlight.highlightText() ? "</span>" : "";
+	QString highlightSpanStart = highlight.highlightAllText() ? getHighlightSpanStart(highlight) : "";
+	QString highlightSpanEnd = highlight.highlightAllText() ? "</span>" : "";
 	htmlString += "<span class='swift_inner_message'>" + styleSpanStart + highlightSpanStart + message + highlightSpanEnd + styleSpanEnd + "</span>" ;
 
 	bool appendToPrevious = appendToPreviousCheck(PreviousMessageWasMessage, senderName, senderIsSelf);
 
 	QString qAvatarPath =  scaledAvatarPath.isEmpty() ? "qrc:/icons/avatar.png" : QUrl::fromLocalFile(scaledAvatarPath).toEncoded();
 	std::string id = "id" + boost::lexical_cast<std::string>(idCounter_++);
 	addMessageBottom(boost::make_shared<MessageSnippet>(htmlString, QtUtilities::htmlEscape(P2QSTRING(senderName)), B2QDATE(time), qAvatarPath, senderIsSelf, appendToPrevious, theme_, P2QSTRING(id), direction));
 
 	previousMessageWasSelf_ = senderIsSelf;
@@ -820,20 +820,20 @@ void QtWebKitChatView::replaceMessage(const QString& message, const std::string&
 	if (!id.empty()) {
 		if (window_->isWidgetSelected()) {
 			window_->onAllMessagesRead();
 		}
 
 		QString messageHTML(message);
 
 		QString styleSpanStart = style == "" ? "" : "<span style=\"" + style + "\">";
 		QString styleSpanEnd = style == "" ? "" : "</span>";
-		QString highlightSpanStart = highlight.highlightText() ? getHighlightSpanStart(highlight) : "";
-		QString highlightSpanEnd = highlight.highlightText() ? "</span>" : "";
+		QString highlightSpanStart = highlight.highlightAllText() ? getHighlightSpanStart(highlight) : "";
+		QString highlightSpanEnd = highlight.highlightAllText() ? "</span>" : "";
 		messageHTML = styleSpanStart + highlightSpanStart + messageHTML + highlightSpanEnd + styleSpanEnd;
 
 		replaceMessage(messageHTML, P2QSTRING(id), B2QDATE(time));
 	}
 	else {
 		std::cerr << "Trying to replace a message with no id";
 	}
 }