X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fcorehighlightsettingspage.cpp;h=3de8d7667fb082b6afdfc9ec5cd2ad8d5631d60d;hb=b40672ab5c48b577b31371c159e60d330fdd7ce5;hp=24c78c1c4d930e7812abdbb12b3beaf342e2bcb1;hpb=824852f39114a70b69f71ac154650b71a9394f3c;p=quassel.git diff --git a/src/qtui/settingspages/corehighlightsettingspage.cpp b/src/qtui/settingspages/corehighlightsettingspage.cpp index 24c78c1c..3de8d766 100644 --- a/src/qtui/settingspages/corehighlightsettingspage.cpp +++ b/src/qtui/settingspages/corehighlightsettingspage.cpp @@ -187,8 +187,8 @@ QString CoreHighlightSettingsPage::getTableTooltip(column tableColumn) const "any nickname starting with Announce
"); case CoreHighlightSettingsPage::ChanColumn: - return tr("Channel: Semicolon separated list of channel names, leave blank to " - "match any name.
" + return tr("Channel: Semicolon separated list of channel/query names, leave blank " + "to match any name.
" "Example:
"
"#quassel*; #foobar; !#quasseldroid
"
"would match on #foobar and any channel starting with #quassel "
@@ -547,26 +547,26 @@ void CoreHighlightSettingsPage::highlightTableChanged(QTableWidgetItem *item)
switch (item->column()) {
case CoreHighlightSettingsPage::EnableColumn:
- highlightRule.isEnabled = (item->checkState() == Qt::Checked);
+ highlightRule.setIsEnabled(item->checkState() == Qt::Checked);
break;
case CoreHighlightSettingsPage::NameColumn:
- highlightRule.name = item->text();
+ highlightRule.setContents(item->text());
break;
case CoreHighlightSettingsPage::RegExColumn:
- highlightRule.isRegEx = (item->checkState() == Qt::Checked);
+ highlightRule.setIsRegEx(item->checkState() == Qt::Checked);
break;
case CoreHighlightSettingsPage::CsColumn:
- highlightRule.isCaseSensitive = (item->checkState() == Qt::Checked);
+ highlightRule.setIsCaseSensitive(item->checkState() == Qt::Checked);
break;
case CoreHighlightSettingsPage::SenderColumn:
if (!item->text().isEmpty() && item->text().trimmed().isEmpty())
item->setText("");
- highlightRule.sender = item->text();
+ highlightRule.setSender(item->text());
break;
case CoreHighlightSettingsPage::ChanColumn:
if (!item->text().isEmpty() && item->text().trimmed().isEmpty())
item->setText("");
- highlightRule.chanName = item->text();
+ highlightRule.setChanName(item->text());
break;
}
highlightList[item->row()] = highlightRule;
@@ -584,26 +584,26 @@ void CoreHighlightSettingsPage::ignoredTableChanged(QTableWidgetItem *item)
switch (item->column()) {
case CoreHighlightSettingsPage::EnableColumn:
- ignoredRule.isEnabled = (item->checkState() == Qt::Checked);
+ ignoredRule.setIsEnabled(item->checkState() == Qt::Checked);
break;
case CoreHighlightSettingsPage::NameColumn:
- ignoredRule.name = item->text();
+ ignoredRule.setContents(item->text());
break;
case CoreHighlightSettingsPage::RegExColumn:
- ignoredRule.isRegEx = (item->checkState() == Qt::Checked);
+ ignoredRule.setIsRegEx(item->checkState() == Qt::Checked);
break;
case CoreHighlightSettingsPage::CsColumn:
- ignoredRule.isCaseSensitive = (item->checkState() == Qt::Checked);
+ ignoredRule.setIsCaseSensitive(item->checkState() == Qt::Checked);
break;
case CoreHighlightSettingsPage::SenderColumn:
if (!item->text().isEmpty() && item->text().trimmed().isEmpty())
item->setText("");
- ignoredRule.sender = item->text();
+ ignoredRule.setSender(item->text());
break;
case CoreHighlightSettingsPage::ChanColumn:
if (!item->text().isEmpty() && item->text().trimmed().isEmpty())
item->setText("");
- ignoredRule.chanName = item->text();
+ ignoredRule.setChanName(item->text());
break;
}
ignoredList[item->row()] = ignoredRule;
@@ -619,18 +619,13 @@ void CoreHighlightSettingsPage::load()
auto ruleManager = Client::highlightRuleManager();
if (ruleManager) {
for (auto &rule : ruleManager->highlightRuleList()) {
- if (rule.isInverse) {
- addNewIgnoredRow(rule.isEnabled,
- rule.id,
- rule.name,
- rule.isRegEx,
- rule.isCaseSensitive,
- rule.sender,
- rule.chanName);
+ if (rule.isInverse()) {
+ addNewIgnoredRow(rule.isEnabled(), rule.id(), rule.contents(), rule.isRegEx(),
+ rule.isCaseSensitive(), rule.sender(), rule.chanName());
}
else {
- addNewHighlightRow(rule.isEnabled, rule.id, rule.name, rule.isRegEx, rule.isCaseSensitive, rule.sender,
- rule.chanName);
+ addNewHighlightRow(rule.isEnabled(), rule.id(), rule.contents(), rule.isRegEx(),
+ rule.isCaseSensitive(), rule.sender(), rule.chanName());
}
}
@@ -665,13 +660,15 @@ void CoreHighlightSettingsPage::save()
clonedManager.clear();
for (auto &rule : highlightList) {
- clonedManager.addHighlightRule(rule.id, rule.name, rule.isRegEx, rule.isCaseSensitive, rule.isEnabled, false,
- rule.sender, rule.chanName);
+ clonedManager.addHighlightRule(rule.id(), rule.contents(), rule.isRegEx(),
+ rule.isCaseSensitive(), rule.isEnabled(), false,
+ rule.sender(), rule.chanName());
}
for (auto &rule : ignoredList) {
- clonedManager.addHighlightRule(rule.id, rule.name, rule.isRegEx, rule.isCaseSensitive, rule.isEnabled, true,
- rule.sender, rule.chanName);
+ clonedManager.addHighlightRule(rule.id(), rule.contents(), rule.isRegEx(),
+ rule.isCaseSensitive (), rule.isEnabled(), true,
+ rule.sender(), rule.chanName());
}
auto highlightNickType = ui.highlightNicksComboBox->itemData(ui.highlightNicksComboBox->currentIndex()).value