X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuistyle.cpp;h=bdcfc9fc0c3cf49c93e3aa5078d240e9a6a06df9;hp=18a7407c88e37ef7dc62d2208f7794bc6c3f66af;hb=5cc01948319761863c121a74dc1e7b1c182beaa6;hpb=d6b056e936ec441258d291b7a8af7b83f9f53016

diff --git a/src/qtui/qtuistyle.cpp b/src/qtui/qtuistyle.cpp
index 18a7407c..bdcfc9fc 100644
--- a/src/qtui/qtuistyle.cpp
+++ b/src/qtui/qtuistyle.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -19,90 +19,99 @@
  ***************************************************************************/
 
 #include "qtuistyle.h"
+#include "qtuisettings.h"
 
-QtUiStyle::QtUiStyle() : UiStyle() {
+QtUiStyle::QtUiStyle() : UiStyle("QtUiStyle") {
   // We need to just set our internal formats; everything else is done by the base class...
 
   // Internal message formats
   QTextCharFormat plainMsg;
   plainMsg.setForeground(QBrush("black"));
-  setFormat(PlainMsg, plainMsg);
+  setFormat(PlainMsg, plainMsg, Settings::Default);
 
   QTextCharFormat notice;
   notice.setForeground(QBrush("navy"));
-  setFormat(NoticeMsg, notice);
+  setFormat(NoticeMsg, notice, Settings::Default);
 
   QTextCharFormat server;
   server.setForeground(QBrush("navy"));
-  setFormat(ServerMsg, server);
+  setFormat(ServerMsg, server, Settings::Default);
 
   QTextCharFormat error;
   error.setForeground(QBrush("red"));
-  setFormat(ErrorMsg, error);
+  setFormat(ErrorMsg, error, Settings::Default);
 
   QTextCharFormat join;
   join.setForeground(QBrush("green"));
-  setFormat(JoinMsg, join);
+  setFormat(JoinMsg, join, Settings::Default);
 
   QTextCharFormat part;
   part.setForeground(QBrush("indianred"));
-  setFormat(PartMsg, part);
+  setFormat(PartMsg, part, Settings::Default);
 
   QTextCharFormat quit;
   quit.setForeground(QBrush("indianred"));
-  setFormat(QuitMsg, quit);
+  setFormat(QuitMsg, quit, Settings::Default);
 
   QTextCharFormat kick;
   kick.setForeground(QBrush("indianred"));
-  setFormat(KickMsg, kick);
+  setFormat(KickMsg, kick, Settings::Default);
 
   QTextCharFormat nren;
   nren.setForeground(QBrush("magenta"));
-  setFormat(RenameMsg, nren);
+  setFormat(RenameMsg, nren, Settings::Default);
 
   QTextCharFormat mode;
   mode.setForeground(QBrush("steelblue"));
-  setFormat(ModeMsg, mode);
+  setFormat(ModeMsg, mode, Settings::Default);
 
   QTextCharFormat action;
   action.setFontItalic(true);
   action.setForeground(QBrush("darkmagenta"));
-  setFormat(ActionMsg, action);
+  setFormat(ActionMsg, action, Settings::Default);
 
   // Internal message element formats
   QTextCharFormat ts;
   ts.setForeground(QBrush("grey"));
-  setFormat(Timestamp, ts);
+  setFormat(Timestamp, ts, Settings::Default);
 
   QTextCharFormat sender;
   sender.setAnchor(true);
   sender.setForeground(QBrush("navy"));
-  setFormat(Sender, sender);
+  setFormat(Sender, sender, Settings::Default);
 
   QTextCharFormat nick;
   nick.setAnchor(true);
   nick.setFontWeight(QFont::Bold);
-  setFormat(Nick, nick);
+  setFormat(Nick, nick, Settings::Default);
 
   QTextCharFormat hostmask;
   hostmask.setFontItalic(true);
-  setFormat(Hostmask, hostmask);
+  setFormat(Hostmask, hostmask, Settings::Default);
 
   QTextCharFormat channel;
   channel.setAnchor(true);
   channel.setFontWeight(QFont::Bold);
-  setFormat(ChannelName, channel);
+  setFormat(ChannelName, channel, Settings::Default);
 
   QTextCharFormat flags;
   flags.setFontWeight(QFont::Bold);
-  setFormat(ModeFlags, flags);
+  setFormat(ModeFlags, flags, Settings::Default);
 
   QTextCharFormat url;
   url.setFontUnderline(true);
   url.setAnchor(true);
-  setFormat(Url, url);
-
+  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);
+}