X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.h;h=4d983309e270807ded10d54df40d1eea8c79dece;hp=3da2925a0ba46d89fb25e82270c7b8c22a719945;hb=1aef6bf0d3d2a7ef469b9a9f68ceb891cc8a896c;hpb=d6b056e936ec441258d291b7a8af7b83f9f53016

diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h
index 3da2925a..4d983309 100644
--- a/src/uisupport/uistyle.h
+++ b/src/uisupport/uistyle.h
@@ -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  *
@@ -26,11 +26,12 @@
 #include <QUrl>
 
 #include "message.h"
+#include "settings.h"
 
 class UiStyle {
 
   public:
-    UiStyle();
+    UiStyle(const QString &settingsKey);
     virtual ~UiStyle();
 
     /** This enumerates the possible formats a text element may have. */
@@ -59,8 +60,8 @@ class UiStyle {
 
     StyledText styleString(QString);
 
-    void setFormat(FormatType, QTextCharFormat);
-    QTextCharFormat format(FormatType) const;
+    void setFormat(FormatType, QTextCharFormat, Settings::Mode mode/* = Settings::Custom*/);
+    QTextCharFormat format(FormatType, Settings::Mode mode = Settings::Custom) const;
 
     FormatType formatType(const QString &code) const;
     QString formatCode(FormatType) const;
@@ -71,9 +72,12 @@ class UiStyle {
   private:
     QTextCharFormat mergedFormat(QList<FormatType>);
 
-    QVector<QTextCharFormat> _formats;
+    QVector<QTextCharFormat> _defaultFormats;
+    QVector<QTextCharFormat> _customFormats;
     QHash<QString, FormatType> _formatCodes;
 
+    QString _settingsKey;
+
 };
 
 #endif