Include current nick for highlight checking if "All nicks" is chosen

[quassel.git] / src / qtui / qtuistyle.cpp

diff --git a/src/qtui/qtuistyle.cpp b/src/qtui/qtuistyle.cpp
index d1b455d..a3f5ea3 100644 (file)
--- a/src/qtui/qtuistyle.cpp
+++ b/src/qtui/qtuistyle.cpp
@@ -83,37 +83,20 @@ QtUiStyle::QtUiStyle() : UiStyle("QtUiStyle") {
 
   /*
    * Fillup the list of colors used for sender auto coloring In this case
-   * this are all tango colors without the grey tones 
-   * See "http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" for details
+   * These are Oxygen palette colors
    */
-  // Butter
-  addSenderAutoColor(SenderCol01, "#fce94f");
-  addSenderAutoColor(SenderCol02, "#edd400");
-  addSenderAutoColor(SenderCol03,  "#c4a000");
-  // Orange
-  addSenderAutoColor(SenderCol04,  "#fcaf3e");
-  addSenderAutoColor(SenderCol05,  "#f57900");
-  addSenderAutoColor(SenderCol06,  "#ce5c00");
-  // Chocolate
-  addSenderAutoColor(SenderCol07, "#e9b96e");
-  addSenderAutoColor(SenderCol08, "#c17d11");
-  addSenderAutoColor(SenderCol09, "#8f5902");
-  // Chameleon
-  addSenderAutoColor(SenderCol10, "#8ae234");
-  addSenderAutoColor(SenderCol11, "#73d216");
-  addSenderAutoColor(SenderCol12, "#4e9a06");
-  // Sky Blue
-  addSenderAutoColor(SenderCol13, "#729fcf");
-  addSenderAutoColor(SenderCol14, "#3465a4");
-  addSenderAutoColor(SenderCol15, "#204a87");
-  // Plum
-  addSenderAutoColor(SenderCol16, "#ad7fa8");
-  addSenderAutoColor(SenderCol17, "#75507b");
-  addSenderAutoColor(SenderCol18, "#5c3566");
-  // Scarlet Red
-  addSenderAutoColor(SenderCol19, "#ef2929");
-  addSenderAutoColor(SenderCol20, "#cc0000");
-  addSenderAutoColor(SenderCol21, "#a40000");
+  addSenderAutoColor(SenderCol01, "#989a95");
+  addSenderAutoColor(SenderCol02, "#ef8440");
+  addSenderAutoColor(SenderCol03, "#ffbf00");
+  addSenderAutoColor(SenderCol04, "#49b13b");
+  addSenderAutoColor(SenderCol05, "#00a778");
+  addSenderAutoColor(SenderCol06, "#008b90");
+  addSenderAutoColor(SenderCol07, "#0069ba");
+  addSenderAutoColor(SenderCol08, "#563696");
+  addSenderAutoColor(SenderCol09, "#ad3597");
+  addSenderAutoColor(SenderCol10, "#e70083");
+  addSenderAutoColor(SenderCol11, "#e70f00");
+  addSenderAutoColor(SenderCol12, "#866127");
 
   QTextCharFormat nick;
   nick.setAnchor(true);
@@ -151,8 +134,7 @@ void QtUiStyle::setHighlightColor(const QColor &col) {
   s.setHighlightColor(col);
 }
 
-void QtUiStyle::addSenderAutoColor(FormatType type, const QString name) 
-{
+void QtUiStyle::addSenderAutoColor(FormatType type, const QString name) {
   QTextCharFormat autoColor;
   autoColor.setAnchor(true);
   autoColor.setForeground(QBrush(QColor(name)));