Moving branches/0.3 to trunk

[quassel.git] / src / uisupport / uistyle.h

diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h
index 59841dc..426b398 100644 (file)
--- a/src/uisupport/uistyle.h
+++ b/src/uisupport/uistyle.h
@@ -25,6 +25,7 @@
 # include "old-uistyle.h"
 #else
 
+#include <QDataStream>
 #include <QTextCharFormat>
 #include <QTextLayout>
 #include <QUrl>
@@ -33,11 +34,14 @@
 #include "settings.h"
 
 class UiStyle {
+  Q_DECLARE_TR_FUNCTIONS (UiStyle);
 
   public:
     UiStyle(const QString &settingsKey);
     virtual ~UiStyle();
 
+    typedef QList<QPair<int, quint32> > FormatList;
+
     //! This enumerates the possible formats a text element may have. */
     /** These formats are ordered on increasing importance, in cases where a given property is specified
      *  by multiple active formats.
@@ -117,11 +121,18 @@ class UiStyle {
     };
 
     struct StyledString {
-      QString text;
-      QList<QPair<int, quint32> > formats;  // starting pos, ftypes
+      QString plainText;
+      FormatList formatList;  // starting pos, ftypes
+    };
+
+    struct StyledMessage {
+      StyledString timestamp;
+      StyledString sender;
+      StyledString contents;
     };
 
     StyledString styleString(const QString &);
+    StyledMessage styleMessage(const Message &);
 
     void setFormat(FormatType, QTextCharFormat, Settings::Mode mode/* = Settings::Custom*/);
     QTextCharFormat format(FormatType, Settings::Mode mode = Settings::Custom) const;
@@ -134,6 +145,8 @@ class UiStyle {
 
 
   private:
+    QString mircToInternal(const QString &);
+
     QTextCharFormat _defaultPlainFormat;
     QHash<FormatType, QTextCharFormat> _defaultFormats;
     QHash<FormatType, QTextCharFormat> _customFormats;
@@ -143,5 +156,10 @@ class UiStyle {
     QString _settingsKey;
 };
 
+QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList);
+QDataStream &operator>>(QDataStream &in, UiStyle::FormatList &formatList);
+
+Q_DECLARE_METATYPE(UiStyle::FormatList);
+
 #endif // SPUTDEV
 #endif