Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-03-08 13:36:27 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-03-29 14:13:20 (GMT) |
| commit | 74e51310d27e9d9a66d2d790360549c48abec8d1 (patch) | |
| tree | d350bf7cd62c144e561841b4a228b0f60cb76957 /Swift/Controllers/Highlighter.h | |
| parent | c26314684cd4e6140e5ea882285c2076505bd53d (diff) | |
| download | swift-74e51310d27e9d9a66d2d790360549c48abec8d1.zip swift-74e51310d27e9d9a66d2d790360549c48abec8d1.tar.bz2 | |
Refactored keyword highlighting
This commit changes the ChatWindow/ChatView APIs to not pass
highlights actions as additional parameters but instead they
are now part of the ChatWindow::ChatMessage and its parts.
This allows the controllers to do highlighting in one single
place and play sound actions on the highlighted message in
a single place.
On a highlighted message only unique sounds are played and
they are played in sequence of the rules that matched
the message.
Test-Information:
Adjusted the existing unit tests accordingly. Added unit
tests that check reduplication of highlight action sounds
and that the sound actions are emitted correctly.
Manually verified that highlight sound actions with and
without duplicated sounds are audible on OS X 10.11.3.
Change-Id: I68c88e0d285d79d87b2997ed29d92b140480b394
Diffstat (limited to 'Swift/Controllers/Highlighter.h')
| -rw-r--r-- | Swift/Controllers/Highlighter.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Swift/Controllers/Highlighter.h b/Swift/Controllers/Highlighter.h index d5d846b..5d5f531 100644 --- a/Swift/Controllers/Highlighter.h +++ b/Swift/Controllers/Highlighter.h @@ -4,9 +4,16 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ +/* + * Copyright (c) 2016 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ + #pragma once #include <string> +#include <vector> #include <Swift/Controllers/HighlightRule.h> @@ -24,7 +31,7 @@ namespace Swift { void setNick(const std::string& nick) { nick_ = nick; } std::string getNick() const { return nick_; } - HighlightAction findAction(const std::string& body, const std::string& sender) const; + HighlightAction findFirstFullMessageMatchAction(const std::string& body, const std::string& sender) const; void handleHighlightAction(const HighlightAction& action); |