/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel IRC Team *
+ * Copyright (C) 2005-09 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
HighlightSettingsPage::HighlightSettingsPage(QWidget *parent)
- : SettingsPage(tr("Behaviour"), tr("Highlight"), parent) {
+ : SettingsPage(tr("Interface"), tr("Highlight"), parent) {
ui.setupUi(this);
ui.highlightTable->verticalHeader()->hide();
ui.highlightTable->setShowGrid(false);
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->horizontalHeader()->setResizeMode(HighlightSettingsPage::NameColumn, QHeaderView::Stretch);
- ui.highlightTable->horizontalHeader()->setResizeMode(HighlightSettingsPage::RegExColumn, QHeaderView::ResizeToContents);
- ui.highlightTable->horizontalHeader()->setResizeMode(HighlightSettingsPage::CsColumn, QHeaderView::ResizeToContents);
- ui.highlightTable->horizontalHeader()->setResizeMode(HighlightSettingsPage::EnableColumn, QHeaderView::ResizeToContents);
+ ui.highlightTable->horizontalHeader()->setResizeMode(HighlightSettingsPage::RegExColumn, QHeaderView::ResizeToContents);
+ ui.highlightTable->horizontalHeader()->setResizeMode(HighlightSettingsPage::CsColumn, QHeaderView::ResizeToContents);
+ ui.highlightTable->horizontalHeader()->setResizeMode(HighlightSettingsPage::EnableColumn, QHeaderView::ResizeToContents);
+ ui.highlightTable->horizontalHeader()->setResizeMode(HighlightSettingsPage::ChanColumn, QHeaderView::ResizeToContents);
connect(ui.add, SIGNAL(clicked(bool)), this, SLOT(addNewRow()));
connect(ui.remove, SIGNAL(clicked(bool)), this, SLOT(removeSelectedRows()));
connect(ui.highlightAllNicks, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.highlightCurrentNick, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.highlightNoNick, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
+ connect(ui.nicksCaseSensitive, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.add, SIGNAL(clicked()), this, SLOT(widgetHasChanged()));
connect(ui.remove, SIGNAL(clicked()), this, SLOT(widgetHasChanged()));
connect(ui.highlightTable, SIGNAL(itemChanged(QTableWidgetItem *)), this, SLOT(tableChanged(QTableWidgetItem *)));
void HighlightSettingsPage::defaults() {
ui.highlightCurrentNick->setChecked(true);
+ ui.nicksCaseSensitive->setChecked(false);
emptyTable();
widgetHasChanged();
}
-void HighlightSettingsPage::addNewRow(QString name, bool regex, bool cs, bool enable) {
+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);
enableItem->setCheckState(Qt::Unchecked);
enableItem->setFlags(Qt::ItemIsUserCheckable|Qt::ItemIsEnabled|Qt::ItemIsSelectable);
+ QTableWidgetItem *chanNameItem = new QTableWidgetItem(chanName);
+
int lastRow = ui.highlightTable->rowCount()-1;
ui.highlightTable->setItem(lastRow, HighlightSettingsPage::NameColumn, nameItem);
ui.highlightTable->setItem(lastRow, HighlightSettingsPage::RegExColumn, regexItem);
ui.highlightTable->setItem(lastRow, HighlightSettingsPage::CsColumn, csItem);
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["Name"] = name;
+ highlightRule["RegEx"] = regex;
+ highlightRule["CS"] = cs;
+ highlightRule["Enable"] = enable;
+ highlightRule["Chan"] = chanName;
highlightList.append(highlightRule);
}
}
void HighlightSettingsPage::tableChanged(QTableWidgetItem *item) {
- if(item->row()+1 > highlightList.size())
+ if(item->row()+1 > highlightList.size())
return;
QVariantMap highlightRule = highlightList.value(item->row()).toMap();
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;
+ case HighlightSettingsPage::ChanColumn:
+ if(!item->text().isEmpty() && item->text().trimmed().isEmpty())
+ item->setText("");
+ highlightRule["Chan"] = item->text();
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();
+ QString chanName = highlightRule["Chan"].toString();
- addNewRow(name, regex, cs, enable);
+ addNewRow(name, regex, cs, enable, chanName, true);
}
switch(notificationSettings.highlightNick())
ui.highlightAllNicks->setChecked(true);
break;
}
+ ui.nicksCaseSensitive->setChecked(notificationSettings.nicksCaseSensitive());
setChangedState(false);
}
notificationSettings.setHighlightList(highlightList);
NotificationSettings::HighlightNickType highlightNickType;
- if(ui.highlightNoNick->isChecked())
+ if(ui.highlightNoNick->isChecked())
highlightNickType = NotificationSettings::NoNick;
- if(ui.highlightCurrentNick->isChecked())
+ if(ui.highlightCurrentNick->isChecked())
highlightNickType = NotificationSettings::CurrentNick;
- if(ui.highlightAllNicks->isChecked())
+ if(ui.highlightAllNicks->isChecked())
highlightNickType = NotificationSettings::AllNicks;
notificationSettings.setHighlightNick(highlightNickType);
+ notificationSettings.setNicksCaseSensitive(ui.nicksCaseSensitive->isChecked());
load();
setChangedState(false);
NotificationSettings notificationSettings;
NotificationSettings::HighlightNickType highlightNickType;
- if(ui.highlightNoNick->isChecked())
+ if(ui.highlightNoNick->isChecked())
highlightNickType = NotificationSettings::NoNick;
- if(ui.highlightCurrentNick->isChecked())
+ if(ui.highlightCurrentNick->isChecked())
highlightNickType = NotificationSettings::CurrentNick;
- if(ui.highlightAllNicks->isChecked())
+ if(ui.highlightAllNicks->isChecked())
highlightNickType = NotificationSettings::AllNicks;
if(notificationSettings.highlightNick() != highlightNickType) return true;
+ if(notificationSettings.nicksCaseSensitive() != ui.nicksCaseSensitive->isChecked()) return true;
if(notificationSettings.highlightList() != highlightList) return true;
- return true;
+ return false;
}
-
-
-
-