Select highlighted channel on clicking the blinking tray icon in all cases

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

diff --git a/src/qtui/qtuistyle.cpp b/src/qtui/qtuistyle.cpp
index 78255dc..a3f5ea3 100644 (file)
--- a/src/qtui/qtuistyle.cpp
+++ b/src/qtui/qtuistyle.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -19,12 +19,9 @@
  ***************************************************************************/
 
 #include "qtuistyle.h"
+#include "qtuisettings.h"
 
-#ifndef SPUTDEV
 QtUiStyle::QtUiStyle() : UiStyle("QtUiStyle") {
-#else
-QtUiStyle::QtUiStyle() : UiStyle("QtUiStyleNew") {
-#endif
   // We need to just set our internal formats; everything else is done by the base class...
 
   // Internal message formats
@@ -78,11 +75,29 @@ QtUiStyle::QtUiStyle() : UiStyle("QtUiStyleNew") {
   ts.setForeground(QBrush("grey"));
   setFormat(Timestamp, ts, Settings::Default);
 
+  // Set the default sender color
   QTextCharFormat sender;
   sender.setAnchor(true);
   sender.setForeground(QBrush("navy"));
   setFormat(Sender, sender, Settings::Default);
 
+  /*
+   * Fillup the list of colors used for sender auto coloring In this case
+   * These are Oxygen palette colors
+   */
+  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);
   nick.setFontWeight(QFont::Bold);
@@ -106,7 +121,22 @@ QtUiStyle::QtUiStyle() : UiStyle("QtUiStyleNew") {
   url.setAnchor(true);
   setFormat(Url, url, Settings::Default);
 
-
+  QtUiStyleSettings s;
+  _highlightColor = s.highlightColor();
+  if(!_highlightColor.isValid()) _highlightColor = QColor("lightcoral");
 }
 
 QtUiStyle::~QtUiStyle() {}
+
+void QtUiStyle::setHighlightColor(const QColor &col) {
+  _highlightColor = col;
+  QtUiStyleSettings s;
+  s.setHighlightColor(col);
+}
+
+void QtUiStyle::addSenderAutoColor(FormatType type, const QString name) {
+  QTextCharFormat autoColor;
+  autoColor.setAnchor(true);
+  autoColor.setForeground(QBrush(QColor(name)));
+  setFormat(type, autoColor, Settings::Default);
+}