Lowercase seems to be the convention in stylesheet syntax, so we adhere to
that. Even though we do bend the original definitions of "subelement" and
"objectname" a bit to fit our purposes :)
while((pos = blockrx.indexIn(ss, pos)) >= 0) {
//qDebug() << blockrx.cap(1) << blockrx.cap(2);
while((pos = blockrx.indexIn(ss, pos)) >= 0) {
//qDebug() << blockrx.cap(1) << blockrx.cap(2);
- if(blockrx.cap(2) == "ChatLine")
+ if(blockrx.cap(1).startsWith("ChatLine"))
parseChatLineData(blockrx.cap(1).trimmed(), blockrx.cap(2).trimmed());
//else
// TODO: add moar here
parseChatLineData(blockrx.cap(1).trimmed(), blockrx.cap(2).trimmed());
//else
// TODO: add moar here
// First determine the subelement
if(!subElement.isEmpty()) {
// First determine the subelement
if(!subElement.isEmpty()) {
- if(subElement == "Timestamp")
+ if(subElement == "timestamp")
fmtType |= UiStyle::Timestamp;
fmtType |= UiStyle::Timestamp;
- else if(subElement == "Sender")
+ else if(subElement == "sender")
fmtType |= UiStyle::Sender;
fmtType |= UiStyle::Sender;
- else if(subElement == "Nick")
+ else if(subElement == "nick")
fmtType |= UiStyle::Nick;
fmtType |= UiStyle::Nick;
- else if(subElement == "Hostmask")
+ else if(subElement == "hostmask")
fmtType |= UiStyle::Hostmask;
fmtType |= UiStyle::Hostmask;
- else if(subElement == "ModeFlags")
+ else if(subElement == "modeflags")
fmtType |= UiStyle::ModeFlags;
else {
qWarning() << Q_FUNC_INFO << tr("Invalid subelement name in %1").arg(decl);
fmtType |= UiStyle::ModeFlags;
else {
qWarning() << Q_FUNC_INFO << tr("Invalid subelement name in %1").arg(decl);
// Now, figure out the message type
if(!msgType.isEmpty()) {
// Now, figure out the message type
if(!msgType.isEmpty()) {
fmtType |= UiStyle::PlainMsg;
fmtType |= UiStyle::PlainMsg;
- else if(msgType == "Notice")
+ else if(msgType == "notice")
fmtType |= UiStyle::NoticeMsg;
fmtType |= UiStyle::NoticeMsg;
- else if(msgType == "Server")
+ else if(msgType == "server")
fmtType |= UiStyle::ServerMsg;
fmtType |= UiStyle::ServerMsg;
- else if(msgType == "Error")
+ else if(msgType == "error")
fmtType |= UiStyle::ErrorMsg;
fmtType |= UiStyle::ErrorMsg;
- else if(msgType == "Join")
+ else if(msgType == "join")
fmtType |= UiStyle::JoinMsg;
fmtType |= UiStyle::JoinMsg;
- else if(msgType == "Part")
+ else if(msgType == "part")
fmtType |= UiStyle::PartMsg;
fmtType |= UiStyle::PartMsg;
- else if(msgType == "Quit")
+ else if(msgType == "quit")
fmtType |= UiStyle::QuitMsg;
fmtType |= UiStyle::QuitMsg;
- else if(msgType == "Kick")
+ else if(msgType == "kick")
fmtType |= UiStyle::KickMsg;
fmtType |= UiStyle::KickMsg;
- else if(msgType == "Rename")
+ else if(msgType == "rename")
fmtType |= UiStyle::RenameMsg;
fmtType |= UiStyle::RenameMsg;
- else if(msgType == "Mode")
+ else if(msgType == "mode")
fmtType |= UiStyle::ModeMsg;
fmtType |= UiStyle::ModeMsg;
- else if(msgType == "Action")
+ else if(msgType == "action")
fmtType |= UiStyle::ActionMsg;
else {
qWarning() << Q_FUNC_INFO << tr("Invalid message type in %1").arg(decl);
fmtType |= UiStyle::ActionMsg;
else {
qWarning() << Q_FUNC_INFO << tr("Invalid message type in %1").arg(decl);
// check if we have exactly this format readily cached already
QTextCharFormat fmt = cachedFormat(key);
// check if we have exactly this format readily cached already
QTextCharFormat fmt = cachedFormat(key);
+ if(fmt.properties().count())
return fmt;
fmt.merge(cachedFormat(key & 0x0000000000000000)); // basic
return fmt;
fmt.merge(cachedFormat(key & 0x0000000000000000)); // basic