settings: Local Highlights, default Current nick

[quassel.git] / src / qtui / settingspages / highlightsettingspage.cpp

diff --git a/src/qtui/settingspages/highlightsettingspage.cpp b/src/qtui/settingspages/highlightsettingspage.cpp
index 443bde1..db5982e 100644 (file)
--- a/src/qtui/settingspages/highlightsettingspage.cpp
+++ b/src/qtui/settingspages/highlightsettingspage.cpp
@@ -20,12 +20,14 @@
 
 #include "highlightsettingspage.h"
 
+#include <QHeaderView>
+#include <QMessageBox>
+
 #include "client.h"
+#include "icon.h"
 #include "qtui.h"
 #include "uisettings.h"
 
-#include <QHeaderView>
-#include <QMessageBox>
 
 HighlightSettingsPage::HighlightSettingsPage(QWidget *parent)
     : SettingsPage(tr("Interface"),
@@ -62,8 +64,8 @@ HighlightSettingsPage::HighlightSettingsPage(QWidget *parent)
                 ui.highlightTable->horizontalHeaderItem(HighlightSettingsPage::CsColumn)->toolTip());
 
     ui.highlightTable->horizontalHeaderItem(HighlightSettingsPage::ChanColumn)->setToolTip(
-                tr("<p><b>Channel</b>: Semicolon separated list of channel names, leave blank to "
-                   "match any name.</p>"
+                tr("<p><b>Channel</b>: Semicolon separated list of channel/query names, leave "
+                   "blank to match any name.</p>"
                    "<p><i>Example:</i><br />"
                    "<i>#quassel*; #foobar; !#quasseldroid</i><br />"
                    "would match on <i>#foobar</i> and any channel starting with <i>#quassel</i> "
@@ -92,7 +94,7 @@ HighlightSettingsPage::HighlightSettingsPage(QWidget *parent)
 #endif
 
     // Information icon
-    ui.localHighlightsIcon->setPixmap(QIcon::fromTheme("dialog-information").pixmap(16));
+    ui.localHighlightsIcon->setPixmap(icon::get("dialog-information").pixmap(16));
 
     // Set up client/monolithic local highlights information
     if (Quassel::runMode() == Quassel::Monolithic) {
@@ -128,7 +130,7 @@ bool HighlightSettingsPage::hasDefaults() const
 
 void HighlightSettingsPage::defaults()
 {
-    ui.highlightNoNick->setChecked(true);
+    ui.highlightCurrentNick->setChecked(true);
     ui.nicksCaseSensitive->setChecked(false);
     emptyTable();
 
@@ -174,8 +176,8 @@ void HighlightSettingsPage::addNewRow(QString name, bool regex, bool cs, bool en
                 tr("<b>CS</b>: This option determines if the highlight rule and <i>Channel</i> "
                    "should be interpreted <b>case sensitive</b>."));
     chanNameItem->setToolTip(
-                tr("<p><b>Channel</b>: Semicolon separated list of channel names, leave blank to "
-                   "match any name.</p>"
+                tr("<p><b>Channel</b>: Semicolon separated list of channel/query names, leave "
+                   "blank to match any name.</p>"
                    "<p><i>Example:</i><br />"
                    "<i>#quassel*; #foobar; !#quasseldroid</i><br />"
                    "would match on <i>#foobar</i> and any channel starting with <i>#quassel</i> "