X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=b08134b10aa12394c0f895912a53a22a18d299c1;hp=18934d6d0b153e756a937f0d8a6528bf7cb5ae94;hb=46984aca05b2d5f8dddd0c8739e60a1753078123;hpb=7f8c674b003c9f48c1c11cd7dee257a807f99d7c diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp index 18934d6d..b08134b1 100644 --- a/src/uisupport/uistyle.cpp +++ b/src/uisupport/uistyle.cpp @@ -70,7 +70,10 @@ UiStyle::UiStyle(QObject *parent) // BufferView / NickView settings UiStyleSettings s; _showBufferViewIcons = _showNickViewIcons = s.value("ShowItemViewIcons", true).toBool(); - s.notify("ShowItemViewIcons", this, SLOT(showItemViewIconsChanged())); + s.notify("ShowItemViewIcons", this, SLOT(showItemViewIconsChanged(QVariant))); + + _allowMircColors = s.value("AllowMircColors", true).toBool(); + s.notify("AllowMircColors", this, SLOT(allowMircColorsChanged(QVariant))); loadStyleSheet(); } @@ -92,7 +95,7 @@ void UiStyle::loadStyleSheet() { 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); @@ -102,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)); - _formats[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(); @@ -146,11 +146,15 @@ void UiStyle::setTimestampFormatString(const QString &format) { } } +void UiStyle::allowMircColorsChanged(const QVariant &v) { + _allowMircColors = v.toBool(); + emit changed(); +} + /******** ItemView Styling *******/ -void UiStyle::showItemViewIconsChanged() { - UiStyleSettings s; - _showBufferViewIcons = _showNickViewIcons = s.value("ShowItemViewIcons").toBool(); +void UiStyle::showItemViewIconsChanged(const QVariant &v) { + _showBufferViewIcons = _showNickViewIcons = v.toBool(); } QVariant UiStyle::bufferViewItemData(const QModelIndex &index, int role) const { @@ -288,11 +292,11 @@ QTextCharFormat UiStyle::cachedFormat(quint32 formatType, quint32 messageLabel) return _formatCache.value(formatType | ((quint64)messageLabel << 32), QTextCharFormat()); } -void UiStyle::setCachedFormat(const QTextCharFormat &format, quint32 formatType, quint32 messageLabel) { +void UiStyle::setCachedFormat(const QTextCharFormat &format, quint32 formatType, quint32 messageLabel) const { _formatCache[formatType | ((quint64)messageLabel << 32)] = format; } -QFontMetricsF *UiStyle::fontMetrics(quint32 ftype, quint32 label) { +QFontMetricsF *UiStyle::fontMetrics(quint32 ftype, quint32 label) const { // QFontMetricsF is not assignable, so we need to store pointers :/ quint64 key = ftype | ((quint64)label << 32); @@ -306,7 +310,7 @@ QFontMetricsF *UiStyle::fontMetrics(quint32 ftype, quint32 label) { // NOTE: This and the following functions are intimately tied to the values in FormatType. Don't change this // until you _really_ know what you do! -QTextCharFormat UiStyle::format(quint32 ftype, quint32 label_) { +QTextCharFormat UiStyle::format(quint32 ftype, quint32 label_) const { if(ftype == Invalid) return QTextCharFormat(); @@ -328,7 +332,7 @@ QTextCharFormat UiStyle::format(quint32 ftype, quint32 label_) { return fmt; } -void UiStyle::mergeFormat(QTextCharFormat &fmt, quint32 ftype, quint64 label) { +void UiStyle::mergeFormat(QTextCharFormat &fmt, quint32 ftype, quint64 label) const { mergeSubElementFormat(fmt, ftype & 0x00ff, label); // TODO: allow combinations for mirc formats and colors (each), e.g. setting a special format for "bold and italic" @@ -343,20 +347,22 @@ void UiStyle::mergeFormat(QTextCharFormat &fmt, quint32 ftype, quint64 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) { +void UiStyle::mergeSubElementFormat(QTextCharFormat& fmt, quint32 ftype, quint64 label) const { quint64 key = ftype | label; fmt.merge(format(key & Q_UINT64_C(0x0000ffffffffff00))); // label + subelement fmt.merge(format(key & Q_UINT64_C(0x0000ffffffffffff))); // label + subelement + msgtype @@ -396,6 +402,12 @@ UiStyle::FormatType UiStyle::formatType(Message::Type msgType) { return DayChangeMsg; case Message::Topic: return TopicMsg; + case Message::NetsplitJoin: + return NetsplitJoinMsg; + case Message::NetsplitQuit: + return NetsplitQuitMsg; + case Message::Invite: + return InviteMsg; } //Q_ASSERT(false); // we need to handle all message types qWarning() << Q_FUNC_INFO << "Unknown message type:" << msgType; @@ -411,7 +423,7 @@ QString UiStyle::formatCode(FormatType ftype) { return _formatCodes.key(ftype); } -QList UiStyle::toTextLayoutList(const FormatList &formatList, int textLength, quint32 messageLabel) { +QList UiStyle::toTextLayoutList(const FormatList &formatList, int textLength, quint32 messageLabel) const { QList formatRanges; QTextLayout::FormatRange range; int i = 0; @@ -455,10 +467,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; } @@ -474,6 +486,7 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_, quint32 baseFormat if(s[pos+1] == 'D') code += s[pos+2]; FormatType ftype = formatType(code); if(ftype == Invalid) { + pos++; qWarning() << (QString("Invalid format code in string: %1").arg(s)); continue; } @@ -493,6 +506,7 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_, quint32 baseFormat QString UiStyle::mircToInternal(const QString &mirc_) { QString mirc = mirc_; mirc.replace('%', "%%"); // escape % just to be sure + mirc.replace('\t', " "); // tabs break layout, also this is italics in Konversation mirc.replace('\x02', "%B"); mirc.replace('\x0f', "%O"); mirc.replace('\x12', "%R"); @@ -551,6 +565,10 @@ 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... + nick.replace('%', "%%"); // ... and then there's totally RFC-violating servers like justin.tv m( + const int maxNetsplitNicks = 15; QString t; switch(type()) { @@ -613,6 +631,38 @@ void UiStyle::StyledMessage::style() const { 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; + case Message::Invite: + //: Invite Message + t = tr("%1").arg(txt); break; default: t = tr("[%1]").arg(txt); } @@ -679,6 +729,12 @@ QString UiStyle::StyledMessage::decoratedSender() const { return tr("-"); break; case Message::Topic: return tr("*"); break; + case Message::NetsplitJoin: + return tr("=>"); break; + case Message::NetsplitQuit: + return tr("<="); break; + case Message::Invite: + return tr("->"); break; default: return tr("%1").arg(plainSender()); } @@ -692,9 +748,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);