continue;
}
- QRegExp rx;
- if (rule.isRegEx) {
- rx = QRegExp(rule.name, rule.isCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive);
+ bool nameMatch = false;
+ if (rule.name.isEmpty()) {
+ // Empty rule, matches any message
+ nameMatch = true;
} else {
- rx = QRegExp("(^|\\W)" + QRegExp::escape(rule.name) + "(\\W|$)", rule.isCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive);
+ // Check according to specified rule
+ QRegExp rx;
+ if (rule.isRegEx) {
+ rx = QRegExp(rule.name,
+ rule.isCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive);
+ } else {
+ rx = QRegExp("(^|\\W)" + QRegExp::escape(rule.name) + "(\\W|$)",
+ rule.isCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive);
+ }
+ nameMatch = (rx.indexIn(stripFormatCodes(msgContents)) >= 0);
}
- bool nameMatch = (rx.indexIn(stripFormatCodes(msgContents)) >= 0);
bool senderMatch;
if (rule.sender.isEmpty()) {
return tr("Enable/disable this rule");
case CoreHighlightSettingsPage::NameColumn:
- return tr("Phrase to match");
+ return tr("Phrase to match, leave blank to match any message");
case CoreHighlightSettingsPage::RegExColumn:
return tr("<b>RegEx</b>: This option determines if the highlight rule, <i>Sender</i>, and "
highlightRule.isEnabled = (item->checkState() == Qt::Checked);
break;
case CoreHighlightSettingsPage::NameColumn:
- if (item->text() == "")
- item->setText(tr("this shouldn't be empty"));
highlightRule.name = item->text();
break;
case CoreHighlightSettingsPage::RegExColumn:
ignoredRule.isEnabled = (item->checkState() == Qt::Checked);
break;
case CoreHighlightSettingsPage::NameColumn:
- if (item->text() == "")
- item->setText(tr("this shouldn't be empty"));
ignoredRule.name = item->text();
break;
case CoreHighlightSettingsPage::RegExColumn: