X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fqssparser.cpp;h=031933a50d2edeb86ffbf4c39e922dd6ec0cf02b;hp=166648f174239c452f027d79c57d7abaecbee1c8;hb=158443f71d48215eea8b47b836b61afd77654b78;hpb=c27d5bfbe80bfeb583a25404f4ccee4b70b010e0 diff --git a/src/uisupport/qssparser.cpp b/src/uisupport/qssparser.cpp index 166648f1..031933a5 100644 --- a/src/uisupport/qssparser.cpp +++ b/src/uisupport/qssparser.cpp @@ -293,6 +293,8 @@ std::pair QssParser::parseFormatType label |= MessageLabel::Highlight; else if (condValue == "selected") label |= MessageLabel::Selected; + else if (condValue == "hovered") + label |= MessageLabel::Hovered; else { qWarning() << Q_FUNC_INFO << tr("Invalid message label: %1").arg(condValue); return invalid; @@ -721,13 +723,19 @@ void QssParser::parseFont(const QString &value, QTextCharFormat *format) return; } format->setFontItalic(false); + format->setFontUnderline(false); + format->setFontStrikeOut(false); format->setFontWeight(QFont::Normal); QStringList proplist = rx.cap(1).split(' ', QString::SkipEmptyParts); foreach(QString prop, proplist) { - if (prop == "italic") + if (prop == "normal") + ; // pass + else if (prop == "italic") format->setFontItalic(true); else if (prop == "underline") format->setFontUnderline(true); + else if (prop == "strikethrough") + format->setFontStrikeOut(true); else if(prop == "oblique") // Oblique is not a property supported by QTextCharFormat format->setFontItalic(true);