X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fignorelistsettingspage.cpp;h=82375bf36a5980debe07c4b15c177438e384326d;hp=dcf59a2a72299ed7625ffec096237be6407461a7;hb=e2188dc438be6f3eb0d9cdf47d28821aefe9835e;hpb=b7447afe8e836376776dac26704e227a678d2913

diff --git a/src/qtui/settingspages/ignorelistsettingspage.cpp b/src/qtui/settingspages/ignorelistsettingspage.cpp
index dcf59a2a..82375bf3 100644
--- a/src/qtui/settingspages/ignorelistsettingspage.cpp
+++ b/src/qtui/settingspages/ignorelistsettingspage.cpp
@@ -29,6 +29,8 @@
 #include <QEvent>
 #include <QDebug>
 
+#include "expressionmatch.h"
+
 #include "icon.h"
 
 IgnoreListSettingsPage::IgnoreListSettingsPage(QWidget *parent)
@@ -125,26 +127,26 @@ void IgnoreListSettingsPage::deleteSelectedIgnoreRule()
 void IgnoreListSettingsPage::newIgnoreRule(QString rule)
 {
     IgnoreListManager::IgnoreListItem newItem = IgnoreListManager::IgnoreListItem();
-    newItem.strictness = IgnoreListManager::SoftStrictness;
-    newItem.scope = IgnoreListManager::GlobalScope;
-    newItem.isRegEx = false;
-    newItem.isActive = true;
+    newItem.setStrictness(IgnoreListManager::SoftStrictness);
+    newItem.setScope(IgnoreListManager::GlobalScope);
+    newItem.setIsRegEx(false);
+    newItem.setIsEnabled(true);
 
     bool enableOkButton = false;
     if (!rule.isEmpty()) {
         // we're called from contextmenu
-        newItem.ignoreRule = rule;
+        newItem.setContents(rule);
         enableOkButton = true;
     }
 
-    IgnoreListEditDlg *dlg = new IgnoreListEditDlg(newItem, this, enableOkButton);
+    auto *dlg = new IgnoreListEditDlg(newItem, this, enableOkButton);
     dlg->enableOkButton(enableOkButton);
     while (dlg->exec() == QDialog::Accepted) {
         if (!_ignoreListModel.newIgnoreRule(dlg->ignoreListItem())) {
             if (QMessageBox::warning(this,
                     tr("Rule already exists"),
                     tr("There is already a rule\n\"%1\"\nPlease choose another rule.")
-                    .arg(dlg->ignoreListItem().ignoreRule),
+                    .arg(dlg->ignoreListItem().contents()),
                     QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok)
                 == QMessageBox::Cancel)
                 break;
@@ -250,24 +252,24 @@ IgnoreListEditDlg::IgnoreListEditDlg(const IgnoreListManager::IgnoreListItem &it
 
     ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
 
-    ui.ignoreRuleLineEdit->setText(item.ignoreRule);
+    ui.ignoreRuleLineEdit->setText(item.contents());
 
-    if (item.type == IgnoreListManager::MessageIgnore)
+    if (item.type() == IgnoreListManager::MessageIgnore)
         ui.messageTypeButton->setChecked(true);
-    else if (item.type == IgnoreListManager::CtcpIgnore)
+    else if (item.type() == IgnoreListManager::CtcpIgnore)
         ui.ctcpTypeButton->setChecked(true);
     else
         ui.senderTypeButton->setChecked(true);
 
-    ui.isRegExCheckBox->setChecked(item.isRegEx);
-    ui.isActiveCheckBox->setChecked(item.isActive);
+    ui.isRegExCheckBox->setChecked(item.isRegEx());
+    ui.isActiveCheckBox->setChecked(item.isEnabled());
 
-    if (item.strictness == IgnoreListManager::HardStrictness)
+    if (item.strictness() == IgnoreListManager::HardStrictness)
         ui.permanentStrictnessButton->setChecked(true);
     else
         ui.dynamicStrictnessButton->setChecked(true);
 
-    switch (item.scope) {
+    switch (item.scope()) {
     case IgnoreListManager::NetworkScope:
         ui.networkScopeButton->setChecked(true);
         ui.scopeRuleTextEdit->setEnabled(true);
@@ -281,10 +283,10 @@ IgnoreListEditDlg::IgnoreListEditDlg(const IgnoreListManager::IgnoreListItem &it
         ui.scopeRuleTextEdit->setEnabled(false);
     }
 
-    if (item.scope == IgnoreListManager::GlobalScope)
+    if (item.scope() == IgnoreListManager::GlobalScope)
         ui.scopeRuleTextEdit->clear();
     else
-        ui.scopeRuleTextEdit->setPlainText(item.scopeRule);
+        ui.scopeRuleTextEdit->setPlainText(item.scopeRule());
 
     connect(ui.ignoreRuleLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(widgetHasChanged()));
     connect(ui.scopeRuleTextEdit, SIGNAL(textChanged()), this, SLOT(widgetHasChanged()));
@@ -302,49 +304,45 @@ IgnoreListEditDlg::IgnoreListEditDlg(const IgnoreListManager::IgnoreListItem &it
 void IgnoreListEditDlg::widgetHasChanged()
 {
     if (ui.messageTypeButton->isChecked())
-        _clonedIgnoreListItem.type = IgnoreListManager::MessageIgnore;
+        _clonedIgnoreListItem.setType(IgnoreListManager::MessageIgnore);
     else if (ui.ctcpTypeButton->isChecked())
-        _clonedIgnoreListItem.type = IgnoreListManager::CtcpIgnore;
+        _clonedIgnoreListItem.setType(IgnoreListManager::CtcpIgnore);
     else
-        _clonedIgnoreListItem.type = IgnoreListManager::SenderIgnore;
+        _clonedIgnoreListItem.setType(IgnoreListManager::SenderIgnore);
 
     if (ui.permanentStrictnessButton->isChecked())
-        _clonedIgnoreListItem.strictness = IgnoreListManager::HardStrictness;
+        _clonedIgnoreListItem.setStrictness(IgnoreListManager::HardStrictness);
     else
-        _clonedIgnoreListItem.strictness = IgnoreListManager::SoftStrictness;
+        _clonedIgnoreListItem.setStrictness(IgnoreListManager::SoftStrictness);
 
     if (ui.networkScopeButton->isChecked()) {
-        _clonedIgnoreListItem.scope = IgnoreListManager::NetworkScope;
+        _clonedIgnoreListItem.setScope(IgnoreListManager::NetworkScope);
         ui.scopeRuleTextEdit->setEnabled(true);
     }
     else if (ui.channelScopeButton->isChecked()) {
-        _clonedIgnoreListItem.scope = IgnoreListManager::ChannelScope;
+        _clonedIgnoreListItem.setScope(IgnoreListManager::ChannelScope);
         ui.scopeRuleTextEdit->setEnabled(true);
     }
     else {
-        _clonedIgnoreListItem.scope = IgnoreListManager::GlobalScope;
+        _clonedIgnoreListItem.setScope(IgnoreListManager::GlobalScope);
         ui.scopeRuleTextEdit->setEnabled(false);
     }
 
-    if (_clonedIgnoreListItem.scope == IgnoreListManager::GlobalScope) {
-        _clonedIgnoreListItem.scopeRule = QString();
+    if (_clonedIgnoreListItem.scope() == IgnoreListManager::GlobalScope) {
+        _clonedIgnoreListItem.setScopeRule(QString());
     }
     else {
-        QStringList text = ui.scopeRuleTextEdit->toPlainText().split(";", QString::SkipEmptyParts);
-        QStringList::iterator it = text.begin();
-        while (it != text.end()) {
-            *it = it->trimmed();
-            ++it;
-        }
-
-        _clonedIgnoreListItem.scopeRule = text.join("; ");
+        // Trim the resulting MultiWildcard expression
+        _clonedIgnoreListItem.setScopeRule(
+                    ExpressionMatch::trimMultiWildcardWhitespace(
+                        ui.scopeRuleTextEdit->toPlainText()));
     }
 
-    _clonedIgnoreListItem.ignoreRule = ui.ignoreRuleLineEdit->text();
-    _clonedIgnoreListItem.isRegEx = ui.isRegExCheckBox->isChecked();
-    _clonedIgnoreListItem.isActive = ui.isActiveCheckBox->isChecked();
+    _clonedIgnoreListItem.setContents(ui.ignoreRuleLineEdit->text());
+    _clonedIgnoreListItem.setIsRegEx(ui.isRegExCheckBox->isChecked());
+    _clonedIgnoreListItem.setIsEnabled(ui.isActiveCheckBox->isChecked());
 
-    if (!_clonedIgnoreListItem.ignoreRule.isEmpty() && _clonedIgnoreListItem != _ignoreListItem)
+    if (!_clonedIgnoreListItem.contents().isEmpty() && _clonedIgnoreListItem != _ignoreListItem)
         _hasChanged = true;
     else
         _hasChanged = false;