#include "util.h"
QHash<QString, UiStyle::FormatType> UiStyle::_formatCodes;
+QString UiStyle::_timestampFormatString;
-UiStyle::UiStyle() {
+UiStyle::UiStyle(QObject *parent) : QObject(parent) {
// register FormatList if that hasn't happened yet
// FIXME I don't think this actually avoids double registration... then again... does it hurt?
if(QVariant::nameToType("UiStyle::FormatList") == QVariant::Invalid) {
_formatCodes["%DM"] = ModeFlags;
_formatCodes["%DU"] = Url;
+ setTimestampFormatString("[hh:mm:ss]");
+
loadStyleSheet();
}
-UiStyle::~ UiStyle() {
+UiStyle::~UiStyle() {
qDeleteAll(_metricsCache);
}
+void UiStyle::reload() {
+ loadStyleSheet();
+}
+
void UiStyle::loadStyleSheet() {
qDeleteAll(_metricsCache);
_metricsCache.clear();
_formatCache.clear();
- QString styleSheet;
+ UiStyleSettings s;
+ QString styleSheet;
styleSheet += loadStyleSheet("file:///" + Quassel::findDataFilePath("default.qss"));
- styleSheet += loadStyleSheet("file:///" + Quassel::configDirPath() + "custom.qss");
- // styleSheet += loadStyleSheet("file:///" + some custom file name); FIXME
+ styleSheet += loadStyleSheet("file:///" + Quassel::configDirPath() + "settings.qss");
+ if(s.value("UseCustomStyleSheet", false).toBool())
+ styleSheet += loadStyleSheet("file:///" + s.value("CustomStyleSheetPath").toString(), true);
styleSheet += loadStyleSheet("file:///" + Quassel::optionValue("qss"), true);
- if(styleSheet.isEmpty())
- return;
+ if(!styleSheet.isEmpty()) {
+ QssParser parser;
+ parser.processStyleSheet(styleSheet);
+ QApplication::setPalette(parser.palette());
+ _formatCache = parser.formats();
- QssParser parser;
- parser.processStyleSheet(styleSheet);
- QApplication::setPalette(parser.palette());
- _formatCache = parser.formats();
+ qApp->setStyleSheet(styleSheet); // pass the remaining sections to the application
+ }
- qApp->setStyleSheet(styleSheet); // pass the remaining sections to the application
+ emit changed();
}
QString UiStyle::loadStyleSheet(const QString &styleSheet, bool shouldExist) {
return ss;
}
+void UiStyle::setTimestampFormatString(const QString &format) {
+ if(_timestampFormatString != format) {
+ _timestampFormatString = format;
+ // FIXME reload
+ }
+}
+
+/******** Caching *******/
+
QTextCharFormat UiStyle::cachedFormat(quint64 key) const {
return _formatCache.value(key, QTextCharFormat());
}
_formatCache[formatType | ((quint64)messageLabel << 32)] = format;
}
-// Merge a subelement format into an existing message format
-void UiStyle::mergeSubElementFormat(QTextCharFormat& fmt, quint32 ftype, quint32 label) {
+QFontMetricsF *UiStyle::fontMetrics(quint32 ftype, quint32 label) {
+ // QFontMetricsF is not assignable, so we need to store pointers :/
quint64 key = ftype | ((quint64)label << 32);
- // start with the most general format and then specialize
- fmt.merge(cachedFormat(key & Q_UINT64_C(0x00000000fffffff0))); // basic subelement format
- fmt.merge(cachedFormat(key & Q_UINT64_C(0x00000000ffffffff))); // subelement + msgtype
- fmt.merge(cachedFormat(key & Q_UINT64_C(0xffff0000fffffff0))); // subelement + nickhash
- fmt.merge(cachedFormat(key & Q_UINT64_C(0xffff0000ffffffff))); // subelement + nickhash + msgtype
- fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000fffffffffff0))); // label + subelement
- fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000ffffffffffff))); // label + subelement + msgtype
- fmt.merge(cachedFormat(key & Q_UINT64_C(0xfffffffffffffff0))); // label + subelement + nickhash
- fmt.merge(cachedFormat(key & Q_UINT64_C(0xffffffffffffffff))); // label + subelement + nickhash + msgtype
+ if(_metricsCache.contains(key))
+ return _metricsCache.value(key);
+
+ return (_metricsCache[key] = new QFontMetricsF(format(ftype, label).font()));
}
-// NOTE: This function is intimately tied to the values in FormatType. Don't change this
+/******** Generate formats ********/
+
+// 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_) {
if(ftype == Invalid)
return QTextCharFormat();
- quint64 key = ftype | ((quint64)label << 32);
+ quint64 label = (quint64)label_ << 32;
// check if we have exactly this format readily cached already
- QTextCharFormat fmt = cachedFormat(key);
+ QTextCharFormat fmt = cachedFormat(label|ftype);
if(fmt.properties().count())
return fmt;
- fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000000000000000))); // basic
- fmt.merge(cachedFormat(key & Q_UINT64_C(0x000000000000000f))); // msgtype
- fmt.merge(cachedFormat(key & Q_UINT64_C(0xffff000000000000))); // nickhash
- fmt.merge(cachedFormat(key & Q_UINT64_C(0xffff00000000000f))); // nickhash + msgtype
- fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000ffff00000000))); // label
- fmt.merge(cachedFormat(key & Q_UINT64_C(0x0000ffff0000000f))); // label + msgtype
- fmt.merge(cachedFormat(key & Q_UINT64_C(0xffffffff00000000))); // label + nickhash
- fmt.merge(cachedFormat(key & Q_UINT64_C(0xffffffff0000000f))); // label + nickhash + msgtype
+ mergeFormat(fmt, ftype, label & Q_UINT64_C(0xffff000000000000));
+
+ for(quint64 mask = Q_UINT64_C(0x0000000100000000); mask <= (quint64)Selected << 32; mask <<=1) {
+ if(label & mask)
+ mergeFormat(fmt, ftype, mask | Q_UINT64_C(0xffff000000000000));
+ }
+
+ setCachedFormat(fmt, ftype, label_);
+ return fmt;
+}
+
+void UiStyle::mergeFormat(QTextCharFormat &fmt, quint32 ftype, quint64 label) {
+ mergeSubElementFormat(fmt, ftype & 0x00ff, 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
- for(quint32 mask = 0x10; mask <= 0x2000; mask <<= 1) {
+ for(quint32 mask = 0x00100; mask <= 0x40000; mask <<= 1) {
if(ftype & mask) {
- mergeSubElementFormat(fmt, ftype & 0xffff, label);
+ mergeSubElementFormat(fmt, 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)
// URL
if(ftype & Url)
mergeSubElementFormat(fmt, ftype & Url, label);
-
- setCachedFormat(fmt, ftype, label);
- return fmt;
}
-QFontMetricsF *UiStyle::fontMetrics(quint32 ftype, quint32 label) {
- // QFontMetricsF is not assignable, so we need to store pointers :/
- quint64 key = ftype | ((quint64)label << 32);
-
- if(_metricsCache.contains(key))
- return _metricsCache.value(key);
-
- return (_metricsCache[key] = new QFontMetricsF(format(ftype, label).font()));
+// 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
}
UiStyle::FormatType UiStyle::formatType(Message::Type msgType) {
case Message::DayChange:
return DayChangeMsg;
}
- Q_ASSERT(false); // we need to handle all message types
+ //Q_ASSERT(false); // we need to handle all message types
+ qWarning() << Q_FUNC_INFO << "Unknown message type:" << msgType;
return ErrorMsg;
}
length = 6;
}
} else if(s[pos+1] == 'O') { // reset formatting
- curfmt &= 0x0000000f; // we keep message type-specific formatting
+ curfmt &= 0x000000ff; // we keep message type-specific formatting
length = 2;
} else if(s[pos+1] == 'R') { // reverse
// TODO: implement reverse formatting
}
QString UiStyle::StyledMessage::decoratedTimestamp() const {
- return QString("[%1]").arg(timestamp().toLocalTime().toString("hh:mm:ss"));
+ return timestamp().toLocalTime().toString(UiStyle::timestampFormatString());
}
QString UiStyle::StyledMessage::plainSender() const {
return tr("<%1>").arg(plainSender()); break;
case Message::Notice:
return tr("[%1]").arg(plainSender()); break;
-<<<<<<< HEAD
- case Message::Topic:
- case Message::Server:
- return tr("*"); break;
- case Message::Error:
- return tr("*"); break;
-=======
case Message::Action:
return tr("-*-"); break;
case Message::Nick:
return tr("<->"); break;
case Message::Mode:
return tr("***"); break;
->>>>>>> Handle all message types properly in UiStyle; eliminate msgtype format codes
case Message::Join:
return tr("-->"); break;
case Message::Part:
}
}
-UiStyle::FormatType UiStyle::StyledMessage::senderFormat() const {
- switch(type()) {
- case Message::Plain:
- // 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.
- {
- QString nick = nickFromMask(sender()).toLower();
- if(!nick.isEmpty()) {
- int chopCount = 0;
- while(nick[nick.count() - 1 - chopCount] == '_') {
- chopCount++;
- }
- nick.chop(chopCount);
- }
- quint16 hash = qChecksum(nick.toAscii().data(), nick.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::Topic:
- 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::NickMsg; break;
- case Message::Mode:
- return UiStyle::ModeMsg; break;
- case Message::Action:
- return UiStyle::ActionMsg; break;
- default:
- return UiStyle::ErrorMsg;
- }
-}
-
// FIXME hardcoded to 16 sender hashes
quint8 UiStyle::StyledMessage::senderHash() const {
if(_senderHash != 0xff)
projects / quassel.git / blobdiff