Chan -> Channel, it's just nicer in user-visible strings

Though that doesn't save us from the fact that the highlight edit thingy
needs a serious revamp, it's utterly fugly.

diff --git a/src/qtui/qtuimessageprocessor.cpp b/src/qtui/qtuimessageprocessor.cpp
index aa24f08..4754a02 100644 (file)
--- a/src/qtui/qtuimessageprocessor.cpp
+++ b/src/qtui/qtuimessageprocessor.cpp
@@ -173,7 +173,7 @@ void QtUiMessageProcessor::highlightListChanged(const QVariant &variant) {
                                      rule["Enable"].toBool(),
                                      rule["CS"].toBool() ? Qt::CaseSensitive : Qt::CaseInsensitive,
                                      rule["RegEx"].toBool(),
                                      rule["Enable"].toBool(),
                                      rule["CS"].toBool() ? Qt::CaseSensitive : Qt::CaseInsensitive,
                                      rule["RegEx"].toBool(),

-                                     rule["Chan"].toString());
+                                     rule["Channel"].toString());

     iter++;
   }
 }
     iter++;
   }
 }

diff --git a/src/qtui/settingspages/highlightsettingspage.cpp b/src/qtui/settingspages/highlightsettingspage.cpp
index 22b4afe..5005b3d 100644 (file)
--- a/src/qtui/settingspages/highlightsettingspage.cpp
+++ b/src/qtui/settingspages/highlightsettingspage.cpp
@@ -38,8 +38,8 @@ HighlightSettingsPage::HighlightSettingsPage(QWidget *parent)
   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::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);
 
   ui.highlightTable->horizontalHeader()->setResizeMode(HighlightSettingsPage::NameColumn, QHeaderView::Stretch);
   ui.highlightTable->horizontalHeader()->setResizeMode(HighlightSettingsPage::RegExColumn, QHeaderView::ResizeToContents);


@@ -116,7 +116,7 @@ void HighlightSettingsPage::addNewRow(QString name, bool regex, bool cs, bool en
   highlightRule["RegEx"] = regex;
   highlightRule["CS"] = cs;
   highlightRule["Enable"] = enable;
   highlightRule["RegEx"] = regex;
   highlightRule["CS"] = cs;
   highlightRule["Enable"] = enable;

-  highlightRule["Chan"] = chanName;
+  highlightRule["Channel"] = chanName;

 
   highlightList.append(highlightRule);
 }
 
   highlightList.append(highlightRule);
 }


@@ -182,7 +182,7 @@ void HighlightSettingsPage::tableChanged(QTableWidgetItem *item) {
     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("");

-      highlightRule["Chan"] = item->text();
+      highlightRule["Channel"] = item->text();

       break;
   }
   highlightList[item->row()] = highlightRule;
       break;
   }
   highlightList[item->row()] = highlightRule;


@@ -200,7 +200,7 @@ void HighlightSettingsPage::load() {
     bool regex = highlightRule["RegEx"].toBool();
     bool cs = highlightRule["CS"].toBool();
     bool enable = highlightRule["Enable"].toBool();
     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, true);
   }
 
     addNewRow(name, regex, cs, enable, chanName, true);
   }

diff --git a/src/qtui/settingspages/highlightsettingspage.ui b/src/qtui/settingspages/highlightsettingspage.ui
index 827f255..9c8894e 100644 (file)
--- a/src/qtui/settingspages/highlightsettingspage.ui
+++ b/src/qtui/settingspages/highlightsettingspage.ui
@@ -50,7 +50,7 @@
         </column>
         <column>
          <property name="text">
         </column>
         <column>
          <property name="text">

-          <string>Chan</string>
+          <string>Channel</string>

          </property>
         </column>
        </widget>
          </property>
         </column>
        </widget>