X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.h;h=b09dfa7cccdf4dd5a70c16319f4652b461af1ded;hb=9fb25d34cfc4dee02159b112c72e018c6e26e63f;hp=5941515933fce8dca32cfb1026ab2559c2fe1d0e;hpb=a507ecd831054ca9b3845985ae7ca3d33fad908d;p=quassel.git

diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h
index 59415159..b09dfa7c 100644
--- a/src/uisupport/uistyle.h
+++ b/src/uisupport/uistyle.h
@@ -32,11 +32,11 @@
 #include "message.h"
 #include "settings.h"
 
-class UiStyle {
-  Q_DECLARE_TR_FUNCTIONS(UiStyle)
+class UiStyle : public QObject{
+  Q_OBJECT
 
 public:
-  UiStyle();
+  UiStyle(QObject *parent = 0);
   virtual ~UiStyle();
 
   typedef QList<QPair<quint16, quint32> > FormatList;
@@ -93,7 +93,8 @@ public:
 
   enum MessageLabel {
     OwnMsg          = 0x00000001,
-    Highlight       = 0x00000002
+    Highlight       = 0x00000002,
+    Selected        = 0x00000004  // must be last!
   };
 
   struct StyledString {
@@ -106,34 +107,40 @@ public:
   static FormatType formatType(Message::Type msgType);
   static StyledString styleString(const QString &string, quint32 baseFormat = None);
   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);
 
   inline QFont defaultFont() const { return _defaultFont; }
 
-  QList<QTextLayout::FormatRange> toTextLayoutList(const FormatList &, int textLength);
+  QList<QTextLayout::FormatRange> toTextLayoutList(const FormatList &, int textLength, quint32 messageLabel = 0);
 
-protected:
+public slots:
   void loadStyleSheet();
 
-  //! Determines the format set to be used for the given hostmask
-  //int formatSetIndex(const QString &hostmask) const;
-  //int formatSetIndexForSelf() const;
+signals:
+  void changed();
+
+protected:
+  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 mergeSubElementFormat(QTextCharFormat &format, quint32 formatType, quint32 messageLabel = 0);
+  void mergeFormat(QTextCharFormat &format, quint32 formatType, quint64 messageLabel);
+  void mergeSubElementFormat(QTextCharFormat &format, quint32 formatType, quint64 messageLabel);
 
   static FormatType formatType(const QString &code);
   static QString formatCode(FormatType);
+  static void setTimestampFormatString(const QString &format);
 
 private:
   QFont _defaultFont;
   QHash<quint64, QTextCharFormat> _formatCache;
   QHash<quint64, QFontMetricsF *> _metricsCache;
   static QHash<QString, FormatType> _formatCodes;
+  static QString _timestampFormatString;
 };
 
 class UiStyle::StyledMessage : public Message {
@@ -148,13 +155,15 @@ public:
   inline FormatType timestampFormat() const { return UiStyle::Timestamp; }
   FormatType senderFormat() const;
   const FormatList &contentsFormatList() const;
+
+  quint8 senderHash() const;
+
 protected:
-  //! Styling is only needed for calls to plainContents() and contentsFormatList()
   void style() const;
 
-
 private:
   mutable StyledString _contents;
+  mutable quint8 _senderHash;
 };
 
 QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList);