Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-10-26 13:00:29 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-10-30 15:50:52 (GMT) |
| commit | 7f321edd9ada1f531b1fbc3325ef61449218f40c (patch) | |
| tree | f0a1998447a41fa2cedff39edd1c179eefb4b298 /Swift/QtUI/QtHighlightEditor.cpp | |
| parent | 50a3962e4d0b16fd0316be54121cfb293c3117bd (diff) | |
| download | swift-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.cpp | 4 |
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 | |||
| @@ -425,20 +425,20 @@ HighlightRule QtHighlightEditor::ruleFromDialog() | |||
| 425 | rule.setMatchChat(false); | 425 | rule.setMatchChat(false); |
| 426 | rule.setMatchMUC(true); | 426 | rule.setMatchMUC(true); |
| 427 | } | 427 | } |
| 428 | 428 | ||
| 429 | if (ui_.allMsgRadio->isChecked()) { | 429 | if (ui_.allMsgRadio->isChecked()) { |
| 430 | action.setHighlightAllText(true); | 430 | action.setHighlightWholeMessage(true); |
| 431 | } | 431 | } |
| 432 | 432 | ||
| 433 | if (ui_.senderRadio->isChecked()) { | 433 | if (ui_.senderRadio->isChecked()) { |
| 434 | QString senderName = jid_->text(); | 434 | QString senderName = jid_->text(); |
| 435 | if (!senderName.isEmpty()) { | 435 | if (!senderName.isEmpty()) { |
| 436 | std::vector<std::string> senders; | 436 | std::vector<std::string> senders; |
| 437 | senders.push_back(Q2PSTRING(senderName)); | 437 | senders.push_back(Q2PSTRING(senderName)); |
| 438 | rule.setSenders(senders); | 438 | rule.setSenders(senders); |
| 439 | action.setHighlightAllText(true); | 439 | action.setHighlightWholeMessage(true); |
| 440 | } | 440 | } |
| 441 | } | 441 | } |
| 442 | 442 | ||
| 443 | if (ui_.keywordRadio->isChecked()) { | 443 | if (ui_.keywordRadio->isChecked()) { |
| 444 | QString keywordString = ui_.keyword->text(); | 444 | QString keywordString = ui_.keyword->text(); |