X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fqtuistyle.cpp;fp=src%2Fqtui%2Fqtuistyle.cpp;h=f195dfb49d278e438796495752c95ccf59d7976d;hb=6b2bda5908bc1ddcc242d13adc3390eb1510f4e0;hp=f596ab40ace03abb3f8fbbab0eb90e4ccd3492c3;hpb=6509162911c0ceb3658f6a7ece1a1d82c97b577e;p=quassel.git

diff --git a/src/qtui/qtuistyle.cpp b/src/qtui/qtuistyle.cpp
index f596ab40..f195dfb4 100644
--- a/src/qtui/qtuistyle.cpp
+++ b/src/qtui/qtuistyle.cpp
@@ -106,8 +106,21 @@ void QtUiStyle::generateSettingsQss() const
         out << "\n// Sender Colors\n"
             << "ChatLine::sender#plain[sender=\"self\"] { foreground: " << color("SenderSelf", s) << "; }\n\n";
 
+        // Matches qssparser.cpp for UiStyle::PlainMsg
         for (int i = 0; i < 16; i++)
-            out << senderQss(i, s);
+            out << senderQss(i, s, "plain");
+
+        // Only color the nicks in CTCP ACTIONs if sender colors are enabled
+        if (s.value("UseSenderActionColors").toBool()) {
+            // For action messages, color the 'sender' column -and- the nick itself
+            out << "\n// Sender Nickname Colors for action messages\n"
+                << "ChatLine::sender#action[sender=\"self\"] { foreground: " << color("SenderSelf", s) << "; }\n"
+                << "ChatLine::nick#action[sender=\"self\"] { foreground: " << color("SenderSelf", s) << "; }\n\n";
+
+            // Matches qssparser.cpp for UiStyle::ActionMsg
+            for (int i = 0; i < 16; i++)
+                out << senderQss(i, s, "action", true);
+        }
     }
 
     // ItemViews
@@ -168,12 +181,20 @@ QString QtUiStyle::msgTypeQss(const QString &msgType, const QString &key, UiSett
 }
 
 
-QString QtUiStyle::senderQss(int i, UiSettings &settings) const
+QString QtUiStyle::senderQss(int i, UiSettings &settings, const QString &messageType, bool includeNick) const
 {
     QString dez = QString::number(i);
     if (dez.length() == 1) dez.prepend('0');
 
-    return QString("ChatLine::sender#plain[sender=\"0%1\"] { foreground: %2; }\n").arg(QString::number(i, 16), color("Sender"+dez, settings));
+    if (includeNick) {
+        // Include the nickname in the color rules
+        return QString("ChatLine::sender#%1[sender=\"0%2\"] { foreground: %3; }\n"
+                       "ChatLine::nick#%1[sender=\"0%2\"]   { foreground: %3; }\n")
+                .arg(messageType, QString::number(i, 16), color("Sender"+dez, settings));
+    } else {
+        return QString("ChatLine::sender#%1[sender=\"0%2\"] { foreground: %3; }\n")
+                .arg(messageType, QString::number(i, 16), color("Sender"+dez, settings));
+    }
 }