X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.h;h=7911dc7e95d658f655acfcb3ead3e6b06f3a95f8;hp=ca411faec8823b93f42fedf4f86a1d7561211264;hb=55049803e1f4215cedaa30935eae4ca2aa5835d2;hpb=064dcac965d1e724a0434683685a24ec7e6ba855

diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h
index ca411fae..7911dc7e 100644
--- a/src/uisupport/uistyle.h
+++ b/src/uisupport/uistyle.h
@@ -29,7 +29,9 @@
 #include <QPalette>
 #include <QVector>
 
+#include "bufferinfo.h"
 #include "message.h"
+#include "networkmodel.h"
 #include "settings.h"
 
 class UiStyle : public QObject{
@@ -49,8 +51,8 @@ public:
    *         Also, we _do_ rely on certain properties of these values in styleString() and friends!
    */
   enum FormatType {
-    None            = 0x00000000,
-    Invalid         = 0x11111111,
+    Base            = 0x00000000,
+    Invalid         = 0xffffffff,
 
     // Message Formats (mutually exclusive!)
     PlainMsg        = 0x00000001,
@@ -69,19 +71,19 @@ public:
     DayChangeMsg    = 0x0000000e,
 
     // Standard Formats
-    Bold            = 0x00000010,
-    Italic          = 0x00000020,
-    Underline       = 0x00000040,
-    Reverse         = 0x00000080,
+    Bold            = 0x00000100,
+    Italic          = 0x00000200,
+    Underline       = 0x00000400,
+    Reverse         = 0x00000800,
 
     // Individual parts of a message
-    Timestamp       = 0x00000100,
-    Sender          = 0x00000200,
-    Contents        = 0x00000400,
-    Nick            = 0x00000800,
-    Hostmask        = 0x00001000,
-    ChannelName     = 0x00002000,
-    ModeFlags       = 0x00004000,
+    Timestamp       = 0x00001000,
+    Sender          = 0x00002000,
+    Contents        = 0x00004000,
+    Nick            = 0x00008000,
+    Hostmask        = 0x00010000,
+    ChannelName     = 0x00020000,
+    ModeFlags       = 0x00040000,
 
     // URL is special, we want that to take precedence over the rest...
     Url             = 0x00080000
@@ -97,6 +99,28 @@ public:
     Selected        = 0x00000004  // must be last!
   };
 
+  enum ItemFormatType {
+    BufferViewItem    = 0x00000001,
+    NickViewItem      = 0x00000002,
+
+    NetworkItem       = 0x00000010,
+    ChannelBufferItem = 0x00000020,
+    QueryBufferItem   = 0x00000040,
+    IrcUserItem       = 0x00000080,
+    UserCategoryItem  = 0x00000100,
+
+    InactiveBuffer    = 0x00001000,
+    ActiveBuffer      = 0x00002000,
+    UnreadBuffer      = 0x00004000,
+    HighlightedBuffer = 0x00008000,
+    UserAway          = 0x00010000
+  };
+
+  enum ColorRole {
+    MarkerLine,
+    NumRoles  // must be last!
+  };
+
   struct StyledString {
     QString plainText;
     FormatList formatList;  // starting pos, ftypes
@@ -105,16 +129,20 @@ public:
   class StyledMessage;
 
   static FormatType formatType(Message::Type msgType);
-  static StyledString styleString(const QString &string, quint32 baseFormat = None);
+  static StyledString styleString(const QString &string, quint32 baseFormat = Base);
   static QString mircToInternal(const QString &);
   static inline QString timestampFormatString() { return _timestampFormatString; }
 
-  QTextCharFormat format(quint32 formatType, quint32 messageLabel = 0);
-  QFontMetricsF *fontMetrics(quint32 formatType, quint32 messageLabel = 0);
+  QTextCharFormat format(quint32 formatType, quint32 messageLabel);
+  QFontMetricsF *fontMetrics(quint32 formatType, quint32 messageLabel);
 
-  inline QFont defaultFont() const { return _defaultFont; }
+  QList<QTextLayout::FormatRange> toTextLayoutList(const FormatList &, int textLength, quint32 messageLabel);
 
-  QList<QTextLayout::FormatRange> toTextLayoutList(const FormatList &, int textLength, quint32 messageLabel = 0);
+  inline const QBrush &brush(ColorRole role) const { return _uiStylePalette.at((int) role); }
+  inline void setBrush(ColorRole role, const QBrush &brush) { _uiStylePalette[(int) role] = brush; }
+
+  QVariant bufferViewItemData(const QModelIndex &networkModelIndex, int role) const;
+  QVariant nickViewItemData(const QModelIndex &networkModelIndex, int role) const;
 
 public slots:
   void reload();
@@ -126,9 +154,9 @@ protected:
   void loadStyleSheet();
   QString loadStyleSheet(const QString &name, bool shouldExist = false);
 
-  QTextCharFormat cachedFormat(quint64 key) const;
-  QTextCharFormat cachedFormat(quint32 formatType, quint32 messageLabel = 0) const;
-  void setCachedFormat(const QTextCharFormat &format, quint32 formatType, quint32 messageLabel = 0);
+  QTextCharFormat format(quint64 key) const;
+  QTextCharFormat cachedFormat(quint32 formatType, quint32 messageLabel) const;
+  void setCachedFormat(const QTextCharFormat &format, quint32 formatType, quint32 messageLabel);
   void mergeFormat(QTextCharFormat &format, quint32 formatType, quint64 messageLabel);
   void mergeSubElementFormat(QTextCharFormat &format, quint32 formatType, quint64 messageLabel);
 
@@ -136,12 +164,32 @@ protected:
   static QString formatCode(FormatType);
   static void setTimestampFormatString(const QString &format);
 
+  QVariant itemData(int role, const QTextCharFormat &format) const;
+
+private slots:
+  void showUserStateIconsChanged();
+
 private:
-  QFont _defaultFont;
+  QVector<QBrush> _uiStylePalette;
+  QBrush _markerLineBrush;
+  QHash<quint64, QTextCharFormat> _formats;
   QHash<quint64, QTextCharFormat> _formatCache;
   QHash<quint64, QFontMetricsF *> _metricsCache;
+  QHash<quint32, QTextCharFormat> _listItemFormats;
   static QHash<QString, FormatType> _formatCodes;
   static QString _timestampFormatString;
+
+  QPixmap _channelJoinedIcon;
+  QPixmap _channelPartedIcon;
+  QPixmap _userOfflineIcon;
+  QPixmap _userOnlineIcon;
+  QPixmap _userAwayIcon;
+  QPixmap _categoryOpIcon;
+  QPixmap _categoryVoiceIcon;
+  int _opIconLimit;
+  int _voiceIconLimit;
+  bool _showNickViewIcons;
+  bool _showBufferViewIcons;
 };
 
 class UiStyle::StyledMessage : public Message {
@@ -153,8 +201,6 @@ public:
   QString decoratedSender() const;
   const QString &plainContents() const;
 
-  inline FormatType timestampFormat() const { return UiStyle::Timestamp; }
-  FormatType senderFormat() const;
   const FormatList &contentsFormatList() const;
 
   quint8 senderHash() const;