Parse foreground and background for ChatLines

diff --git a/src/uisupport/qssparser.cpp b/src/uisupport/qssparser.cpp
index d93c7b2..88cf885 100644 (file)
--- a/src/uisupport/qssparser.cpp
+++ b/src/uisupport/qssparser.cpp
@@ -98,8 +98,28 @@ void QssParser::parseChatLineData(const QString &decl, const QString &contents)
   if(fmtType == UiStyle::Invalid)
     return;
 
-  
+  QTextCharFormat format;
 
+  foreach(QString line, contents.split(';', QString::SkipEmptyParts)) {
+    int idx = line.indexOf(':');
+    if(idx <= 0) {
+      qWarning() << Q_FUNC_INFO << tr("Invalid property declaration: %1").arg(line.trimmed());
+      continue;
+    }
+    QString property = line.left(idx).trimmed();
+    QString value = line.mid(idx + 1).trimmed();
+
+    if(property == "background" || property == "background-color")
+      format.setBackground(parseBrushValue(value));
+    else if(property == "foreground" || property == "color")
+      format.setForeground(parseBrushValue(value));
+
+    else {
+      qWarning() << Q_FUNC_INFO << tr("Unknown ChatLine property: %1").arg(property);
+    }
+  }
+
+  _formats[fmtType] = format;
 }
 
 quint64 QssParser::parseFormatType(const QString &decl) {
@@ -251,10 +271,15 @@ void QssParser::parsePaletteData(const QString &decl, const QString &contents) {
   }
 }
 
-QBrush QssParser::parseBrushValue(const QString &str) {
+QBrush QssParser::parseBrushValue(const QString &str, bool *ok) {
+  if(ok)
+    *ok = false;
   QColor c = parseColorValue(str);
-  if(c.isValid())
+  if(c.isValid()) {
+    if(ok)
+      *ok = true;
     return QBrush(c);
+  }
 
   if(str.startsWith("palette")) { // Palette color role
     QRegExp rx("palette\\s*\\(\\s*([a-z-]+)\\s*\\)");
@@ -286,6 +311,8 @@ QBrush QssParser::parseBrushValue(const QString &str) {
     }
     QLinearGradient gradient(x1, y1, x2, y2);
     gradient.setStops(stops);
+    if(ok)
+      *ok = true;
     return QBrush(gradient);
 
   } else if(str.startsWith("qconicalgradient")) {
@@ -305,6 +332,8 @@ QBrush QssParser::parseBrushValue(const QString &str) {
     }
     QConicalGradient gradient(cx, cy, angle);
     gradient.setStops(stops);
+    if(ok)
+      *ok = true;
     return QBrush(gradient);
 
   } else if(str.startsWith("qradialgradient")) {
@@ -326,6 +355,8 @@ QBrush QssParser::parseBrushValue(const QString &str) {
     }
     QRadialGradient gradient(cx, cy, radius, fx, fy);
     gradient.setStops(stops);
+    if(ok)
+      *ok = true;
     return QBrush(gradient);
   }
 

diff --git a/src/uisupport/qssparser.h b/src/uisupport/qssparser.h
index 1dc9e74..9c4a69e 100644 (file)
--- a/src/uisupport/qssparser.h
+++ b/src/uisupport/qssparser.h
@@ -46,7 +46,7 @@ class QssParser {
     bool parsePalette(QPalette &, const QString &qss);
 
     // Parse basic data types
-    QBrush parseBrushValue(const QString &str);
+    QBrush parseBrushValue(const QString &str, bool *ok = 0);
     QColor parseColorValue(const QString &str);
     QFont parseFontValue(const QString &str);