X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=d97302a5e4d9cf513115fbc4f62de1e8a8a8a3ac;hp=4cb7dff6af742a6406deb45634d796a5054015d7;hb=7ea9c498bfb975a95c11d6ddc28835840cf3353d;hpb=858cba7fac9928549219de070397be65e1b92cde diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp index 4cb7dff6..d97302a5 100644 --- a/src/uisupport/uistyle.cpp +++ b/src/uisupport/uistyle.cpp @@ -19,39 +19,56 @@ ***************************************************************************/ #include +#include "quassel.h" #include "uistyle.h" -#include "uistylesettings.h" +#include "uisettings.h" #include "util.h" +// FIXME remove with migration code +#include + UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) { // register FormatList if that hasn't happened yet - // FIXME I don't think this actually avoids double registration... :/ + // FIXME I don't think this actually avoids double registration... then again... does it hurt? if(QVariant::nameToType("UiStyle::FormatList") == QVariant::Invalid) { qRegisterMetaType("UiStyle::FormatList"); qRegisterMetaTypeStreamOperators("UiStyle::FormatList"); Q_ASSERT(QVariant::nameToType("UiStyle::FormatList") != QVariant::Invalid); } + // FIXME remove migration at some point + // We remove old settings if we find them, since they conflict +#ifdef Q_WS_MAC + QSettings mys(QCoreApplication::organizationDomain(), Quassel::buildInfo().clientApplicationName); +#else + QSettings mys(QCoreApplication::organizationName(), Quassel::buildInfo().clientApplicationName); +#endif + mys.beginGroup("QtUi"); + if(mys.childGroups().contains("Colors")) { + qDebug() << "Removing obsolete UiStyle settings!"; + mys.endGroup(); + mys.remove("Ui"); + mys.remove("QtUiStyle"); + mys.remove("QtUiStyleNew"); + mys.remove("QtUi/Colors"); + mys.sync(); + } + + _defaultFont = QFont("Monospace", QApplication::font().pointSize()); + // Default format _defaultPlainFormat.setForeground(QBrush("#000000")); - _defaultPlainFormat.setFont(QFont("Monospace", QApplication::font().pointSize())); + _defaultPlainFormat.setFont(_defaultFont); _defaultPlainFormat.font().setFixedPitch(true); _defaultPlainFormat.font().setStyleHint(QFont::TypeWriter); setFormat(None, _defaultPlainFormat, Settings::Default); - + // Load saved custom formats UiStyleSettings s(_settingsKey); foreach(FormatType type, s.availableFormats()) { _customFormats[type] = s.customFormat(type); } - // Initialize color codes according to mIRC "standard" - QStringList colors; - //colors << "white" << "black" << "navy" << "green" << "red" << "maroon" << "purple" << "orange"; - //colors << "yellow" << "lime" << "teal" << "aqua" << "royalblue" << "fuchsia" << "grey" << "silver"; - colors << "#ffffff" << "#000000" << "#000080" << "#008000" << "#ff0000" << "#800000" << "#800080" << "#ffa500"; - colors << "#ffff00" << "#00ff00" << "#008080" << "#00ffff" << "#4169E1" << "#ff00ff" << "#808080" << "#c0c0c0"; - // Now initialize the mapping between FormatCodes and FormatTypes... _formatCodes["%O"] = None; _formatCodes["%B"] = Bold; @@ -79,14 +96,21 @@ UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) { _formatCodes["%DM"] = ModeFlags; _formatCodes["%DU"] = Url; + // Initialize color codes according to mIRC "standard" + QStringList colors; + //colors << "white" << "black" << "navy" << "green" << "red" << "maroon" << "purple" << "orange"; + //colors << "yellow" << "lime" << "teal" << "aqua" << "royalblue" << "fuchsia" << "grey" << "silver"; + colors << "#ffffff" << "#000000" << "#000080" << "#008000" << "#ff0000" << "#800000" << "#800080" << "#ffa500"; + colors << "#ffff00" << "#00ff00" << "#008080" << "#00ffff" << "#4169E1" << "#ff00ff" << "#808080" << "#c0c0c0"; + // Set color formats for(int i = 0; i < 16; i++) { QString idx = QString("%1").arg(i, (int)2, (int)10, (QChar)'0'); - _formatCodes[QString("%Dcf%1").arg(idx)] = (FormatType)(FgCol00 + i); - _formatCodes[QString("%Dcb%1").arg(idx)] = (FormatType)(BgCol00 + i); + _formatCodes[QString("%Dcf%1").arg(idx)] = (FormatType)(FgCol00 | i<<24); + _formatCodes[QString("%Dcb%1").arg(idx)] = (FormatType)(BgCol00 | i<<28); QTextCharFormat fgf, bgf; - fgf.setForeground(QBrush(QColor(colors[i]))); setFormat((FormatType)(FgCol00 + i), fgf, Settings::Default); - bgf.setBackground(QBrush(QColor(colors[i]))); setFormat((FormatType)(BgCol00 + i), bgf, Settings::Default); + fgf.setForeground(QBrush(QColor(colors[i]))); setFormat((FormatType)(FgCol00 | i<<24), fgf, Settings::Default); + bgf.setBackground(QBrush(QColor(colors[i]))); setFormat((FormatType)(BgCol00 | i<<28), bgf, Settings::Default); } // Set a few more standard formats @@ -103,7 +127,7 @@ UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) { } UiStyle::~ UiStyle() { - + qDeleteAll(_cachedFontMetrics); } void UiStyle::setFormat(FormatType ftype, QTextCharFormat fmt, Settings::Mode mode) { @@ -115,10 +139,13 @@ void UiStyle::setFormat(FormatType ftype, QTextCharFormat fmt, Settings::Mode mo _customFormats[ftype] = fmt; s.setCustomFormat(ftype, fmt); } else { - _customFormats[ftype] = QTextFormat().toCharFormat(); + _customFormats.remove(ftype); s.removeCustomFormat(ftype); } } + // TODO: invalidate only affected cached formats... if that's possible with less overhead than just rebuilding them + _cachedFormats.clear(); + _cachedFontMetrics.clear(); } QTextCharFormat UiStyle::format(FormatType ftype, Settings::Mode mode) const { @@ -129,7 +156,7 @@ QTextCharFormat UiStyle::format(FormatType ftype, Settings::Mode mode) const { // NOTE: This function is intimately tied to the values in FormatType. Don't change this // until you _really_ know what you do! QTextCharFormat UiStyle::mergedFormat(quint32 ftype) { - if(_cachedFormats.contains(ftype)) return _cachedFormats[ftype]; + if(_cachedFormats.contains(ftype)) return _cachedFormats.value(ftype); if(ftype == Invalid) return QTextCharFormat(); // Now we construct the merged format, starting with the default QTextCharFormat fmt = format(None); @@ -144,7 +171,13 @@ QTextCharFormat UiStyle::mergedFormat(quint32 ftype) { if(ftype & 0x00800000) fmt.merge(format((FormatType)(ftype & 0xf0800000))); // background // URL if(ftype & Url) fmt.merge(format(Url)); - return fmt; + return _cachedFormats[ftype] = fmt; +} + +QFontMetricsF *UiStyle::fontMetrics(quint32 ftype) { + // QFontMetricsF is not assignable, so we need to store pointers :/ + if(_cachedFontMetrics.contains(ftype)) return _cachedFontMetrics.value(ftype); + return (_cachedFontMetrics[ftype] = new QFontMetricsF(mergedFormat(ftype).font())); } UiStyle::FormatType UiStyle::formatType(const QString & code) const { @@ -156,14 +189,32 @@ QString UiStyle::formatCode(FormatType ftype) const { return _formatCodes.key(ftype); } +QList UiStyle::toTextLayoutList(const FormatList &formatList, int textLength) { + QList formatRanges; + QTextLayout::FormatRange range; + int i = 0; + for(i = 0; i < formatList.count(); i++) { + range.format = mergedFormat(formatList.at(i).second); + range.start = formatList.at(i).first; + if(i > 0) formatRanges.last().length = range.start - formatRanges.last().start; + formatRanges.append(range); + } + if(i > 0) formatRanges.last().length = textLength - formatRanges.last().start; + return formatRanges; +} + // This method expects a well-formatted string, there is no error checking! // Since we create those ourselves, we should be pretty safe that nobody does something crappy here. UiStyle::StyledString UiStyle::styleString(const QString &s_) { QString s = s_; + if(s.length() > 65535) { + qWarning() << QString("String too long to be styled: %1").arg(s); + return StyledString(); + } StyledString result; - result.formats.append(qMakePair(0, (quint32)None)); + result.formatList.append(qMakePair((quint16)0, (quint32)None)); quint32 curfmt = (quint32)None; - int pos = 0; int length = 0; + int pos = 0; quint16 length = 0; for(;;) { pos = s.indexOf('%', pos); if(pos < 0) break; @@ -180,10 +231,13 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_) { int color = 10 * s[pos+4].digitValue() + s[pos+5].digitValue(); //TODO: use 99 as transparent color (re mirc color "standard") color &= 0x0f; - if(pos+3 == 'f') + if(s[pos+3] == 'f') { + curfmt &= 0xf0ffffff; curfmt |= (color << 24) | 0x00400000; - else + } else { + curfmt &= 0x0fffffff; curfmt |= (color << 28) | 0x00800000; + } length = 6; } } else if(s[pos+1] == 'O') { // reset formatting @@ -205,16 +259,16 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_) { length = code.length(); } s.remove(pos, length); - if(pos == result.formats.last().first) - result.formats.last().second = curfmt; + if(pos == result.formatList.last().first) + result.formatList.last().second = curfmt; else - result.formats.append(qMakePair(pos, curfmt)); + result.formatList.append(qMakePair((quint16)pos, curfmt)); } - result.text = s; + result.plainText = s; return result; } -QString UiStyle::mircToInternal(const QString &mirc_) { +QString UiStyle::mircToInternal(const QString &mirc_) const { QString mirc = mirc_; mirc.replace('%', "%%"); // escape % just to be sure mirc.replace('\x02', "%B"); @@ -259,38 +313,45 @@ QString UiStyle::mircToInternal(const QString &mirc_) { } UiStyle::StyledMessage UiStyle::styleMessage(const Message &msg) { + return StyledMessage(msg, this); +} + +/***********************************************************************************/ + +UiStyle::StyledMessage::StyledMessage(const Message &msg, UiStyle *style) { QString user = userFromMask(msg.sender()); QString host = hostFromMask(msg.sender()); QString nick = nickFromMask(msg.sender()); - QString txt = mircToInternal(msg.text()); + QString txt = style->mircToInternal(msg.contents()); QString bufferName = msg.bufferInfo().bufferName(); + bufferName.replace('%', "%%"); // well, you _can_ have a % in a buffername apparently... -_- - StyledMessage result; + _msgType = msg.type(); + _timestamp = msg.timestamp(); - result.timestamp = styleString(tr("%DT[%1]").arg(msg.timestamp().toLocalTime().toString("hh:mm:ss"))); - - QString s, t; + QString t; switch(msg.type()) { case Message::Plain: - s = tr("%DS<%1>").arg(nick); t = tr("%D0%1").arg(txt); break; + _sender = nick; + t = tr("%D0%1").arg(txt); break; case Message::Notice: - s = tr("%Dn[%1]").arg(nick); t = tr("%Dn%1").arg(txt); break; + _sender = nick; + t = tr("%Dn%1").arg(txt); break; case Message::Server: - s = tr("%Ds*"); t = tr("%Ds%1").arg(txt); break; + t = tr("%Ds%1").arg(txt); break; case Message::Error: - s = tr("%De*"); t = tr("%De%1").arg(txt); break; + t = tr("%De%1").arg(txt); break; case Message::Join: - s = tr("%Dj-->"); t = tr("%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC").arg(nick, user, host, bufferName); break; + t = tr("%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC").arg(nick, user, host, bufferName); break; case Message::Part: - s = tr("%Dp<--"); t = tr("%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC").arg(nick, user, host, bufferName); + t = tr("%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC").arg(nick, user, host, bufferName); if(!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt); break; case Message::Quit: - s = tr("%Dq<--"); t = tr("%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH has quit").arg(nick, user, host); + t = tr("%Dq%DN%1%DN %DH(%2@%3)%DH has quit").arg(nick, user, host); if(!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt); break; - case Message::Kick: - { s = tr("%Dk<-*"); + case Message::Kick: { QString victim = txt.section(" ", 0, 0); //if(victim == ui.ownNick->currentText()) victim = tr("you"); QString kickmsg = txt.section(" ", 1); @@ -299,28 +360,113 @@ UiStyle::StyledMessage UiStyle::styleMessage(const Message &msg) { } break; case Message::Nick: - s = tr("%Dr<->"); - if(nick == msg.text()) t = tr("%DrYou are now known as %DN%1%DN").arg(txt); + if(nick == msg.contents()) t = tr("%DrYou are now known as %DN%1%DN").arg(txt); else t = tr("%Dr%DN%1%DN is now known as %DN%2%DN").arg(nick, txt); break; case Message::Mode: - s = tr("%Dm***"); if(nick.isEmpty()) t = tr("%DmUser mode: %DM%1%DM").arg(txt); else t = tr("%DmMode %DM%1%DM by %DN%2%DN").arg(txt, nick); break; case Message::Action: - s = tr("%Da-*-"); t = tr("%Da%DN%1%DN %2").arg(nick).arg(txt); break; default: - s = tr("%De%1").arg(msg.sender()); + _sender = msg.sender(); t = tr("%De[%1]").arg(txt); } - result.sender = styleString(s); - result.text = styleString(t); - return result; + _contents = style->styleString(t); +} + +QDateTime UiStyle::StyledMessage::timestamp() const { + return _timestamp; +} + +QString UiStyle::StyledMessage::decoratedTimestamp() const { + return QString("[%1]").arg(_timestamp.toLocalTime().toString("hh:mm:ss")); +} + +QString UiStyle::StyledMessage::sender() const { + switch(type()) { + case Message::Plain: + case Message::Notice: + return _sender; + default: + return QString(); + } +} + +QString UiStyle::StyledMessage::decoratedSender() const { + switch(type()) { + case Message::Plain: + return tr("<%1>").arg(_sender); break; + case Message::Notice: + return tr("[%1]").arg(_sender); break; + case Message::Server: + return tr("*"); break; + case Message::Error: + return tr("*"); break; + case Message::Join: + return tr("-->"); break; + case Message::Part: + return tr("<--"); break; + case Message::Quit: + return tr("<--"); break; + case Message::Kick: + return tr("<-*"); break; + case Message::Nick: + return tr("<->"); break; + case Message::Mode: + return tr("***"); break; + case Message::Action: + return tr("-*-"); break; + default: + return tr("%1").arg(_sender); + } } +QString UiStyle::StyledMessage::contents() const { + return _contents.plainText; +} + +UiStyle::FormatType UiStyle::StyledMessage::timestampFormat() const { + return UiStyle::Timestamp; +} + +UiStyle::FormatType UiStyle::StyledMessage::senderFormat() const { + switch(type()) { + case Message::Plain: + return UiStyle::Sender; break; + case Message::Notice: + return UiStyle::NoticeMsg; break; + case Message::Server: + return UiStyle::ServerMsg; break; + case Message::Error: + return UiStyle::ErrorMsg; break; + case Message::Join: + return UiStyle::JoinMsg; break; + case Message::Part: + return UiStyle::PartMsg; break; + case Message::Quit: + return UiStyle::QuitMsg; break; + case Message::Kick: + return UiStyle::KickMsg; break; + case Message::Nick: + return UiStyle::RenameMsg; break; + case Message::Mode: + return UiStyle::ModeMsg; break; + case Message::Action: + return UiStyle::ActionMsg; break; + default: + return UiStyle::ErrorMsg; + } +} + +UiStyle::FormatList UiStyle::StyledMessage::contentsFormatList() const { + return _contents.formatList; +} + +/***********************************************************************************/ + QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList) { out << formatList.count(); UiStyle::FormatList::const_iterator it = formatList.begin(); @@ -332,12 +478,12 @@ QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList) } QDataStream &operator>>(QDataStream &in, UiStyle::FormatList &formatList) { - int cnt; + quint16 cnt; in >> cnt; - for(int i = 0; i < cnt; i++) { - int pos; quint32 ftype; + for(quint16 i = 0; i < cnt; i++) { + quint16 pos; quint32 ftype; in >> pos >> ftype; - formatList.append(qMakePair(pos, ftype)); + formatList.append(qMakePair((quint16)pos, ftype)); } return in; }