X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fqssparser.h;h=37a642ef449b0081a95c02f684782736f377fc57;hb=0cbdf2e324edc5f6ec3cee3842ee6b1830a57e23;hp=0db59b51611f61a96025bbc2bf5189621b52a3e0;hpb=ec2b99363141d3cad003b8533b5462a313ade3c1;p=quassel.git

diff --git a/src/uisupport/qssparser.h b/src/uisupport/qssparser.h
index 0db59b51..37a642ef 100644
--- a/src/uisupport/qssparser.h
+++ b/src/uisupport/qssparser.h
@@ -32,6 +32,7 @@ class QssParser {
     void loadStyleSheet(const QString &sheet);
 
     inline QPalette palette() const { return _palette; }
+    inline const QHash<quint64, QTextCharFormat>& formats() const { return _formats; }
 
   protected:
     typedef QList<qreal> ColorTuple;
@@ -44,19 +45,24 @@ class QssParser {
     QTextCharFormat parseFormat(const QString &qss);
     bool parsePalette(QPalette &, const QString &qss);
 
-    // Parse basic data types
-    QBrush parseBrushValue(const QString &str);
-    QColor parseColorValue(const QString &str);
-    QFont parseFontValue(const QString &str);
-
-    // Parse subelements
+    // Parse color/brush-related properties
+    QBrush parseBrush(const QString &str, bool *ok = 0);
+    QColor parseColor(const QString &str);
     ColorTuple parseColorTuple(const QString &str);
     QGradientStops parseGradientStops(const QString &str);
 
+    // Parse font-related properties
+    void parseFont(const QString &str, QTextCharFormat *format);
+    void parseFontStyle(const QString &str, QTextCharFormat *format);
+    void parseFontWeight(const QString &str, QTextCharFormat *format);
+    void parseFontSize(const QString &str, QTextCharFormat *format);
+    void parseFontFamily(const QString &str, QTextCharFormat *format);
+
     QHash<QString, QPalette::ColorRole> _paletteColorRoles;
 
   private:
     QPalette _palette;
+    QHash<quint64, QTextCharFormat> _formats;
     int _maxSenderHash;
 };