Put "Enabled" at front of Local Highlights table column order,
matching the ordering and name of Remote Highlights.
{
ui.highlightTable->setRowCount(ui.highlightTable->rowCount()+1);
{
ui.highlightTable->setRowCount(ui.highlightTable->rowCount()+1);
+ QTableWidgetItem *enableItem = new QTableWidgetItem("");
+ if (enable)
+ enableItem->setCheckState(Qt::Checked);
+ else
+ enableItem->setCheckState(Qt::Unchecked);
+ enableItem->setFlags(Qt::ItemIsUserCheckable|Qt::ItemIsEnabled|Qt::ItemIsSelectable);
+
QTableWidgetItem *nameItem = new QTableWidgetItem(name);
QTableWidgetItem *regexItem = new QTableWidgetItem("");
QTableWidgetItem *nameItem = new QTableWidgetItem(name);
QTableWidgetItem *regexItem = new QTableWidgetItem("");
csItem->setCheckState(Qt::Unchecked);
csItem->setFlags(Qt::ItemIsUserCheckable|Qt::ItemIsEnabled|Qt::ItemIsSelectable);
csItem->setCheckState(Qt::Unchecked);
csItem->setFlags(Qt::ItemIsUserCheckable|Qt::ItemIsEnabled|Qt::ItemIsSelectable);
- QTableWidgetItem *enableItem = new QTableWidgetItem("");
- if (enable)
- enableItem->setCheckState(Qt::Checked);
- else
- enableItem->setCheckState(Qt::Unchecked);
- enableItem->setFlags(Qt::ItemIsUserCheckable|Qt::ItemIsEnabled|Qt::ItemIsSelectable);
-
QTableWidgetItem *chanNameItem = new QTableWidgetItem(chanName);
int lastRow = ui.highlightTable->rowCount()-1;
QTableWidgetItem *chanNameItem = new QTableWidgetItem(chanName);
int lastRow = ui.highlightTable->rowCount()-1;
+ ui.highlightTable->setItem(lastRow, HighlightSettingsPage::EnableColumn, enableItem);
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::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->setItem(lastRow, HighlightSettingsPage::ChanColumn, chanNameItem);
if (!self)
switch (item->column())
{
switch (item->column())
{
+ case HighlightSettingsPage::EnableColumn:
+ highlightRule["Enable"] = (item->checkState() == Qt::Checked);
+ break;
case HighlightSettingsPage::NameColumn:
if (item->text() == "")
item->setText(tr("this shouldn't be empty"));
case HighlightSettingsPage::NameColumn:
if (item->text() == "")
item->setText(tr("this shouldn't be empty"));
case HighlightSettingsPage::CsColumn:
highlightRule["CS"] = (item->checkState() == Qt::Checked);
break;
case HighlightSettingsPage::CsColumn:
highlightRule["CS"] = (item->checkState() == Qt::Checked);
break;
- case HighlightSettingsPage::EnableColumn:
- highlightRule["Enable"] = (item->checkState() == Qt::Checked);
- break;
case HighlightSettingsPage::ChanColumn:
if (!item->text().isEmpty() && item->text().trimmed().isEmpty())
item->setText("");
case HighlightSettingsPage::ChanColumn:
if (!item->text().isEmpty() && item->text().trimmed().isEmpty())
item->setText("");
// name: QString
// enable: bool
enum column {
// name: QString
// enable: bool
enum column {
- NameColumn = 0,
- RegExColumn = 1,
- CsColumn = 2,
- EnableColumn = 3,
+ EnableColumn = 0,
+ NameColumn = 1,
+ RegExColumn = 2,
+ CsColumn = 3,
ChanColumn = 4,
ColumnCount = 5
};
ChanColumn = 4,
ColumnCount = 5
};
</property>
<column>
<property name="text">
</property>
<column>
<property name="text">
- <string>Highlight</string>
+ <string>Enabled</string>
</property>
</column>
<column>
<property name="text">
</property>
</column>
<column>
<property name="text">
+ <string>Highlight</string>
</property>
</column>
<column>
<property name="text">
</property>
</column>
<column>
<property name="text">
</property>
</column>
<column>
<property name="text">
</property>
</column>
<column>
<property name="text">
- <string>Enable</string>
</property>
</column>
<column>
</property>
</column>
<column>