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 | |
| 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')
| -rw-r--r-- | Swift/QtUI/QtHighlightEditor.cpp | 4 | ||||
| -rw-r--r-- | Swift/QtUI/QtWebKitChatView.cpp | 10 |
2 files changed, 8 insertions, 6 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(); |
diff --git a/Swift/QtUI/QtWebKitChatView.cpp b/Swift/QtUI/QtWebKitChatView.cpp index f1278b8..7e0e505 100644 --- a/Swift/QtUI/QtWebKitChatView.cpp +++ b/Swift/QtUI/QtWebKitChatView.cpp | |||
| @@ -621,12 +621,14 @@ std::string QtWebKitChatView::addMessage( | |||
| 621 | htmlString += QString("%1</span> ").arg(QtUtilities::htmlEscape(P2QSTRING(label->getDisplayMarking()))); | 621 | htmlString += QString("%1</span> ").arg(QtUtilities::htmlEscape(P2QSTRING(label->getDisplayMarking()))); |
| 622 | } | 622 | } |
| 623 | 623 | ||
| 624 | QString styleSpanStart = style == "" ? "" : "<span style=\"" + style + "\">"; | 624 | QString styleSpanStart = style == "" ? "" : "<span style=\"" + style + "\">"; |
| 625 | QString styleSpanEnd = style == "" ? "" : "</span>"; | 625 | QString styleSpanEnd = style == "" ? "" : "</span>"; |
| 626 | QString highlightSpanStart = highlight.highlightAllText() ? getHighlightSpanStart(highlight) : ""; | 626 | |
| 627 | QString highlightSpanEnd = highlight.highlightAllText() ? "</span>" : ""; | 627 | bool highlightWholeMessage = highlight.highlightWholeMessage() && highlight.getTextBackground() != "" && highlight.getTextColor() != ""; |
| 628 | QString highlightSpanStart = highlightWholeMessage ? getHighlightSpanStart(highlight) : ""; | ||
| 629 | QString highlightSpanEnd = highlightWholeMessage ? "</span>" : ""; | ||
| 628 | htmlString += "<span class='swift_inner_message'>" + styleSpanStart + highlightSpanStart + message + highlightSpanEnd + styleSpanEnd + "</span>" ; | 630 | htmlString += "<span class='swift_inner_message'>" + styleSpanStart + highlightSpanStart + message + highlightSpanEnd + styleSpanEnd + "</span>" ; |
| 629 | 631 | ||
| 630 | bool appendToPrevious = appendToPreviousCheck(PreviousMessageWasMessage, senderName, senderIsSelf); | 632 | bool appendToPrevious = appendToPreviousCheck(PreviousMessageWasMessage, senderName, senderIsSelf); |
| 631 | 633 | ||
| 632 | QString qAvatarPath = scaledAvatarPath.isEmpty() ? "qrc:/icons/avatar.png" : QUrl::fromLocalFile(scaledAvatarPath).toEncoded(); | 634 | QString qAvatarPath = scaledAvatarPath.isEmpty() ? "qrc:/icons/avatar.png" : QUrl::fromLocalFile(scaledAvatarPath).toEncoded(); |
| @@ -869,12 +871,12 @@ void QtWebKitChatView::replaceMessage(const QString& message, const std::string& | |||
| 869 | 871 | ||
| 870 | QString messageHTML(message); | 872 | QString messageHTML(message); |
| 871 | 873 | ||
| 872 | QString styleSpanStart = style == "" ? "" : "<span style=\"" + style + "\">"; | 874 | QString styleSpanStart = style == "" ? "" : "<span style=\"" + style + "\">"; |
| 873 | QString styleSpanEnd = style == "" ? "" : "</span>"; | 875 | QString styleSpanEnd = style == "" ? "" : "</span>"; |
| 874 | QString highlightSpanStart = highlight.highlightAllText() ? getHighlightSpanStart(highlight) : ""; | 876 | QString highlightSpanStart = highlight.highlightWholeMessage() ? getHighlightSpanStart(highlight) : ""; |
| 875 | QString highlightSpanEnd = highlight.highlightAllText() ? "</span>" : ""; | 877 | QString highlightSpanEnd = highlight.highlightWholeMessage() ? "</span>" : ""; |
| 876 | messageHTML = styleSpanStart + highlightSpanStart + messageHTML + highlightSpanEnd + styleSpanEnd; | 878 | messageHTML = styleSpanStart + highlightSpanStart + messageHTML + highlightSpanEnd + styleSpanEnd; |
| 877 | 879 | ||
| 878 | replaceMessage(messageHTML, P2QSTRING(id), B2QDATE(time)); | 880 | replaceMessage(messageHTML, P2QSTRING(id), B2QDATE(time)); |
| 879 | } | 881 | } |
| 880 | else { | 882 | else { |