From: Shane Synan <digitalcircuit36939@gmail.com>
Date: Tue, 17 Jul 2018 18:28:06 +0000 (-0500)
Subject: client: Clarify highlight 'Channel' functionality
X-Git-Tag: 0.13-rc1~3
X-Git-Url: https://git.quassel-irc.org/?a=commitdiff_plain;ds=sidebyside;h=c4059edbdec554e7fcd154b8cda134c15906fbba;hp=824852f39114a70b69f71ac154650b71a9394f3c;p=quassel.git

client: Clarify highlight 'Channel' functionality

Modify 'Channel' column tooltip to mention 'channel/query', since
this actually refers to buffer name.  As it's less likely someone
will want to set highlights on queries as they trigger notifications
by default, don't rename the column itself.
---

diff --git a/src/qtui/settingspages/corehighlightsettingspage.cpp b/src/qtui/settingspages/corehighlightsettingspage.cpp
index 24c78c1c..a11d36d9 100644
--- a/src/qtui/settingspages/corehighlightsettingspage.cpp
+++ b/src/qtui/settingspages/corehighlightsettingspage.cpp
@@ -187,8 +187,8 @@ QString CoreHighlightSettingsPage::getTableTooltip(column tableColumn) const
                   "any nickname starting with <i>Announce</i></p>");
 
     case CoreHighlightSettingsPage::ChanColumn:
-        return tr("<p><b>Channel</b>: Semicolon separated list of channel names, leave blank to "
-                  "match any name.</p>"
+        return 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> "
diff --git a/src/qtui/settingspages/highlightsettingspage.cpp b/src/qtui/settingspages/highlightsettingspage.cpp
index 4485b4ff..edb0bcdb 100644
--- a/src/qtui/settingspages/highlightsettingspage.cpp
+++ b/src/qtui/settingspages/highlightsettingspage.cpp
@@ -64,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> "
@@ -176,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> "