X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=6478f8cc8804124d002838dcab8035d37988fcf1;hb=04c923c596fbde976b23979b92b0636635f97951;hp=a29d0c5698629bbecec1fd2bb617aa45e9b0f9e8;hpb=e47500c0800e92c59d504f3b62ee3bf715c0207e;p=quassel.git diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp index a29d0c56..6478f8cc 100644 --- a/src/uisupport/uistyle.cpp +++ b/src/uisupport/uistyle.cpp @@ -56,6 +56,50 @@ UiStyle::~ UiStyle() { qDeleteAll(_metricsCache); } +void UiStyle::loadStyleSheet() { + qDeleteAll(_metricsCache); + _metricsCache.clear(); + _formatCache.clear(); + + QString styleSheet; + + styleSheet += loadStyleSheet("file:///" + Quassel::findDataFilePath("default.qss")); + styleSheet += loadStyleSheet("file:///" + Quassel::configDirPath() + "custom.qss"); + // styleSheet += loadStyleSheet("file:///" + some custom file name); FIXME + styleSheet += loadStyleSheet("file:///" + Quassel::optionValue("qss"), true); + + if(styleSheet.isEmpty()) + return; + + QssParser parser; + parser.processStyleSheet(styleSheet); + QApplication::setPalette(parser.palette()); + _formatCache = parser.formats(); + + qApp->setStyleSheet(styleSheet); // pass the remaining sections to the application +} + +QString UiStyle::loadStyleSheet(const QString &styleSheet, bool shouldExist) { + QString ss = styleSheet; + if(ss.startsWith("file:///")) { + ss.remove(0, 8); + if(ss.isEmpty()) + return QString(); + + QFile file(ss); + if(file.open(QFile::ReadOnly)) { + QTextStream stream(&file); + ss = stream.readAll(); + file.close(); + } else { + if(shouldExist) + qWarning() << "Could not open stylesheet file:" << file.fileName(); + return QString(); + } + } + return ss; +} + QTextCharFormat UiStyle::cachedFormat(quint64 key) const { return _formatCache.value(key, QTextCharFormat()); } @@ -73,14 +117,14 @@ void UiStyle::mergeSubElementFormat(QTextCharFormat& fmt, quint32 ftype, quint32 quint64 key = ftype | ((quint64)label << 32); // start with the most general format and then specialize - fmt.merge(cachedFormat(key & 0x00000000fffffff0)); // basic subelement format - fmt.merge(cachedFormat(key & 0x00000000ffffffff)); // subelement + msgtype - fmt.merge(cachedFormat(key & 0xffff0000fffffff0)); // subelement + nickhash - fmt.merge(cachedFormat(key & 0xffff0000ffffffff)); // subelement + nickhash + msgtype - fmt.merge(cachedFormat(key & 0x0000fffffffffff0)); // label + subelement - fmt.merge(cachedFormat(key & 0x0000ffffffffffff)); // label + subelement + msgtype - fmt.merge(cachedFormat(key & 0xfffffffffffffff0)); // label + subelement + nickhash - fmt.merge(cachedFormat(key & 0xffffffffffffffff)); // label + subelement + nickhash + msgtype + fmt.merge(cachedFormat(key & Q_UINT64_C(0x00000000fffffff0))); // basic subelement format + fmt.merge(cachedFormat(key & Q_UINT64_C(0x00000000ffffffff))); // subelement + msgtype + fmt.merge(cachedFormat(key & Q_UINT64_C(0xffff0000fffffff0))); // subelement + nickhash + fmt.merge(cachedFormat(key & Q_UINT64_C(0xffff0000ffffffff))); // subelement + nickhash + msgtype + fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000fffffffffff0))); // label + subelement + fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000ffffffffffff))); // label + subelement + msgtype + fmt.merge(cachedFormat(key & Q_UINT64_C(0xfffffffffffffff0))); // label + subelement + nickhash + fmt.merge(cachedFormat(key & Q_UINT64_C(0xffffffffffffffff))); // label + subelement + nickhash + msgtype } // NOTE: This function is intimately tied to the values in FormatType. Don't change this @@ -96,10 +140,14 @@ QTextCharFormat UiStyle::format(quint32 ftype, quint32 label) { if(fmt.properties().count()) return fmt; - fmt.merge(cachedFormat(key & 0x0000000000000000)); // basic - fmt.merge(cachedFormat(key & 0x000000000000000f)); // msgtype - fmt.merge(cachedFormat(key & 0x0000ffff00000000)); // label - fmt.merge(cachedFormat(key & 0x0000ffff0000000f)); // label + msgtype + fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000000000000000))); // basic + fmt.merge(cachedFormat(key & Q_UINT64_C(0x000000000000000f))); // msgtype + fmt.merge(cachedFormat(key & Q_UINT64_C(0xffff000000000000))); // nickhash + fmt.merge(cachedFormat(key & Q_UINT64_C(0xffff00000000000f))); // nickhash + msgtype + fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000ffff00000000))); // label + fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000ffff0000000f))); // label + msgtype + fmt.merge(cachedFormat(key & Q_UINT64_C(0xffffffff00000000))); // label + nickhash + fmt.merge(cachedFormat(key & Q_UINT64_C(0xffffffff0000000f))); // label + nickhash + msgtype // TODO: allow combinations for mirc formats and colors (each), e.g. setting a special format for "bold and italic" // or "foreground 01 and background 03" @@ -181,12 +229,12 @@ QString UiStyle::formatCode(FormatType ftype) { return _formatCodes.key(ftype); } -QList UiStyle::toTextLayoutList(const FormatList &formatList, int textLength) { +QList UiStyle::toTextLayoutList(const FormatList &formatList, int textLength, quint32 messageLabel) { QList formatRanges; QTextLayout::FormatRange range; int i = 0; for(i = 0; i < formatList.count(); i++) { - range.format = format(formatList.at(i).second); + range.format = format(formatList.at(i).second, messageLabel); range.start = formatList.at(i).first; if(i > 0) formatRanges.last().length = range.start - formatRanges.last().start; formatRanges.append(range); @@ -204,7 +252,7 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_, quint32 baseFormat return StyledString(); } StyledString result; - result.formatList.append(qMakePair((quint16)0, (quint32)None)); + result.formatList.append(qMakePair((quint16)0, baseFormat)); quint32 curfmt = baseFormat; int pos = 0; quint16 length = 0; for(;;) { @@ -308,6 +356,10 @@ QString UiStyle::mircToInternal(const QString &mirc_) { UiStyle::StyledMessage::StyledMessage(const Message &msg) : Message(msg) { + if(type() == Message::Plain) + _senderHash = 0xff; + else + _senderHash = 0x00; // this means we never compute the hash for msgs that aren't plain } void UiStyle::StyledMessage::style() const { @@ -497,6 +549,22 @@ UiStyle::FormatType UiStyle::StyledMessage::senderFormat() const { } } +// FIXME hardcoded to 16 sender hashes +quint8 UiStyle::StyledMessage::senderHash() const { + if(_senderHash != 0xff) + return _senderHash; + + QString nick = nickFromMask(sender()).toLower(); + if(!nick.isEmpty()) { + int chopCount = 0; + while(nick.at(nick.count() - 1 - chopCount) == '_') + chopCount++; + nick.chop(chopCount); + } + quint16 hash = qChecksum(nick.toAscii().data(), nick.toAscii().size()); + return (_senderHash = (hash & 0xf) + 1); +} + /***********************************************************************************/ QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList) { @@ -519,19 +587,3 @@ QDataStream &operator>>(QDataStream &in, UiStyle::FormatList &formatList) { } return in; } - -/***********************************************************************************/ -// Stylesheet handling -/***********************************************************************************/ - -void UiStyle::loadStyleSheet() { - QssParser parser; - parser.loadStyleSheet(qApp->styleSheet()); - - // TODO handle results - QApplication::setPalette(parser.palette()); - - qDeleteAll(_metricsCache); - _metricsCache.clear(); - _formatCache = parser.formats(); -}