ui.highlightTable->horizontalHeaderItem(HighlightSettingsPage::CsColumn)->setToolTip("<b>CS</b>: This option determines if the highlight rule should be interpreted <b>case sensitive</b>.");
ui.highlightTable->horizontalHeaderItem(HighlightSettingsPage::CsColumn)->setWhatsThis("<b>CS</b>: This option determines if the highlight rule should be interpreted <b>case sensitive</b>.");
- ui.highlightTable->horizontalHeaderItem(HighlightSettingsPage::ChanColumn)->setToolTip("<b>Chan</b>: This regular expression determines for which <b>Channels</b> the highlight rule works. Leave blank to match any channel. Put <b>!</b> in the beginning to negate. Case insensitive.");
- ui.highlightTable->horizontalHeaderItem(HighlightSettingsPage::ChanColumn)->setWhatsThis("<b>Chan</b>: This regular expression determines for which <b>Channels</b> the highlight rule works. Leave blank to match any channel. Put <b>!</b> in the beginning to negate. Case insensitive.");
+ ui.highlightTable->horizontalHeaderItem(HighlightSettingsPage::ChanColumn)->setToolTip("<b>Channel</b>: This regular expression determines for which <b>channels</b> the highlight rule works. Leave blank to match any channel. Put <b>!</b> in the beginning to negate. Case insensitive.");
+ ui.highlightTable->horizontalHeaderItem(HighlightSettingsPage::ChanColumn)->setWhatsThis("<b>Channel</b>: This regular expression determines for which <b>channels</b> the highlight rule works. Leave blank to match any channel. Put <b>!</b> in the beginning to negate. Case insensitive.");
ui.highlightTable->horizontalHeader()->setResizeMode(HighlightSettingsPage::NameColumn, QHeaderView::Stretch);
ui.highlightTable->horizontalHeader()->setResizeMode(HighlightSettingsPage::RegExColumn, QHeaderView::ResizeToContents);
widgetHasChanged();
}
-void HighlightSettingsPage::addNewRow(QString name, bool regex, bool cs, bool enable, QString chanName) {
+void HighlightSettingsPage::addNewRow(QString name, bool regex, bool cs, bool enable, QString chanName, bool self) {
ui.highlightTable->setRowCount(ui.highlightTable->rowCount()+1);
QTableWidgetItem *nameItem = new QTableWidgetItem(name);
ui.highlightTable->setItem(lastRow, HighlightSettingsPage::EnableColumn, enableItem);
ui.highlightTable->setItem(lastRow, HighlightSettingsPage::ChanColumn, chanNameItem);
+ if(!self)
+ ui.highlightTable->setCurrentItem(nameItem);
+
QVariantMap highlightRule;
highlightRule["Name"] = name;
highlightRule["RegEx"] = regex;
highlightRule["CS"] = cs;
highlightRule["Enable"] = enable;
- highlightRule["Chan"] = chanName;
+ highlightRule["Channel"] = chanName;
highlightList.append(highlightRule);
}
highlightRule["Enable"] = (item->checkState() == Qt::Checked);
break;
case HighlightSettingsPage::ChanColumn:
- if(item->text().size() > 0 && item->text().trimmed().size() == 0)
+ if(!item->text().isEmpty() && item->text().trimmed().isEmpty())
item->setText("");
- highlightRule["Chan"] = item->text();
+ highlightRule["Channel"] = item->text();
break;
}
highlightList[item->row()] = highlightRule;
bool regex = highlightRule["RegEx"].toBool();
bool cs = highlightRule["CS"].toBool();
bool enable = highlightRule["Enable"].toBool();
- QString chanName = highlightRule["Chan"].toString();
+ QString chanName = highlightRule["Channel"].toString();
- addNewRow(name, regex, cs, enable, chanName);
+ addNewRow(name, regex, cs, enable, chanName, true);
}
switch(notificationSettings.highlightNick())