X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=141ff335069b24138747e8d8a197bab735814ba7;hp=2926a754d05f9eeaef8d3c478e4d46b626553b34;hb=1566f62849f9011656d9111b99f023d694bb8805;hpb=8755c3329fc3abc6fdeae3f143557aabb67d679f diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp index 2926a754..141ff335 100644 --- a/src/uisupport/uistyle.cpp +++ b/src/uisupport/uistyle.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -19,10 +19,14 @@ ***************************************************************************/ #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... then again... does it hurt? @@ -32,6 +36,24 @@ UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) { 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 @@ -47,13 +69,6 @@ UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) { _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; @@ -81,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 @@ -117,12 +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 { @@ -208,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 @@ -226,7 +252,7 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_) { if(s[pos+1] == 'D') code += s[pos+2]; FormatType ftype = formatType(code); if(ftype == Invalid) { - qWarning(qPrintable(QString("Invalid format code in string: %1").arg(s))); + qWarning() << (QString("Invalid format code in string: %1").arg(s)); continue; } curfmt ^= ftype; @@ -242,7 +268,7 @@ UiStyle::StyledString UiStyle::styleString(const QString &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"); @@ -286,69 +312,138 @@ QString UiStyle::mircToInternal(const QString &mirc_) { return mirc; } -UiStyle::StyledMessage UiStyle::styleMessage(const Message &msg) { - QString user = userFromMask(msg.sender()); - QString host = hostFromMask(msg.sender()); - QString nick = nickFromMask(msg.sender()); - QString txt = mircToInternal(msg.contents()); - QString bufferName = msg.bufferInfo().bufferName(); - - StyledMessage result; +/***********************************************************************************/ +UiStyle::StyledMessage::StyledMessage(const Message &msg) + : Message(msg) +{ +} - result.timestamp = styleString(tr("%DT[%1]").arg(msg.timestamp().toLocalTime().toString("hh:mm:ss"))); +void UiStyle::StyledMessage::style(UiStyle *style) { + QString user = userFromMask(sender()); + QString host = hostFromMask(sender()); + QString nick = nickFromMask(sender()); + QString txt = style->mircToInternal(contents()); + QString bufferName = bufferInfo().bufferName(); + bufferName.replace('%', "%%"); // well, you _can_ have a % in a buffername apparently... -_- - QString s, t; - switch(msg.type()) { + QString t; + switch(type()) { case Message::Plain: - s = tr("%DS<%1>").arg(nick); t = tr("%D0%1").arg(txt); break; + t = tr("%D0%1").arg(txt); break; case Message::Notice: - s = tr("%Dn[%1]").arg(nick); t = tr("%Dn%1").arg(txt); break; + 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); t = tr("%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC").arg(nick).arg(victim).arg(bufferName); if(!kickmsg.isEmpty()) t = QString("%1 (%2)").arg(t).arg(kickmsg); } break; case Message::Nick: - s = tr("%Dr<->"); - if(nick == msg.contents()) t = tr("%DrYou are now known as %DN%1%DN").arg(txt); + if(nick == 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()); t = tr("%De[%1]").arg(txt); } - result.sender = styleString(s); - result.contents = styleString(t); - return result; + _contents = style->styleString(t); +} + +QString UiStyle::StyledMessage::decoratedTimestamp() const { + return QString("[%1]").arg(timestamp().toLocalTime().toString("hh:mm:ss")); +} + +QString UiStyle::StyledMessage::plainSender() const { + switch(type()) { + case Message::Plain: + case Message::Notice: + return nickFromMask(sender()); + default: + return QString(); + } +} + +QString UiStyle::StyledMessage::decoratedSender() const { + switch(type()) { + case Message::Plain: + return tr("<%1>").arg(plainSender()); break; + case Message::Notice: + return tr("[%1]").arg(plainSender()); 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(plainSender()); + } +} + +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; + } } +/***********************************************************************************/ + QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList) { out << formatList.count(); UiStyle::FormatList::const_iterator it = formatList.begin();