summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-09-09 15:20:19 (GMT)
committerKevin Smith <kevin.smith@isode.com>2015-09-18 09:09:43 (GMT)
commit64aa58d97676be61a5bb23b1b3d351b032b9b5a0 (patch)
tree896b91773ce60e634ce5bde2b5ec5342899fe8cc /Swift/QtUI
parent5bc29fe3fa187187abc2cda4c35fa1a7744c78cb (diff)
downloadswift-64aa58d97676be61a5bb23b1b3d351b032b9b5a0.zip
swift-64aa58d97676be61a5bb23b1b3d351b032b9b5a0.tar.bz2
Save 'apply to all' property in highlight rule editor
The highlight editor did not save if the user set the 'apply to all' property on a rule. It allows to highlight complete messages or be notified only based on the incoming message type. This commit enables saving the property. Test-Information: Tested chat and room rules with the 'apply to all' property set and verified that the complete messages are highlighted. Change-Id: Ib06bd3111ae810c8362ab8fd36a2d3b67f5a14cc
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/QtHighlightEditor.cpp18
1 files changed, 12 insertions, 6 deletions
diff --git a/Swift/QtUI/QtHighlightEditor.cpp b/Swift/QtUI/QtHighlightEditor.cpp
index c6e4319..7aea26b 100644
--- a/Swift/QtUI/QtHighlightEditor.cpp
+++ b/Swift/QtUI/QtHighlightEditor.cpp
@@ -10,18 +10,20 @@
* See the COPYING file for more information.
*/
+#include <Swift/QtUI/QtHighlightEditor.h>
+
#include <cassert>
#include <boost/lexical_cast.hpp>
-#include <Swift/QtUI/UserSearch/QtSuggestingJIDInput.h>
+#include <QFileDialog>
+#include <QTreeWidgetItem>
+
#include <Swift/Controllers/HighlightManager.cpp>
-#include <Swift/QtUI/QtHighlightEditor.h>
-#include <Swift/QtUI/QtSwiftUtil.h>
-#include <Swift/QtUI/QtSettingsProvider.h>
-#include <QTreeWidgetItem>
-#include <QFileDialog>
+#include <Swift/QtUI/QtSettingsProvider.h>
+#include <Swift/QtUI/QtSwiftUtil.h>
+#include <Swift/QtUI/UserSearch/QtSuggestingJIDInput.h>
namespace Swift {
@@ -419,6 +421,10 @@ HighlightRule QtHighlightEditor::ruleFromDialog()
rule.setMatchMUC(true);
}
+ if (ui_.allMsgRadio->isChecked()) {
+ action.setHighlightAllText(true);
+ }
+
if (ui_.senderRadio->isChecked()) {
QString senderName = jid_->text();
if (!senderName.isEmpty()) {