#include "util.h"
QHash<QString, UiStyle::FormatType> UiStyle::_formatCodes;
+QString UiStyle::_timestampFormatString;
UiStyle::UiStyle(QObject *parent) : QObject(parent) {
// register FormatList if that hasn't happened yet
_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();
}
return ss;
}
+void UiStyle::setTimestampFormatString(const QString &format) {
+ if(_timestampFormatString != format) {
+ _timestampFormatString = format;
+ // FIXME reload
+ }
+}
+
/******** Caching *******/
QTextCharFormat UiStyle::cachedFormat(quint64 key) const {
}
void UiStyle::mergeFormat(QTextCharFormat &fmt, quint32 ftype, quint64 label) {
- mergeSubElementFormat(fmt, ftype & 0x000f, 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 = 0x0010; mask <= 0x2000; mask <<= 1) {
+ for(quint32 mask = 0x00100; mask <= 0x40000; mask <<= 1) {
if(ftype & mask) {
- mergeSubElementFormat(fmt, mask | 0x0f, label);
+ mergeSubElementFormat(fmt, mask | 0xff, label);
}
}
}
// 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(0x0000ffffffffff00))); // 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(0xffffffffffffff00))); // label + subelement + nickhash
fmt.merge(cachedFormat(key & Q_UINT64_C(0xffffffffffffffff))); // label + subelement + nickhash + 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 {