From 76ff3775486d1f813d932adf38a53b45966eb274 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Wed, 17 Jun 2009 08:50:27 +0200 Subject: [PATCH] Handle all message types properly in UiStyle; eliminate msgtype format codes Turned out we didn't handle all message types (as in Message::Type) in UiStyle, e.g. the daychange message was treated like an error. Possibly this also fixes the "daychange msg not translated" bug, but I haven't tested yet. Also, styleString() now takes a base message format as optional parameter. This eliminates the need to add the msgtype as one of the %Dx format codes in every message. Accordingly, I've removed those format codes and added a mapping for Message::Type -> UiStyle::FormatType instead that is used to set the initial format for a string to be styled. Sorry translators, this touches most of the strings in UiStyle, so those will have to be updated. --- src/qtui/settingspages/colorsettingspage.cpp | 2 +- src/qtui/topiclabel.cpp | 2 +- src/uisupport/qssparser.cpp | 26 ++-- src/uisupport/uistyle.cpp | 147 +++++++++++++------ src/uisupport/uistyle.h | 25 ++-- 5 files changed, 132 insertions(+), 70 deletions(-) diff --git a/src/qtui/settingspages/colorsettingspage.cpp b/src/qtui/settingspages/colorsettingspage.cpp index 2eb20c02..f77d5785 100644 --- a/src/qtui/settingspages/colorsettingspage.cpp +++ b/src/qtui/settingspages/colorsettingspage.cpp @@ -441,7 +441,7 @@ void ColorSettingsPage::save() { s.setValue("partMessageUseBG", ui.partMessageUseBG->isChecked()); saveColor(UiStyle::QuitMsg, ui.quitMessageFG->color(), ui.quitMessageBG->color(), ui.quitMessageUseBG->isChecked()); s.setValue("quitMessageUseBG", ui.quitMessageUseBG->isChecked()); - saveColor(UiStyle::RenameMsg, ui.renameMessageFG->color(), ui.renameMessageBG->color(), ui.renameMessageUseBG->isChecked()); + saveColor(UiStyle::NickMsg, ui.renameMessageFG->color(), ui.renameMessageBG->color(), ui.renameMessageUseBG->isChecked()); s.setValue("renameMessageUseBG", ui.renameMessageUseBG->isChecked()); QtUi::style()->setHighlightColor(ui.highlightColor->color()); diff --git a/src/qtui/topiclabel.cpp b/src/qtui/topiclabel.cpp index 87031424..e74d5dcb 100644 --- a/src/qtui/topiclabel.cpp +++ b/src/qtui/topiclabel.cpp @@ -78,7 +78,7 @@ void TopicLabel::setText(const QString &text) { offset = 0; update(); - UiStyle::StyledString styledContents = QtUi::style()->styleString("%D0" + QtUi::style()->mircToInternal(text)); + UiStyle::StyledString styledContents = QtUi::style()->styleString(QtUi::style()->mircToInternal(text), UiStyle::PlainMsg); plainText = styledContents.plainText; formatList = QtUi::style()->toTextLayoutList(styledContents.formatList, plainText.length()); int height = 1; diff --git a/src/uisupport/qssparser.cpp b/src/uisupport/qssparser.cpp index dd3d7d55..2aa09ffd 100644 --- a/src/uisupport/qssparser.cpp +++ b/src/uisupport/qssparser.cpp @@ -181,10 +181,12 @@ quint64 QssParser::parseFormatType(const QString &decl) { fmtType |= UiStyle::PlainMsg; else if(msgType == "notice") fmtType |= UiStyle::NoticeMsg; - else if(msgType == "server") - fmtType |= UiStyle::ServerMsg; - else if(msgType == "error") - fmtType |= UiStyle::ErrorMsg; + else if(msgType == "action") + fmtType |= UiStyle::ActionMsg; + else if(msgType == "nick") + fmtType |= UiStyle::NickMsg; + else if(msgType == "mode") + fmtType |= UiStyle::ModeMsg; else if(msgType == "join") fmtType |= UiStyle::JoinMsg; else if(msgType == "part") @@ -193,12 +195,16 @@ quint64 QssParser::parseFormatType(const QString &decl) { fmtType |= UiStyle::QuitMsg; else if(msgType == "kick") fmtType |= UiStyle::KickMsg; - else if(msgType == "rename") - fmtType |= UiStyle::RenameMsg; - else if(msgType == "mode") - fmtType |= UiStyle::ModeMsg; - else if(msgType == "action") - fmtType |= UiStyle::ActionMsg; + else if(msgType == "kill") + fmtType |= UiStyle::KillMsg; + else if(msgType == "server") + fmtType |= UiStyle::ServerMsg; + else if(msgType == "info") + fmtType |= UiStyle::InfoMsg; + else if(msgType == "error") + fmtType |= UiStyle::ErrorMsg; + else if(msgType == "daychange") + fmtType |= UiStyle::DayChangeMsg; else { qWarning() << Q_FUNC_INFO << tr("Invalid message type in %1").arg(decl); } diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp index 6322fb89..7cae8b3f 100644 --- a/src/uisupport/uistyle.cpp +++ b/src/uisupport/uistyle.cpp @@ -41,20 +41,6 @@ UiStyle::UiStyle() { _formatCodes["%U"] = Underline; _formatCodes["%R"] = Reverse; - _formatCodes["%D0"] = PlainMsg; - _formatCodes["%Dn"] = NoticeMsg; - _formatCodes["%Ds"] = ServerMsg; - _formatCodes["%De"] = ErrorMsg; - _formatCodes["%Dj"] = JoinMsg; - _formatCodes["%Dp"] = PartMsg; - _formatCodes["%Dq"] = QuitMsg; - _formatCodes["%Dk"] = KickMsg; - _formatCodes["%Dr"] = RenameMsg; - _formatCodes["%Dm"] = ModeMsg; - _formatCodes["%Da"] = ActionMsg; - - _formatCodes["%DT"] = Timestamp; - _formatCodes["%DS"] = Sender; _formatCodes["%DN"] = Nick; _formatCodes["%DH"] = Hostmask; _formatCodes["%DC"] = ChannelName; @@ -149,6 +135,41 @@ QFontMetricsF *UiStyle::fontMetrics(quint32 ftype, quint32 label) { return (_metricsCache[key] = new QFontMetricsF(format(ftype, label).font())); } +UiStyle::FormatType UiStyle::formatType(Message::Type msgType) const { + switch(msgType) { + case Message::Plain: + return PlainMsg; + case Message::Notice: + return NoticeMsg; + case Message::Action: + return ActionMsg; + case Message::Nick: + return NickMsg; + case Message::Mode: + return ModeMsg; + case Message::Join: + return JoinMsg; + case Message::Part: + return PartMsg; + case Message::Quit: + return QuitMsg; + case Message::Kick: + return KickMsg; + case Message::Kill: + return KillMsg; + case Message::Server: + return ServerMsg; + case Message::Info: + return InfoMsg; + case Message::Error: + return ErrorMsg; + case Message::DayChange: + return DayChangeMsg; + } + Q_ASSERT(false); // we need to handle all message types + return ErrorMsg; +} + UiStyle::FormatType UiStyle::formatType(const QString & code) const { if(_formatCodes.contains(code)) return _formatCodes.value(code); return Invalid; @@ -174,7 +195,7 @@ QList UiStyle::toTextLayoutList(const FormatList &form // This method expects a well-formatted string, there is no error checking! // Since we create those ourselves, we should be pretty safe that nobody does something crappy here. -UiStyle::StyledString UiStyle::styleString(const QString &s_) { +UiStyle::StyledString UiStyle::styleString(const QString &s_, quint32 baseFormat) { QString s = s_; if(s.length() > 65535) { qWarning() << QString("String too long to be styled: %1").arg(s); @@ -182,7 +203,7 @@ UiStyle::StyledString UiStyle::styleString(const QString &s_) { } StyledString result; result.formatList.append(qMakePair((quint16)0, (quint32)None)); - quint32 curfmt = (quint32)None; + quint32 curfmt = baseFormat; int pos = 0; quint16 length = 0; for(;;) { pos = s.indexOf('%', pos); @@ -298,46 +319,65 @@ void UiStyle::StyledMessage::style(UiStyle *style) const { QString t; switch(type()) { case Message::Plain: - t = tr("%D0%1").arg(txt); break; + //: Plain Message + t = tr("%1").arg(txt); break; case Message::Notice: - t = tr("%Dn%1").arg(txt); break; - case Message::Topic: - case Message::Server: - t = tr("%Ds%1").arg(txt); break; - case Message::Error: - t = tr("%De%1").arg(txt); break; + //: Notice Message + t = tr("%1").arg(txt); break; + case Message::Action: + //: Action Message + t = tr("%DN%1%DN %2").arg(nick).arg(txt); + break; + case Message::Nick: + //: Nick Message + if(nick == contents()) t = tr("You are now known as %DN%1%DN").arg(txt); + else t = tr("%DN%1%DN is now known as %DN%2%DN").arg(nick, txt); + break; + case Message::Mode: + //: Mode Message + if(nick.isEmpty()) t = tr("User mode: %DM%1%DM").arg(txt); + else t = tr("Mode %DM%1%DM by %DN%2%DN").arg(txt, nick); + break; case Message::Join: - t = tr("%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC").arg(nick, user, host, bufferName); break; + //: Join Message + t = tr("%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC").arg(nick, user, host, bufferName); break; case Message::Part: - t = tr("%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC").arg(nick, user, host, bufferName); + //: Part Message + t = tr("%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC").arg(nick, user, host, bufferName); if(!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt); break; case Message::Quit: - t = tr("%Dq%DN%1%DN %DH(%2@%3)%DH has quit").arg(nick, user, host); + //: Quit Message + t = tr("%DN%1%DN %DH(%2@%3)%DH has quit").arg(nick, user, host); if(!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt); break; case Message::Kick: { QString victim = txt.section(" ", 0, 0); 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); + //: Kick Message + t = tr("%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 == 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: - if(nick.isEmpty()) t = tr("%DmUser mode: %DM%1%DM").arg(txt); - else t = tr("%DmMode %DM%1%DM by %DN%2%DN").arg(txt, nick); - break; - case Message::Action: - t = tr("%Da%DN%1%DN %2").arg(nick).arg(txt); + //case Message::Kill: FIXME + + case Message::Server: + //: Server Message + t = tr("%1").arg(txt); break; + case Message::Info: + //: Info Message + t = tr("%1").arg(txt); break; + case Message::Error: + //: Error Message + t = tr("%1").arg(txt); break; + case Message::DayChange: + //: Day Change Message + t = tr("{Day changed to %1}").arg(timestamp().toString()); break; default: - t = tr("%De[%1]").arg(txt); + t = tr("[%1]").arg(txt); } - _contents = style->styleString(t); + _contents = style->styleString(t, style->formatType(type())); } QString UiStyle::StyledMessage::decoratedTimestamp() const { @@ -360,11 +400,20 @@ QString UiStyle::StyledMessage::decoratedSender() 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: @@ -373,12 +422,16 @@ QString UiStyle::StyledMessage::decoratedSender() const { return tr("<--"); break; case Message::Kick: return tr("<-*"); break; - case Message::Nick: - return tr("<->"); break; - case Message::Mode: - return tr("***"); break; - case Message::Action: - return tr("-*-"); break; + case Message::Kill: + return tr("<-x"); break; + case Message::Server: + return tr("*"); break; + case Message::Info: + return tr("*"); break; + case Message::Error: + return tr("*"); break; + case Message::DayChange: + return tr("-"); break; default: return tr("%1").arg(plainSender()); } @@ -418,7 +471,7 @@ UiStyle::FormatType UiStyle::StyledMessage::senderFormat() const { case Message::Kick: return UiStyle::KickMsg; break; case Message::Nick: - return UiStyle::RenameMsg; break; + return UiStyle::NickMsg; break; case Message::Mode: return UiStyle::ModeMsg; break; case Message::Action: @@ -428,7 +481,6 @@ UiStyle::FormatType UiStyle::StyledMessage::senderFormat() const { } } - /***********************************************************************************/ QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList) { @@ -466,5 +518,4 @@ void UiStyle::loadStyleSheet() { qDeleteAll(_metricsCache); _metricsCache.clear(); _formatCache = parser.formats(); - } diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h index 60123e29..c55aa1cd 100644 --- a/src/uisupport/uistyle.h +++ b/src/uisupport/uistyle.h @@ -55,15 +55,18 @@ public: // Message Formats (mutually exclusive!) PlainMsg = 0x00000001, NoticeMsg = 0x00000002, - ServerMsg = 0x00000003, - ErrorMsg = 0x00000004, - JoinMsg = 0x00000005, - PartMsg = 0x00000006, - QuitMsg = 0x00000007, - KickMsg = 0x00000008, - RenameMsg = 0x00000009, - ModeMsg = 0x0000000a, - ActionMsg = 0x0000000b, + ActionMsg = 0x00000003, + NickMsg = 0x00000004, + ModeMsg = 0x00000005, + JoinMsg = 0x00000006, + PartMsg = 0x00000007, + QuitMsg = 0x00000008, + KickMsg = 0x00000009, + KillMsg = 0x0000000a, + ServerMsg = 0x0000000b, + InfoMsg = 0x0000000c, + ErrorMsg = 0x0000000d, + DayChangeMsg = 0x0000000e, // Standard Formats Bold = 0x00000010, @@ -99,9 +102,11 @@ public: class StyledMessage; - StyledString styleString(const QString &); + StyledString styleString(const QString &string, quint32 baseFormat = None); QString mircToInternal(const QString &) const; + FormatType formatType(Message::Type msgType) const; + QTextCharFormat format(quint32 formatType, quint32 messageLabel = 0); QFontMetricsF *fontMetrics(quint32 formatType, quint32 messageLabel = 0); -- 2.20.1