X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=35d3162d158e24e31c3f73c89c0d7882dac2f786;hp=5909c19f78f3b80a944fc03c7461e3f80dc4055d;hb=4c740970699031a20315c7f5666d1f88c439f739;hpb=b243fc8b07e6cffff80af8844bbc4d5df7be7b0b diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp index 5909c19f..35d3162d 100644 --- a/src/uisupport/uistyle.cpp +++ b/src/uisupport/uistyle.cpp @@ -26,6 +26,7 @@ #include "util.h" QHash UiStyle::_formatCodes; +QString UiStyle::_timestampFormatString; UiStyle::UiStyle(QObject *parent) : QObject(parent) { // register FormatList if that hasn't happened yet @@ -49,34 +50,43 @@ UiStyle::UiStyle(QObject *parent) : QObject(parent) { _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) { @@ -100,6 +110,15 @@ 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()); } @@ -112,54 +131,57 @@ void UiStyle::setCachedFormat(const QTextCharFormat &format, quint32 formatType, _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 & 0x000f, 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 = 0x0010; mask <= 0x2000; mask <<= 1) { if(ftype & mask) { - mergeSubElementFormat(fmt, ftype & 0xffff, label); + mergeSubElementFormat(fmt, mask | 0x0f, 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) @@ -170,19 +192,15 @@ QTextCharFormat UiStyle::format(quint32 ftype, quint32 label) { // 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(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 } UiStyle::FormatType UiStyle::formatType(Message::Type msgType) { @@ -216,7 +234,8 @@ 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; } @@ -449,7 +468,7 @@ const UiStyle::FormatList &UiStyle::StyledMessage::contentsFormatList() const { } 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 {