X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.h;h=db82c1aa8437e9f7414519e79a792471d882a1de;hp=52ad81884a119e0988db733486bd7e39b326f622;hb=9f33f6e471dedbefe7bbe336a40312894628afe1;hpb=0b17a8e987118c138c91b756f5fed4166a23a354;ds=sidebyside

diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h
index 52ad8188..db82c1aa 100644
--- a/src/uisupport/uistyle.h
+++ b/src/uisupport/uistyle.h
@@ -69,6 +69,10 @@ public:
     InfoMsg         = 0x0000000c,
     ErrorMsg        = 0x0000000d,
     DayChangeMsg    = 0x0000000e,
+    TopicMsg        = 0x0000000f,
+    NetsplitJoinMsg = 0x00000010,
+    NetsplitQuitMsg = 0x00000020,
+    InviteMsg       = 0x00000030,
 
     // Standard Formats
     Bold            = 0x00000100,
@@ -133,10 +137,10 @@ public:
   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) const;
+  QFontMetricsF *fontMetrics(quint32 formatType, quint32 messageLabel) const;
 
-  QList<QTextLayout::FormatRange> toTextLayoutList(const FormatList &, int textLength, quint32 messageLabel = 0);
+  QList<QTextLayout::FormatRange> toTextLayoutList(const FormatList &, int textLength, quint32 messageLabel) const;
 
   inline const QBrush &brush(ColorRole role) const { return _uiStylePalette.at((int) role); }
   inline void setBrush(ColorRole role, const QBrush &brush) { _uiStylePalette[(int) role] = brush; }
@@ -154,11 +158,11 @@ 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);
-  void mergeFormat(QTextCharFormat &format, quint32 formatType, quint64 messageLabel);
-  void mergeSubElementFormat(QTextCharFormat &format, quint32 formatType, quint64 messageLabel);
+  QTextCharFormat format(quint64 key) const;
+  QTextCharFormat cachedFormat(quint32 formatType, quint32 messageLabel) const;
+  void setCachedFormat(const QTextCharFormat &format, quint32 formatType, quint32 messageLabel) const;
+  void mergeFormat(QTextCharFormat &format, quint32 formatType, quint64 messageLabel) const;
+  void mergeSubElementFormat(QTextCharFormat &format, quint32 formatType, quint64 messageLabel) const;
 
   static FormatType formatType(const QString &code);
   static QString formatCode(FormatType);
@@ -167,13 +171,15 @@ protected:
   QVariant itemData(int role, const QTextCharFormat &format) const;
 
 private slots:
-  void showUserStateIconsChanged();
+  void allowMircColorsChanged(const QVariant &);
+  void showItemViewIconsChanged(const QVariant &);
 
 private:
   QVector<QBrush> _uiStylePalette;
   QBrush _markerLineBrush;
-  QHash<quint64, QTextCharFormat> _formatCache;
-  QHash<quint64, QFontMetricsF *> _metricsCache;
+  QHash<quint64, QTextCharFormat> _formats;
+  mutable QHash<quint64, QTextCharFormat> _formatCache;
+  mutable QHash<quint64, QFontMetricsF *> _metricsCache;
   QHash<quint32, QTextCharFormat> _listItemFormats;
   static QHash<QString, FormatType> _formatCodes;
   static QString _timestampFormatString;
@@ -189,9 +195,12 @@ private:
   int _voiceIconLimit;
   bool _showNickViewIcons;
   bool _showBufferViewIcons;
+  bool _allowMircColors;
 };
 
 class UiStyle::StyledMessage : public Message {
+  Q_DECLARE_TR_FUNCTIONS(UiStyle::StyledMessage)
+
 public:
   explicit StyledMessage(const Message &message);