/***************************************************************************
- * 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 *
#include "uisettings.h"
#include "util.h"
-// FIXME remove with migration code
-#include <QSettings>
-
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?
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
_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;
_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());
}
// 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;
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;
return mirc;
}
-UiStyle::StyledMessage UiStyle::styleMessage(const Message &msg) {
- return StyledMessage(msg, this);
-}
-
/***********************************************************************************/
+UiStyle::StyledMessage::StyledMessage(const Message &msg)
+ : Message(msg)
+{
+}
-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 = style->mircToInternal(msg.contents());
- QString bufferName = msg.bufferInfo().bufferName();
+void UiStyle::StyledMessage::style(UiStyle *style) const {
+ 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... -_-
- _msgType = msg.type();
- _timestamp = msg.timestamp();
-
QString t;
- switch(msg.type()) {
+ switch(type()) {
case Message::Plain:
- _sender = nick;
t = tr("%D0%1").arg(txt); break;
case Message::Notice:
- _sender = nick;
t = tr("%Dn%1").arg(txt); break;
case Message::Server:
t = tr("%Ds%1").arg(txt); break;
break;
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:
- 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:
t = tr("%Da%DN%1%DN %2").arg(nick).arg(txt);
break;
default:
- _sender = msg.sender();
t = tr("%De[%1]").arg(txt);
}
_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"));
+ return QString("[%1]").arg(timestamp().toLocalTime().toString("hh:mm:ss"));
}
-QString UiStyle::StyledMessage::sender() const {
+QString UiStyle::StyledMessage::plainSender() const {
switch(type()) {
case Message::Plain:
case Message::Notice:
- return _sender;
+ return nickFromMask(sender());
default:
return QString();
}
QString UiStyle::StyledMessage::decoratedSender() const {
switch(type()) {
case Message::Plain:
- return tr("<%1>").arg(_sender); break;
+ return tr("<%1>").arg(plainSender()); break;
case Message::Notice:
- return tr("[%1]").arg(_sender); break;
+ return tr("[%1]").arg(plainSender()); break;
case Message::Server:
return tr("*"); break;
case Message::Error:
case Message::Action:
return tr("-*-"); break;
default:
- return tr("%1").arg(_sender);
+ return tr("%1").arg(plainSender());
}
}
-QString UiStyle::StyledMessage::contents() const {
- return _contents.plainText;
-}
-
-UiStyle::FormatType UiStyle::StyledMessage::timestampFormat() const {
- return UiStyle::Timestamp;
-}
-
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:
}
}
-UiStyle::FormatList UiStyle::StyledMessage::contentsFormatList() const {
- return _contents.formatList;
-}
/***********************************************************************************/