As a side effect, you'll have to set your custom highlights again, we have moved
stuff around in the config.
}
void NotificationSettings::setHighlightList(const QVariantList &highlightList) {
- setLocalValue("highlightList", highlightList);
+ setLocalValue("Highlights/CustomList", highlightList);
}
QVariantList NotificationSettings::highlightList() {
- return localValue("highlightList").toList();
+ return localValue("Highlights/CustomList").toList();
}
void NotificationSettings::setHighlightNick(NotificationSettings::HighlightNickType highlightNickType) {
- setLocalValue("highlightNick", highlightNickType);
+ setLocalValue("Highlights/HighlightNick", highlightNickType);
}
NotificationSettings::HighlightNickType NotificationSettings::highlightNick() {
- return (NotificationSettings::HighlightNickType) localValue("highlightNick", CurrentNick).toInt();
+ return (NotificationSettings::HighlightNickType) localValue("Highlights/HighlightNick", CurrentNick).toInt();
}
void NotificationSettings::setNicksCaseSensitive(bool cs) {
}
bool NotificationSettings::nicksCaseSensitive() {
- return localValue("Highlights/NicksCaseSensitive", true).toBool();
+ return localValue("Highlights/NicksCaseSensitive", false).toBool();
}
_highlightNick = notificationSettings.highlightNick();
highlightListChanged(notificationSettings.highlightList());
notificationSettings.notify("Highlights/NicksCaseSensitive", this, SLOT(nicksCaseSensitiveChanged(const QVariant &)));
- notificationSettings.notify("highlightList", this, SLOT(highlightListChanged(const QVariant &)));
- notificationSettings.notify("highlightNick", this, SLOT(highlightNickChanged(const QVariant &)));
+ notificationSettings.notify("Highlights/CustomList", this, SLOT(highlightListChanged(const QVariant &)));
+ notificationSettings.notify("Highlights/HighlightNick", this, SLOT(highlightNickChanged(const QVariant &)));
_processTimer.setInterval(0);
connect(&_processTimer, SIGNAL(timeout()), this, SLOT(processNextMessage()));
_highlightRules.clear();
QVariantList::const_iterator iter = varList.constBegin();
- QVariantList::const_iterator iterEnd = varList.constEnd();
- while(iter != iterEnd) {
- QVariantMap rule;
- _highlightRules << HighlightRule(rule["name"].toString(),
- rule["enable"].toBool(),
- rule["cs"].toBool() ? Qt::CaseSensitive : Qt::CaseInsensitive,
- rule["regex"].toBool());
+ while(iter != varList.constEnd()) {
+ QVariantMap rule = iter->toMap();
+ _highlightRules << HighlightRule(rule["Name"].toString(),
+ rule["Enable"].toBool(),
+ rule["CS"].toBool() ? Qt::CaseSensitive : Qt::CaseInsensitive,
+ rule["RegEx"].toBool());
iter++;
}
}
void HighlightSettingsPage::defaults() {
ui.highlightCurrentNick->setChecked(true);
- ui.nicksCaseSensitive->setChecked(true);
+ ui.nicksCaseSensitive->setChecked(false);
emptyTable();
widgetHasChanged();
ui.highlightTable->setItem(lastRow, HighlightSettingsPage::EnableColumn, enableItem);
QVariantMap highlightRule;
- highlightRule["name"] = name;
- highlightRule["regex"] = regex;
- highlightRule["cs"] = cs;
- highlightRule["enable"] = enable;
+ highlightRule["Name"] = name;
+ highlightRule["RegEx"] = regex;
+ highlightRule["CS"] = cs;
+ highlightRule["Enable"] = enable;
highlightList.append(highlightRule);
}
case HighlightSettingsPage::NameColumn:
if(item->text() == "")
item->setText(tr("this shouldn't be empty"));
- highlightRule["name"] = item->text();
+ highlightRule["Name"] = item->text();
break;
case HighlightSettingsPage::RegExColumn:
- highlightRule["regex"] = (item->checkState() == Qt::Checked);
+ highlightRule["RegEx"] = (item->checkState() == Qt::Checked);
break;
case HighlightSettingsPage::CsColumn:
- highlightRule["cs"] = (item->checkState() == Qt::Checked);
+ highlightRule["CS"] = (item->checkState() == Qt::Checked);
break;
case HighlightSettingsPage::EnableColumn:
- highlightRule["enable"] = (item->checkState() == Qt::Checked);
+ highlightRule["Enable"] = (item->checkState() == Qt::Checked);
break;
}
highlightList[item->row()] = highlightRule;
foreach(QVariant highlight, notificationSettings.highlightList()) {
QVariantMap highlightRule = highlight.toMap();
- QString name = highlightRule["name"].toString();
- bool regex = highlightRule["regex"].toBool();
- bool cs = highlightRule["cs"].toBool();
- bool enable = highlightRule["enable"].toBool();
+ QString name = highlightRule["Name"].toString();
+ bool regex = highlightRule["RegEx"].toBool();
+ bool cs = highlightRule["CS"].toBool();
+ bool enable = highlightRule["Enable"].toBool();
addNewRow(name, regex, cs, enable);
}