QVariantList isRegEx;
QVariantList isCaseSensitive;
QVariantList isActive;
+ QVariantList isInverse;
QStringList channel;
for (int i = 0; i < _highlightRuleList.count(); i++) {
isRegEx << _highlightRuleList[i].isRegEx;
isCaseSensitive << _highlightRuleList[i].isCaseSensitive;
isActive << _highlightRuleList[i].isEnabled;
+ isInverse << _highlightRuleList[i].isInverse;
channel << _highlightRuleList[i].chanName;
}
highlightRuleListMap["isRegEx"] = isRegEx;
highlightRuleListMap["isCaseSensitive"] = isCaseSensitive;
highlightRuleListMap["isEnabled"] = isActive;
+ highlightRuleListMap["isInverse"] = isInverse;
highlightRuleListMap["channel"] = channel;
highlightRuleListMap["highlightNick"] = _highlightNick;
highlightRuleListMap["nicksCaseSensitive"] = _nicksCaseSensitive;
QVariantList isRegEx = highlightRuleList["isRegEx"].toList();
QVariantList isCaseSensitive = highlightRuleList["isCaseSensitive"].toList();
QVariantList isActive = highlightRuleList["isEnabled"].toList();
+ QVariantList isInverse = highlightRuleList["isInverse"].toList();
QStringList channel = highlightRuleList["channel"].toStringList();
int count = name.count();
_highlightRuleList.clear();
for (int i = 0; i < name.count(); i++) {
_highlightRuleList << HighlightRule(name[i], isRegEx[i].toBool(), isCaseSensitive[i].toBool(),
- isActive[i].toBool(), channel[i]);
+ isActive[i].toBool(), isInverse[i].toBool(), channel[i]);
}
_highlightNick = HighlightNickType(highlightRuleList["highlightNick"].toInt());
_nicksCaseSensitive = highlightRuleList["nicksCaseSensitive"].toBool();
}
void HighlightRuleManager::addHighlightRule(const QString &name, bool isRegEx, bool isCaseSensitive, bool isActive,
- const QString &channel)
+ bool isInverse, const QString &channel)
{
if (contains(name)) {
return;
}
- HighlightRule newItem = HighlightRule(name, isRegEx, isCaseSensitive, isActive, channel);
+ HighlightRule newItem = HighlightRule(name, isRegEx, isCaseSensitive, isActive, isInverse, channel);
_highlightRuleList << newItem;
- SYNC(ARG(name), ARG(isRegEx), ARG(isCaseSensitive), ARG(isActive), ARG(channel))
+ SYNC(ARG(name), ARG(isRegEx), ARG(isCaseSensitive), ARG(isActive), ARG(isInverse), ARG(channel))
}
return false;
}
+ bool matches = false;
+
+ for (int i = 0; i < _highlightRuleList.count(); i++) {
+ const HighlightRule &rule = _highlightRuleList.at(i);
+ if (!rule.isEnabled)
+ continue;
+
+ if (rule.chanName.size() > 0 && rule.chanName.compare(".*") != 0) {
+ if (rule.chanName.startsWith("!")) {
+ QRegExp rx(rule.chanName.mid(1), Qt::CaseInsensitive);
+ if (rx.exactMatch(bufferName))
+ continue;
+ }
+ else {
+ QRegExp rx(rule.chanName, Qt::CaseInsensitive);
+ if (!rx.exactMatch(bufferName))
+ continue;
+ }
+ }
+
+ 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);
+ }
+ bool match = (rx.indexIn(stripFormatCodes(msgContents)) >= 0);
+ if (match) {
+ // If an inverse rule matches, then we know that we never want to return a highlight.
+ if (rule.isInverse) {
+ return false;
+ } else {
+ matches = true;
+ }
+ }
+ }
+
+ if (matches)
+ return true;
+
if (!currentNick.isEmpty()) {
QStringList nickList;
if (_highlightNick == CurrentNick) {
if (!nickList.contains(currentNick))
nickList.prepend(currentNick);
}
- foreach(QString nickname, nickList) {
- QRegExp nickRegExp("(^|\\W)" + QRegExp::escape(nickname) + "(\\W|$)", _nicksCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive);
- if (nickRegExp.indexIn(stripFormatCodes(msgContents)) >= 0) {
- return true;
- }
- }
- for (int i = 0; i < _highlightRuleList.count(); i++) {
- const HighlightRule &rule = _highlightRuleList.at(i);
- if (!rule.isEnabled)
- continue;
-
- if (rule.chanName.size() > 0 && rule.chanName.compare(".*") != 0) {
- if (rule.chanName.startsWith("!")) {
- QRegExp rx(rule.chanName.mid(1), Qt::CaseInsensitive);
- if (rx.exactMatch(bufferName))
- continue;
- }
- else {
- QRegExp rx(rule.chanName, Qt::CaseInsensitive);
- if (!rx.exactMatch(bufferName))
- continue;
- }
- }
-
- 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);
- }
- bool match = (rx.indexIn(stripFormatCodes(msgContents)) >= 0);
- if (match) {
+ for(const QString &nickname : nickList) {
+ QRegExp nickRegExp("(^|\\W)" + QRegExp::escape(nickname) + "(\\W|$)", _nicksCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive);
+ if (nickRegExp.indexIn(stripFormatCodes(msgContents)) >= 0) {
return true;
}
}
bool isRegEx = false;
bool isCaseSensitive = false;
bool isEnabled = true;
+ bool isInverse = false;
QString chanName;
HighlightRule() {}
HighlightRule(const QString &name_, bool isRegEx_, bool isCaseSensitive_,
- bool isEnabled_, const QString &chanName_)
- : name(name_), isRegEx(isRegEx_), isCaseSensitive(isCaseSensitive_), isEnabled(isEnabled_), chanName(chanName_) {
+ bool isEnabled_, bool isInverse_, const QString &chanName_)
+ : name(name_), isRegEx(isRegEx_), isCaseSensitive(isCaseSensitive_), isEnabled(isEnabled_),
+ isInverse(isInverse_), chanName(chanName_) {
}
bool operator!=(const HighlightRule &other)
{
isRegEx != other.isRegEx ||
isCaseSensitive != other.isCaseSensitive ||
isEnabled != other.isEnabled ||
+ isInverse != other.isInverse ||
chanName != other.chanName);
}
};
* @param chanName The channel in which the rule should apply
*/
virtual inline void requestAddHighlightRule(const QString &name, bool isRegEx, bool isCaseSensitive, bool isEnabled,
- const QString &chanName)
+ bool isInverse, const QString &chanName)
{
- REQUEST(ARG(name), ARG(isRegEx), ARG(isCaseSensitive), ARG(isEnabled), ARG(chanName))
+ REQUEST(ARG(name), ARG(isRegEx), ARG(isCaseSensitive), ARG(isEnabled), ARG(isInverse), ARG(chanName))
}
virtual void addHighlightRule(const QString &name, bool isRegEx, bool isCaseSensitive,
- bool isEnabled, const QString &chanName);
+ bool isEnabled, bool isInverse, const QString &chanName);
virtual inline void requestSetHighlightNick(HighlightNickType highlightNick)
{
bool _match(const QString &msgContents, const QString &msgSender, Message::Type msgType, Message::Flags msgFlags, const QString &bufferName, const QString ¤tNick, const QStringList identityNicks);
signals:
- void ruleAdded(QString name, bool isRegEx, bool isCaseSensitive, bool isEnabled, QString chanName);
+ void ruleAdded(QString name, bool isRegEx, bool isCaseSensitive, bool isEnabled, bool isInverse, QString chanName);
private:
HighlightRuleList _highlightRuleList;
virtual inline void requestToggleHighlightRule(const QString &highlightRule) { toggleHighlightRule(highlightRule); }
virtual inline void requestRemoveHighlightRule(const QString &highlightRule) { removeHighlightRule(highlightRule); }
virtual inline void requestAddHighlightRule(const QString &name, bool isRegEx, bool isCaseSensitive,
- bool isEnabled, const QString &chanName)
+ bool isEnabled, bool isInverse, const QString &chanName)
{
- addHighlightRule(name, isRegEx, isCaseSensitive, isEnabled, chanName);
+ addHighlightRule(name, isRegEx, isCaseSensitive, isEnabled, isInverse, chanName);
}
ui.highlightTable->horizontalHeader()->setSectionResizeMode(CoreHighlightSettingsPage::RegExColumn, QHeaderView::ResizeToContents);
ui.highlightTable->horizontalHeader()->setSectionResizeMode(CoreHighlightSettingsPage::CsColumn, QHeaderView::ResizeToContents);
ui.highlightTable->horizontalHeader()->setSectionResizeMode(CoreHighlightSettingsPage::EnableColumn, QHeaderView::ResizeToContents);
+ ui.highlightTable->horizontalHeader()->setSectionResizeMode(CoreHighlightSettingsPage::InverseColumn, QHeaderView::ResizeToContents);
ui.highlightTable->horizontalHeader()->setSectionResizeMode(CoreHighlightSettingsPage::ChanColumn, QHeaderView::ResizeToContents);
#endif
}
-void CoreHighlightSettingsPage::addNewRow(QString name, bool regex, bool cs, bool enable, QString chanName, bool self)
+void CoreHighlightSettingsPage::addNewRow(QString name, bool regex, bool cs, bool enable, bool inverse, QString chanName, bool self)
{
ui.highlightTable->setRowCount(ui.highlightTable->rowCount()+1);
enableItem->setCheckState(Qt::Unchecked);
enableItem->setFlags(Qt::ItemIsUserCheckable|Qt::ItemIsEnabled|Qt::ItemIsSelectable);
+ auto *inverseItem = new QTableWidgetItem("");
+ if (inverse)
+ inverseItem->setCheckState(Qt::Checked);
+ else
+ inverseItem->setCheckState(Qt::Unchecked);
+ inverseItem->setFlags(Qt::ItemIsUserCheckable|Qt::ItemIsEnabled|Qt::ItemIsSelectable);
+
auto *chanNameItem = new QTableWidgetItem(chanName);
int lastRow = ui.highlightTable->rowCount()-1;
ui.highlightTable->setItem(lastRow, CoreHighlightSettingsPage::RegExColumn, regexItem);
ui.highlightTable->setItem(lastRow, CoreHighlightSettingsPage::CsColumn, csItem);
ui.highlightTable->setItem(lastRow, CoreHighlightSettingsPage::EnableColumn, enableItem);
+ ui.highlightTable->setItem(lastRow, CoreHighlightSettingsPage::InverseColumn, inverseItem);
ui.highlightTable->setItem(lastRow, CoreHighlightSettingsPage::ChanColumn, chanNameItem);
if (!self)
ui.highlightTable->setCurrentItem(nameItem);
- highlightList << HighlightRuleManager::HighlightRule(name, regex, cs, enable, chanName);
+ highlightList << HighlightRuleManager::HighlightRule(name, regex, cs, enable, inverse, chanName);
}
case CoreHighlightSettingsPage::EnableColumn:
highlightRule.isEnabled = (item->checkState() == Qt::Checked);
break;
+ case CoreHighlightSettingsPage::InverseColumn:
+ highlightRule.isInverse = (item->checkState() == Qt::Checked);
+ break;
case CoreHighlightSettingsPage::ChanColumn:
if (!item->text().isEmpty() && item->text().trimmed().isEmpty())
item->setText("");
auto ruleManager = Client::highlightRuleManager();
for (HighlightRuleManager::HighlightRule rule : ruleManager->highlightRuleList()) {
- addNewRow(rule.name, rule.isRegEx, rule.isCaseSensitive, rule.isEnabled, rule.chanName);
+ addNewRow(rule.name, rule.isRegEx, rule.isCaseSensitive, rule.isEnabled, rule.isInverse, rule.chanName);
}
switch (ruleManager->highlightNick())
clonedManager.clear();
for (const HighlightRuleManager::HighlightRule &rule : highlightList) {
- clonedManager.addHighlightRule(rule.name, rule.isRegEx, rule.isCaseSensitive, rule.isRegEx, rule.chanName);
+ clonedManager.addHighlightRule(rule.name, rule.isRegEx, rule.isCaseSensitive, rule.isEnabled, rule.isInverse, rule.chanName);
}
HighlightRuleManager::HighlightNickType highlightNickType = HighlightRuleManager::NoNick;
private slots:
void widgetHasChanged();
- void addNewRow(QString name = tr("highlight rule"), bool regex = false, bool cs = false, bool enable = true, QString chanName = "", bool self = false);
+ void addNewRow(QString name = tr("highlight rule"), bool regex = false, bool cs = false, bool enable = true, bool inverse = false, QString chanName = "", bool self = false);
void removeSelectedRows();
void selectRow(QTableWidgetItem *item);
void tableChanged(QTableWidgetItem *item);
RegExColumn = 1,
CsColumn = 2,
EnableColumn = 3,
- ChanColumn = 4,
- ColumnCount = 5
+ InverseColumn = 4,
+ ChanColumn = 5,
+ ColumnCount = 6
};
void emptyTable();
<string>Enable</string>
</property>
</column>
+ <column>
+ <property name="text">
+ <string>Inverse</string>
+ </property>
+ </column>
<column>
<property name="text">
<string>Channel</string>