X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=05895cd154fd6b1003339602a89402a63533dca7;hp=3bd9b62413568f1f039daa954652d037797cd371;hb=86bd6b1ffb870e65af6d830a2ea16471c348ed5a;hpb=0b17a8e987118c138c91b756f5fed4166a23a354 diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp index 3bd9b624..05895cd1 100644 --- a/src/uisupport/uistyle.cpp +++ b/src/uisupport/uistyle.cpp @@ -68,9 +68,12 @@ UiStyle::UiStyle(QObject *parent) setTimestampFormatString("[hh:mm:ss]"); // BufferView / NickView settings - BufferSettings bufferSettings; - _showBufferViewIcons = _showNickViewIcons = bufferSettings.showUserStateIcons(); - bufferSettings.notify("ShowUserStateIcons", this, SLOT(showUserStateIconsChanged())); + UiStyleSettings s; + _showBufferViewIcons = _showNickViewIcons = s.value("ShowItemViewIcons", true).toBool(); + s.notify("ShowItemViewIcons", this, SLOT(showItemViewIconsChanged(QVariant))); + + _allowMircColors = s.value("AllowMircColors", true).toBool(); + s.notify("AllowMircColors", this, SLOT(allowMircColorsChanged(QVariant))); loadStyleSheet(); } @@ -87,11 +90,12 @@ void UiStyle::loadStyleSheet() { qDeleteAll(_metricsCache); _metricsCache.clear(); _formatCache.clear(); + _formats.clear(); UiStyleSettings s; QString styleSheet; - styleSheet += loadStyleSheet("file:///" + Quassel::findDataFilePath("default.qss")); + styleSheet += loadStyleSheet("file:///" + Quassel::findDataFilePath("stylesheets/default.qss")); styleSheet += loadStyleSheet("file:///" + Quassel::configDirPath() + "settings.qss"); if(s.value("UseCustomStyleSheet", false).toBool()) styleSheet += loadStyleSheet("file:///" + s.value("CustomStyleSheetPath").toString(), true); @@ -101,17 +105,14 @@ void UiStyle::loadStyleSheet() { QssParser parser; parser.processStyleSheet(styleSheet); QApplication::setPalette(parser.palette()); - _uiStylePalette = parser.uiStylePalette(); - QTextCharFormat baseFmt = parser.formats().value(Base); - foreach(quint64 fmtType, parser.formats().keys()) { - QTextCharFormat fmt = baseFmt; - fmt.merge(parser.formats().value(fmtType)); - _formatCache[fmtType] = fmt; - } + _uiStylePalette = parser.uiStylePalette(); + _formats = parser.formats(); _listItemFormats = parser.listItemFormats(); - qApp->setStyleSheet(styleSheet); // pass the remaining sections to the application + styleSheet = styleSheet.trimmed(); + if(!styleSheet.isEmpty()) + qApp->setStyleSheet(styleSheet); // pass the remaining sections to the application } emit changed(); @@ -145,11 +146,15 @@ void UiStyle::setTimestampFormatString(const QString &format) { } } +void UiStyle::allowMircColorsChanged(const QVariant &v) { + _allowMircColors = v.toBool(); + emit changed(); +} + /******** ItemView Styling *******/ -void UiStyle::showUserStateIconsChanged() { - BufferSettings bufferSettings; - _showBufferViewIcons = _showNickViewIcons = bufferSettings.showUserStateIcons(); +void UiStyle::showItemViewIconsChanged(const QVariant &v) { + _showBufferViewIcons = _showNickViewIcons = v.toBool(); } QVariant UiStyle::bufferViewItemData(const QModelIndex &index, int role) const { @@ -279,12 +284,12 @@ QVariant UiStyle::itemData(int role, const QTextCharFormat &format) const { /******** Caching *******/ -QTextCharFormat UiStyle::cachedFormat(quint64 key) const { - return _formatCache.value(key, QTextCharFormat()); +QTextCharFormat UiStyle::format(quint64 key) const { + return _formats.value(key, QTextCharFormat()); } QTextCharFormat UiStyle::cachedFormat(quint32 formatType, quint32 messageLabel) const { - return cachedFormat(formatType | ((quint64)messageLabel << 32)); + return _formatCache.value(formatType | ((quint64)messageLabel << 32), QTextCharFormat()); } void UiStyle::setCachedFormat(const QTextCharFormat &format, quint32 formatType, quint32 messageLabel) { @@ -312,7 +317,7 @@ QTextCharFormat UiStyle::format(quint32 ftype, quint32 label_) { quint64 label = (quint64)label_ << 32; // check if we have exactly this format readily cached already - QTextCharFormat fmt = cachedFormat(label|ftype); + QTextCharFormat fmt = cachedFormat(ftype, label_); if(fmt.properties().count()) return fmt; @@ -332,35 +337,37 @@ void UiStyle::mergeFormat(QTextCharFormat &fmt, quint32 ftype, quint64 label) { // 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" - if((ftype & 0xfff0)) { // element format + if((ftype & 0xfff00)) { // element format for(quint32 mask = 0x00100; mask <= 0x40000; mask <<= 1) { if(ftype & mask) { - mergeSubElementFormat(fmt, mask | 0xff, label); + mergeSubElementFormat(fmt, ftype & (mask | 0xff), label); } } } // Now we handle color codes // We assume that those can't be combined with subelement and message types. - if(ftype & 0x00400000) - mergeSubElementFormat(fmt, ftype & 0x0f400000, label); // foreground - if(ftype & 0x00800000) - mergeSubElementFormat(fmt, ftype & 0xf0800000, label); // background - if((ftype & 0x00c00000) == 0x00c00000) - mergeSubElementFormat(fmt, ftype & 0xffc00000, label); // combination + if(_allowMircColors) { + if(ftype & 0x00400000) + mergeSubElementFormat(fmt, ftype & 0x0f400000, label); // foreground + if(ftype & 0x00800000) + mergeSubElementFormat(fmt, ftype & 0xf0800000, label); // background + if((ftype & 0x00c00000) == 0x00c00000) + mergeSubElementFormat(fmt, ftype & 0xffc00000, label); // combination + } // URL if(ftype & Url) - mergeSubElementFormat(fmt, ftype & Url, label); + mergeSubElementFormat(fmt, ftype & (Url | 0x000000ff), label); } // Merge a subelement format into an existing message format void UiStyle::mergeSubElementFormat(QTextCharFormat& fmt, quint32 ftype, quint64 label) { quint64 key = ftype | label; - fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000ffffffffff00))); // label + subelement - fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000ffffffffffff))); // label + subelement + msgtype - fmt.merge(cachedFormat(key & Q_UINT64_C(0xffffffffffffff00))); // label + subelement + nickhash - fmt.merge(cachedFormat(key & Q_UINT64_C(0xffffffffffffffff))); // label + subelement + nickhash + msgtype + fmt.merge(format(key & Q_UINT64_C(0x0000ffffffffff00))); // label + subelement + fmt.merge(format(key & Q_UINT64_C(0x0000ffffffffffff))); // label + subelement + msgtype + fmt.merge(format(key & Q_UINT64_C(0xffffffffffffff00))); // label + subelement + nickhash + fmt.merge(format(key & Q_UINT64_C(0xffffffffffffffff))); // label + subelement + nickhash + msgtype } UiStyle::FormatType UiStyle::formatType(Message::Type msgType) { @@ -393,6 +400,12 @@ UiStyle::FormatType UiStyle::formatType(Message::Type msgType) { return ErrorMsg; case Message::DayChange: return DayChangeMsg; + case Message::Topic: + return TopicMsg; + case Message::NetsplitJoin: + return NetsplitJoinMsg; + case Message::NetsplitQuit: + return NetsplitQuitMsg; } //Q_ASSERT(false); // we need to handle all message types qWarning() << Q_FUNC_INFO << "Unknown message type:" << msgType; @@ -452,10 +465,10 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_, quint32 baseFormat color &= 0x0f; if(s[pos+3] == 'f') { curfmt &= 0xf0ffffff; - curfmt |= (color << 24) | 0x00400000; + curfmt |= (quint32)(color << 24) | 0x00400000; } else { curfmt &= 0x0fffffff; - curfmt |= (color << 28) | 0x00800000; + curfmt |= (quint32)(color << 28) | 0x00800000; } length = 6; } @@ -548,6 +561,9 @@ void UiStyle::StyledMessage::style() const { QString txt = UiStyle::mircToInternal(contents()); QString bufferName = bufferInfo().bufferName(); bufferName.replace('%', "%%"); // well, you _can_ have a % in a buffername apparently... -_- + host.replace('%', "%%"); // hostnames too... + user.replace('%', "%%"); // and the username. + const int maxNetsplitNicks = 15; QString t; switch(type()) { @@ -607,6 +623,38 @@ void UiStyle::StyledMessage::style() const { //: Day Change Message t = tr("{Day changed to %1}").arg(timestamp().toString()); break; + case Message::Topic: + //: Topic Message + t = tr("%1").arg(txt); break; + case Message::NetsplitJoin: { + QStringList users = txt.split("#:#"); + QStringList servers = users.takeLast().split(" "); + + for(int i = 0; i < users.count() && i < maxNetsplitNicks; i++) + users[i] = nickFromMask(users.at(i)); + + t = tr("Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: ").arg(servers.at(0),servers.at(1)); + if(users.count() <= maxNetsplitNicks) + t.append(QString("%DN%1%DN").arg(users.join(", "))); + else + t.append(tr("%DN%1%DN (%2 more)").arg(static_cast(users.mid(0, maxNetsplitNicks)).join(", ")).arg(users.count() - maxNetsplitNicks)); + } + break; + case Message::NetsplitQuit: { + QStringList users = txt.split("#:#"); + QStringList servers = users.takeLast().split(" "); + + for(int i = 0; i < users.count() && i < maxNetsplitNicks; i++) + users[i] = nickFromMask(users.at(i)); + + t = tr("Netsplit between %DH%1%DH and %DH%2%DH. Users quit: ").arg(servers.at(0),servers.at(1)); + + if(users.count() <= maxNetsplitNicks) + t.append(QString("%DN%1%DN").arg(users.join(", "))); + else + t.append(tr("%DN%1%DN (%2 more)").arg(static_cast(users.mid(0, maxNetsplitNicks)).join(", ")).arg(users.count() - maxNetsplitNicks)); + } + break; default: t = tr("[%1]").arg(txt); } @@ -671,6 +719,12 @@ QString UiStyle::StyledMessage::decoratedSender() const { return tr("*"); break; case Message::DayChange: return tr("-"); break; + case Message::Topic: + return tr("*"); break; + case Message::NetsplitJoin: + return tr("=>"); break; + case Message::NetsplitQuit: + return tr("<="); break; default: return tr("%1").arg(plainSender()); } @@ -684,9 +738,10 @@ quint8 UiStyle::StyledMessage::senderHash() const { QString nick = nickFromMask(sender()).toLower(); if(!nick.isEmpty()) { int chopCount = 0; - while(nick.at(nick.count() - 1 - chopCount) == '_') + while(chopCount < nick.size() && nick.at(nick.count() - 1 - chopCount) == '_') chopCount++; - nick.chop(chopCount); + if(chopCount < nick.size()) + nick.chop(chopCount); } quint16 hash = qChecksum(nick.toAscii().data(), nick.toAscii().size()); return (_senderHash = (hash & 0xf) + 1);