From 0cc9e14b1dc41f7d67eff02e3b277c2ec059bb4b Mon Sep 17 00:00:00 2001
From: Richard Maudsley <richard.maudsley@isode.com>
Date: Tue, 21 Jan 2014 10:57:06 +0000
Subject: Improved 'all rooms' and 'all chats' option clairty.

Change-Id: Id854e0f210ecccab5c3475eca219524a56ba3975

diff --git a/Swift/QtUI/QtHighlightEditor.cpp b/Swift/QtUI/QtHighlightEditor.cpp
index 598a52b..d4e8899 100644
--- a/Swift/QtUI/QtHighlightEditor.cpp
+++ b/Swift/QtUI/QtHighlightEditor.cpp
@@ -97,9 +97,9 @@ std::string formatLongDescription(const HighlightRule& rule)
 	if (rule.getMatchChat() && rule.getMatchMUC()) {
 		text += "either in chats or in rooms";
 	} else if (rule.getMatchChat()) {
-		text += "in chats only";
+		text += "in chats";
 	} else if (rule.getMatchMUC()) {
-		text += "in rooms only";
+		text += "in rooms";
 	} else {
 		return "This rule has not been marked as a chat or room rule!";
 	}
@@ -328,6 +328,12 @@ void QtHighlightEditor::setChildWidgetStates()
 		ui_.matchWholeWords->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()
diff --git a/Swift/QtUI/QtHighlightEditor.ui b/Swift/QtUI/QtHighlightEditor.ui
index 5f45d4a..cded649 100644
--- a/Swift/QtUI/QtHighlightEditor.ui
+++ b/Swift/QtUI/QtHighlightEditor.ui
@@ -344,7 +344,7 @@ p, li { white-space: pre-wrap; }
                <bool>false</bool>
               </property>
               <property name="text">
-               <string>&amp;Foreground</string>
+               <string>&amp;Text</string>
               </property>
               <property name="toolButtonStyle">
                <enum>Qt::ToolButtonTextBesideIcon</enum>
-- 
cgit v0.10.2-6-g49f6