summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-10-26 13:00:29 (GMT)
committerSwift Review <review@swift.im>2015-10-30 15:50:52 (GMT)
commit7f321edd9ada1f531b1fbc3325ef61449218f40c (patch)
treef0a1998447a41fa2cedff39edd1c179eefb4b298 /Swift/QtUI/QtHighlightEditor.cpp
parent50a3962e4d0b16fd0316be54121cfb293c3117bd (diff)
downloadswift-7f321edd9ada1f531b1fbc3325ef61449218f40c.zip
swift-7f321edd9ada1f531b1fbc3325ef61449218f40c.tar.bz2
Only highlight text if a highlight color is set
This commit has the default rule set the default color and changes HighlightAction::highlightText_ symbol to HighlightAction::highlightWholeMessage_ as it is more descriptive of its use. Test-Information: Tested highlighting with the default rule set, and one with a highlight color set for the chat rule. Change-Id: Ic638e6347bdf6623ab5959341486233494f005f0
Diffstat (limited to 'Swift/QtUI/QtHighlightEditor.cpp')
-rw-r--r--Swift/QtUI/QtHighlightEditor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/QtUI/QtHighlightEditor.cpp b/Swift/QtUI/QtHighlightEditor.cpp
index 50d1f78..1d47c4e 100644
--- a/Swift/QtUI/QtHighlightEditor.cpp
+++ b/Swift/QtUI/QtHighlightEditor.cpp
@@ -427,7 +427,7 @@ HighlightRule QtHighlightEditor::ruleFromDialog()
}
if (ui_.allMsgRadio->isChecked()) {
- action.setHighlightAllText(true);
+ action.setHighlightWholeMessage(true);
}
if (ui_.senderRadio->isChecked()) {
@@ -436,7 +436,7 @@ HighlightRule QtHighlightEditor::ruleFromDialog()
std::vector<std::string> senders;
senders.push_back(Q2PSTRING(senderName));
rule.setSenders(senders);
- action.setHighlightAllText(true);
+ action.setHighlightWholeMessage(true);
}
}