X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=f6ce8a66a55d8196f95afa5e229c8a2bc4fd0f1d;hb=b59ac9eaf6ab7580bca7d2cde3849229ddd11483;hp=4e1bd775d992c480cca818a156d6c02590c8841d;hpb=661013d9d9588cd5383dbb0838dcfd35c95ba5ad;p=quassel.git diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp index 4e1bd775..f6ce8a66 100644 --- a/src/uisupport/uistyle.cpp +++ b/src/uisupport/uistyle.cpp @@ -48,6 +48,9 @@ UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) { _customFormats[type] = s.customFormat(type); } + // Check for the sender auto coloring option + _senderAutoColor = s.value("Colors/SenderAutoColor", false).toBool(); + // Now initialize the mapping between FormatCodes and FormatTypes... _formatCodes["%O"] = None; _formatCodes["%B"] = Bold; @@ -127,7 +130,19 @@ void UiStyle::setFormat(FormatType ftype, QTextCharFormat fmt, Settings::Mode mo _cachedFontMetrics.clear(); } +void UiStyle::setSenderAutoColor( bool state ) { + _senderAutoColor = state; + UiStyleSettings s(_settingsKey); + s.setValue("Colors/SenderAutoColor", QVariant(state)); +} + QTextCharFormat UiStyle::format(FormatType ftype, Settings::Mode mode) const { + // Check for enabled sender auto coloring + if ( (ftype & 0x00000fff) == Sender && !_senderAutoColor ) { + // Just use the default sender style if auto coloring is disabled + ftype = Sender; + } + if(mode == Settings::Custom && _customFormats.contains(ftype)) return _customFormats.value(ftype); else return _defaultFormats.value(ftype, QTextCharFormat()); } @@ -148,6 +163,8 @@ QTextCharFormat UiStyle::mergedFormat(quint32 ftype) { // color codes! if(ftype & 0x00400000) fmt.merge(format((FormatType)(ftype & 0x0f400000))); // foreground if(ftype & 0x00800000) fmt.merge(format((FormatType)(ftype & 0xf0800000))); // background + // Sender auto colors + if((ftype & 0xfff) == 0x200 && (ftype & 0xff000200) != 0x200) fmt.merge(format((FormatType)(ftype & 0xff000200))); // URL if(ftype & Url) fmt.merge(format(Url)); return _cachedFormats[ftype] = fmt; @@ -393,9 +410,14 @@ QString UiStyle::StyledMessage::decoratedSender() const { } UiStyle::FormatType UiStyle::StyledMessage::senderFormat() const { + quint16 hash; switch(type()) { case Message::Plain: - return UiStyle::Sender; break; + // To produce random like but stable nick colorings some sort of hashing should work best. + // In this case we just use the qt function qChecksum which produces a + // CRC16 hash. This should be fast and 16 bits are more than enough. + hash = qChecksum(sender().toAscii().data(), sender().toAscii().size()); + return (UiStyle::FormatType)((((hash % 12) + 1) << 24) + 0x200); // FIXME: amount of sender colors hardwired case Message::Notice: return UiStyle::NoticeMsg; break; case Message::Server: