Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2017-03-07 10:12:25 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2017-03-07 12:35:30 (GMT) |
| commit | 639db5f27911c4bc994e6a040561d596a0f77113 (patch) | |
| tree | aacfdba96ed8f595b6e65ecd43fd6382f71ea82d /Swift | |
| parent | 56c7bc9d6a52dd7095405d2bcf9fca5473a464c3 (diff) | |
| download | swift-639db5f27911c4bc994e6a040561d596a0f77113.zip swift-639db5f27911c4bc994e6a040561d596a0f77113.tar.bz2 | |
Do not color highlight mentions of the own nickname by default
In the default highlight configuration, mentions of the own
nickname should only cause a notification sound and a system
notification.
Test-Information:
Tested mention notifications in a test MUC room and verified
that only sound and system notifications are issued in the
default highlight configurations.
Tested on macOS 10.12.3 with Qt 5.5.1.
Change-Id: I44a276ab740d7495930c935a89a2ef81219e24df
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/Controllers/Highlighting/HighlightManager.cpp | 2 | ||||
| -rw-r--r-- | Swift/QtUI/QtWebKitChatView.cpp | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/Swift/Controllers/Highlighting/HighlightManager.cpp b/Swift/Controllers/Highlighting/HighlightManager.cpp index 89261af..2ca77e7 100644 --- a/Swift/Controllers/Highlighting/HighlightManager.cpp +++ b/Swift/Controllers/Highlighting/HighlightManager.cpp @@ -50,8 +50,6 @@ HighlightConfiguration HighlightManager::getDefaultConfig() { HighlightConfiguration defaultConfiguration; defaultConfiguration.playSoundOnIncomingDirectMessages = true; defaultConfiguration.showNotificationOnIncomingDirectMessages = true; - defaultConfiguration.ownMentionAction.setFrontColor(std::string("black")); - defaultConfiguration.ownMentionAction.setBackColor(std::string("yellow")); defaultConfiguration.ownMentionAction.setSoundFilePath(std::string("/sounds/message-received.wav")); defaultConfiguration.ownMentionAction.setSystemNotificationEnabled(true); return defaultConfiguration; diff --git a/Swift/QtUI/QtWebKitChatView.cpp b/Swift/QtUI/QtWebKitChatView.cpp index 048fe99..4dd67f1 100644 --- a/Swift/QtUI/QtWebKitChatView.cpp +++ b/Swift/QtUI/QtWebKitChatView.cpp @@ -483,15 +483,15 @@ std::string QtWebKitChatView::addMessage( } QString QtWebKitChatView::getHighlightSpanStart(const std::string& text, const std::string& background) { - QString ecsapeColor = QtUtilities::htmlEscape(P2QSTRING(text)); - QString escapeBackground = QtUtilities::htmlEscape(P2QSTRING(background)); - if (ecsapeColor.isEmpty()) { - ecsapeColor = "black"; + QString ecsapeColor; + QString escapeBackground; + if (!text.empty()) { + ecsapeColor = QString("color: %1").arg(QtUtilities::htmlEscape(P2QSTRING(text))); } - if (escapeBackground.isEmpty()) { - escapeBackground = "yellow"; + if (!background.empty()) { + escapeBackground = QString("background: %1").arg(QtUtilities::htmlEscape(P2QSTRING(background))); } - return QString("<span style=\"color: %1; background: %2\">").arg(ecsapeColor).arg(escapeBackground); + return QString("<span style=\"%1; %2;\">").arg(ecsapeColor).arg(escapeBackground); } QString QtWebKitChatView::getHighlightSpanStart(const HighlightAction& highlight) { |