X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.h;h=60123e2904a8963c8a7bade47dacd976eb1ff8ce;hp=7f0614b954027729b785b91e321d066030b02d1c;hb=ec2b99363141d3cad003b8533b5462a313ade3c1;hpb=ed9a0a3e6d1af81cc07a54d4feebb8a01c451fb8

diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h
index 7f0614b9..60123e29 100644
--- a/src/uisupport/uistyle.h
+++ b/src/uisupport/uistyle.h
@@ -18,14 +18,16 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef UISTYLE_H
-#define UISTYLE_H
+#ifndef UISTYLE_H_
+#define UISTYLE_H_
 
 #include <QDataStream>
 #include <QFontMetricsF>
+#include <QHash>
 #include <QTextCharFormat>
 #include <QTextLayout>
-#include <QUrl>
+#include <QPalette>
+#include <QVector>
 
 #include "message.h"
 #include "settings.h"
@@ -34,7 +36,7 @@ class UiStyle {
   Q_DECLARE_TR_FUNCTIONS(UiStyle)
 
 public:
-  UiStyle(const QString &settingsKey);
+  UiStyle();
   virtual ~UiStyle();
 
   typedef QList<QPair<quint16, quint32> > FormatList;
@@ -49,6 +51,7 @@ public:
   enum FormatType {
     None            = 0x00000000,
     Invalid         = 0x11111111,
+
     // Message Formats (mutually exclusive!)
     PlainMsg        = 0x00000001,
     NoticeMsg       = 0x00000002,
@@ -61,11 +64,13 @@ public:
     RenameMsg       = 0x00000009,
     ModeMsg         = 0x0000000a,
     ActionMsg       = 0x0000000b,
+
     // Standard Formats
     Bold            = 0x00000010,
     Italic          = 0x00000020,
     Underline       = 0x00000040,
     Reverse         = 0x00000080,
+
     // Individual parts of a message
     Timestamp       = 0x00000100,
     Sender          = 0x00000200,
@@ -73,48 +78,18 @@ public:
     Hostmask        = 0x00000800,
     ChannelName     = 0x00001000,
     ModeFlags       = 0x00002000,
+
     // URL is special, we want that to take precedence over the rest...
-    Url             = 0x00100000,
-    // Colors
-    FgCol00         = 0x00400000,
-    FgCol01         = 0x01400000,
-    FgCol02         = 0x02400000,
-    FgCol03         = 0x03400000,
-    FgCol04         = 0x04400000,
-    FgCol05         = 0x05400000,
-    FgCol06         = 0x06400000,
-    FgCol07         = 0x07400000,
-    FgCol08         = 0x08400000,
-    FgCol09         = 0x09400000,
-    FgCol10         = 0x0a400000,
-    FgCol11         = 0x0b400000,
-    FgCol12         = 0x0c400000,
-    FgCol13         = 0x0d400000,
-    FgCol14         = 0x0e400000,
-    FgCol15         = 0x0f400000,
-
-    BgCol00         = 0x00800000,
-    BgCol01         = 0x10800000,
-    BgCol02         = 0x20800000,
-    BgCol03         = 0x30800000,
-    BgCol04         = 0x40800000,
-    BgCol05         = 0x50800000,
-    BgCol06         = 0x60800000,
-    BgCol07         = 0x70800000,
-    BgCol08         = 0x80800000,
-    BgCol09         = 0x90800000,
-    BgCol10         = 0xa0800000,
-    BgCol11         = 0xb0800000,
-    BgCol12         = 0xc0800000,
-    BgCol13         = 0xd0800000,
-    BgCol14         = 0xe0800000,
-    BgCol15         = 0xf0800000
+    Url             = 0x00080000
 
+    // mIRC Colors - we assume those to be present only in plain contents
+    // foreground: 0x0.400000
+    // background: 0x.0800000
   };
 
-  struct UrlInfo {
-    int start, end;
-    QUrl url;
+  enum MessageLabel {
+    OwnMsg          = 0x00000001,
+    Highlight       = 0x00000002
   };
 
   struct StyledString {
@@ -127,29 +102,33 @@ public:
   StyledString styleString(const QString &);
   QString mircToInternal(const QString &) const;
 
-  void setFormat(FormatType, QTextCharFormat, Settings::Mode mode/* = Settings::Custom*/);
-  QTextCharFormat format(FormatType, Settings::Mode mode = Settings::Custom) const;
-  QTextCharFormat mergedFormat(quint32 formatType);
-  QFontMetricsF *fontMetrics(quint32 formatType);
-
-  FormatType formatType(const QString &code) const;
-  QString formatCode(FormatType) const;
+  QTextCharFormat format(quint32 formatType, quint32 messageLabel = 0);
+  QFontMetricsF *fontMetrics(quint32 formatType, quint32 messageLabel = 0);
 
   inline QFont defaultFont() const { return _defaultFont; }
 
   QList<QTextLayout::FormatRange> toTextLayoutList(const FormatList &, int textLength);
 
 protected:
+  void loadStyleSheet();
+
+  //! Determines the format set to be used for the given hostmask
+  //int formatSetIndex(const QString &hostmask) const;
+  //int formatSetIndexForSelf() const;
+
+  QTextCharFormat cachedFormat(quint64 key) const;
+  QTextCharFormat cachedFormat(quint32 formatType, quint32 messageLabel = 0) const;
+  void setCachedFormat(const QTextCharFormat &format, quint32 formatType, quint32 messageLabel = 0);
+  void mergeSubElementFormat(QTextCharFormat &format, quint32 formatType, quint32 messageLabel = 0);
+
+  FormatType formatType(const QString &code) const;
+  QString formatCode(FormatType) const;
+
 private:
   QFont _defaultFont;
-  QTextCharFormat _defaultPlainFormat;
-  QHash<FormatType, QTextCharFormat> _defaultFormats;
-  QHash<FormatType, QTextCharFormat> _customFormats;
-  QHash<quint32, QTextCharFormat> _cachedFormats;
-  QHash<quint32, QFontMetricsF *> _cachedFontMetrics;
+  QHash<quint64, QTextCharFormat> _formatCache;
+  QHash<quint64, QFontMetricsF *> _metricsCache;
   QHash<QString, FormatType> _formatCodes;
-
-  QString _settingsKey;
 };
 
 class UiStyle::StyledMessage : public Message {