From: Marcus Eggenberger Date: Tue, 13 Jan 2009 14:52:31 +0000 (+0100) Subject: UiStyle::StyledMessage derived now from Message X-Git-Tag: 0.4.0~225 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=1566f62849f9011656d9111b99f023d694bb8805;hp=86831c8857f0a729580cee547e10c9621d50c780 UiStyle::StyledMessage derived now from Message --- diff --git a/src/qtui/chatlinemodelitem.cpp b/src/qtui/chatlinemodelitem.cpp index 681f4cf7..a3de834a 100644 --- a/src/qtui/chatlinemodelitem.cpp +++ b/src/qtui/chatlinemodelitem.cpp @@ -97,7 +97,7 @@ QVariant ChatLineModelItemPrivate::data(MessageModel::ColumnType column, int rol case ChatLineModel::DisplayRole: return _styledMsg->decoratedSender(); case ChatLineModel::EditRole: - return _styledMsg->sender(); + return _styledMsg->plainSender(); case ChatLineModel::FormatRole: return QVariant::fromValue(UiStyle::FormatList() << qMakePair((quint16)0, (quint32)_styledMsg->senderFormat())); @@ -107,7 +107,7 @@ QVariant ChatLineModelItemPrivate::data(MessageModel::ColumnType column, int rol switch(role) { case ChatLineModel::DisplayRole: case ChatLineModel::EditRole: - return _styledMsg->contents(); + return _styledMsg->plainContents(); case ChatLineModel::FormatRole: return QVariant::fromValue(_styledMsg->contentsFormatList()); case ChatLineModel::WrapListRole: @@ -124,7 +124,8 @@ QVariant ChatLineModelItemPrivate::data(MessageModel::ColumnType column, int rol } void ChatLineModelItemPrivate::style() { - _styledMsg = new QtUiStyle::StyledMessage(QtUi::style()->styleMessage(*_msgBuffer)); + _styledMsg = new QtUiStyle::StyledMessage(*_msgBuffer); + _styledMsg->style(QtUi::style()); delete _msgBuffer; _msgBuffer = 0; } diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp index 1ac819ac..141ff335 100644 --- a/src/uisupport/uistyle.cpp +++ b/src/uisupport/uistyle.cpp @@ -312,30 +312,25 @@ QString UiStyle::mircToInternal(const QString &mirc_) const { return mirc; } -UiStyle::StyledMessage UiStyle::styleMessage(const Message &msg) { - return StyledMessage(msg, this); -} - /***********************************************************************************/ +UiStyle::StyledMessage::StyledMessage(const Message &msg) + : Message(msg) +{ +} -UiStyle::StyledMessage::StyledMessage(const Message &msg, UiStyle *style) { - QString user = userFromMask(msg.sender()); - QString host = hostFromMask(msg.sender()); - QString nick = nickFromMask(msg.sender()); - QString txt = style->mircToInternal(msg.contents()); - QString bufferName = msg.bufferInfo().bufferName(); +void UiStyle::StyledMessage::style(UiStyle *style) { + QString user = userFromMask(sender()); + QString host = hostFromMask(sender()); + QString nick = nickFromMask(sender()); + QString txt = style->mircToInternal(contents()); + QString bufferName = bufferInfo().bufferName(); bufferName.replace('%', "%%"); // well, you _can_ have a % in a buffername apparently... -_- - _msgType = msg.type(); - _timestamp = msg.timestamp(); - QString t; - switch(msg.type()) { + switch(type()) { case Message::Plain: - _sender = nick; t = tr("%D0%1").arg(txt); break; case Message::Notice: - _sender = nick; t = tr("%Dn%1").arg(txt); break; case Message::Server: t = tr("%Ds%1").arg(txt); break; @@ -353,14 +348,13 @@ UiStyle::StyledMessage::StyledMessage(const Message &msg, UiStyle *style) { break; case Message::Kick: { QString victim = txt.section(" ", 0, 0); - //if(victim == ui.ownNick->currentText()) victim = tr("you"); 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); if(!kickmsg.isEmpty()) t = QString("%1 (%2)").arg(t).arg(kickmsg); } break; case Message::Nick: - if(nick == msg.contents()) t = tr("%DrYou are now known as %DN%1%DN").arg(txt); + 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: @@ -371,25 +365,20 @@ UiStyle::StyledMessage::StyledMessage(const Message &msg, UiStyle *style) { t = tr("%Da%DN%1%DN %2").arg(nick).arg(txt); break; default: - _sender = msg.sender(); t = tr("%De[%1]").arg(txt); } _contents = style->styleString(t); } -QDateTime UiStyle::StyledMessage::timestamp() const { - return _timestamp; -} - QString UiStyle::StyledMessage::decoratedTimestamp() const { - return QString("[%1]").arg(_timestamp.toLocalTime().toString("hh:mm:ss")); + return QString("[%1]").arg(timestamp().toLocalTime().toString("hh:mm:ss")); } -QString UiStyle::StyledMessage::sender() const { +QString UiStyle::StyledMessage::plainSender() const { switch(type()) { case Message::Plain: case Message::Notice: - return _sender; + return nickFromMask(sender()); default: return QString(); } @@ -398,9 +387,9 @@ QString UiStyle::StyledMessage::sender() const { QString UiStyle::StyledMessage::decoratedSender() const { switch(type()) { case Message::Plain: - return tr("<%1>").arg(_sender); break; + return tr("<%1>").arg(plainSender()); break; case Message::Notice: - return tr("[%1]").arg(_sender); break; + return tr("[%1]").arg(plainSender()); break; case Message::Server: return tr("*"); break; case Message::Error: @@ -420,18 +409,10 @@ QString UiStyle::StyledMessage::decoratedSender() const { case Message::Action: return tr("-*-"); break; default: - return tr("%1").arg(_sender); + return tr("%1").arg(plainSender()); } } -QString UiStyle::StyledMessage::contents() const { - return _contents.plainText; -} - -UiStyle::FormatType UiStyle::StyledMessage::timestampFormat() const { - return UiStyle::Timestamp; -} - UiStyle::FormatType UiStyle::StyledMessage::senderFormat() const { switch(type()) { case Message::Plain: @@ -461,10 +442,6 @@ UiStyle::FormatType UiStyle::StyledMessage::senderFormat() const { } } -UiStyle::FormatList UiStyle::StyledMessage::contentsFormatList() const { - return _contents.formatList; -} - /***********************************************************************************/ QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList) { diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h index 6bd68015..76922279 100644 --- a/src/uisupport/uistyle.h +++ b/src/uisupport/uistyle.h @@ -18,8 +18,8 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef _UISTYLE_H_ -#define _UISTYLE_H_ +#ifndef UISTYLE_H +#define UISTYLE_H #include #include @@ -33,150 +33,143 @@ class UiStyle { Q_DECLARE_TR_FUNCTIONS(UiStyle) - public: - UiStyle(const QString &settingsKey); - virtual ~UiStyle(); - - typedef QList > FormatList; - - //! This enumerates the possible formats a text element may have. */ - /** These formats are ordered on increasing importance, in cases where a given property is specified - * by multiple active formats. - * \NOTE: Do not change/add values here without also adapting the relevant - * methods in this class (in particular mergedFormat())! - * Also, we _do_ rely on certain properties of these values in styleString() and friends! - */ - enum FormatType { - None = 0x00000000, - Invalid = 0x11111111, - // 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, - // Standard Formats - Bold = 0x00000010, - Italic = 0x00000020, - Underline = 0x00000040, - Reverse = 0x00000080, - // Individual parts of a message - Timestamp = 0x00000100, - Sender = 0x00000200, - Nick = 0x00000400, - Hostmask = 0x00000800, - ChannelName = 0x00001000, - ModeFlags = 0x00002000, - // URL is special, we want that to take precedence over the rest... - Url = 0x00100000, - // Colors - FgCol00 = 0x00400000, - FgCol01 = 0x01400000, - FgCol02 = 0x02400000, - FgCol03 = 0x03400000, - FgCol04 = 0x04400000, - FgCol05 = 0x05400000, - FgCol06 = 0x06400000, - FgCol07 = 0x07400000, - FgCol08 = 0x08400000, - FgCol09 = 0x09400000, - FgCol10 = 0x0a400000, - FgCol11 = 0x0b400000, - FgCol12 = 0x0c400000, - FgCol13 = 0x0d400000, - FgCol14 = 0x0e400000, - FgCol15 = 0x0f400000, - - BgCol00 = 0x00800000, - BgCol01 = 0x10800000, - BgCol02 = 0x20800000, - BgCol03 = 0x30800000, - BgCol04 = 0x40800000, - BgCol05 = 0x50800000, - BgCol06 = 0x60800000, - BgCol07 = 0x70800000, - BgCol08 = 0x80800000, - BgCol09 = 0x90800000, - BgCol10 = 0xa0800000, - BgCol11 = 0xb0800000, - BgCol12 = 0xc0800000, - BgCol13 = 0xd0800000, - BgCol14 = 0xe0800000, - BgCol15 = 0xf0800000 - - }; - - struct UrlInfo { - int start, end; - QUrl url; - }; - - struct StyledString { - QString plainText; - FormatList formatList; // starting pos, ftypes - }; - - class StyledMessage; - - StyledString styleString(const QString &); - StyledMessage styleMessage(const Message &); - QString mircToInternal(const QString &) const; - - void setFormat(FormatType, QTextCharFormat, Settings::Mode mode/* = Settings::Custom*/); - QTextCharFormat format(FormatType, Settings::Mode mode = Settings::Custom) const; - QTextCharFormat mergedFormat(quint32 formatType); - QFontMetricsF *fontMetrics(quint32 formatType); - - FormatType formatType(const QString &code) const; - QString formatCode(FormatType) const; - - inline QFont defaultFont() const { return _defaultFont; } - - QList toTextLayoutList(const FormatList &, int textLength); - - protected: - - - private: - - QFont _defaultFont; - QTextCharFormat _defaultPlainFormat; - QHash _defaultFormats; - QHash _customFormats; - QHash _cachedFormats; - QHash _cachedFontMetrics; - QHash _formatCodes; - - QString _settingsKey; +public: + UiStyle(const QString &settingsKey); + virtual ~UiStyle(); + + typedef QList > FormatList; + + //! This enumerates the possible formats a text element may have. */ + /** These formats are ordered on increasing importance, in cases where a given property is specified + * by multiple active formats. + * \NOTE: Do not change/add values here without also adapting the relevant + * methods in this class (in particular mergedFormat())! + * Also, we _do_ rely on certain properties of these values in styleString() and friends! + */ + enum FormatType { + None = 0x00000000, + Invalid = 0x11111111, + // 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, + // Standard Formats + Bold = 0x00000010, + Italic = 0x00000020, + Underline = 0x00000040, + Reverse = 0x00000080, + // Individual parts of a message + Timestamp = 0x00000100, + Sender = 0x00000200, + Nick = 0x00000400, + Hostmask = 0x00000800, + ChannelName = 0x00001000, + ModeFlags = 0x00002000, + // URL is special, we want that to take precedence over the rest... + Url = 0x00100000, + // Colors + FgCol00 = 0x00400000, + FgCol01 = 0x01400000, + FgCol02 = 0x02400000, + FgCol03 = 0x03400000, + FgCol04 = 0x04400000, + FgCol05 = 0x05400000, + FgCol06 = 0x06400000, + FgCol07 = 0x07400000, + FgCol08 = 0x08400000, + FgCol09 = 0x09400000, + FgCol10 = 0x0a400000, + FgCol11 = 0x0b400000, + FgCol12 = 0x0c400000, + FgCol13 = 0x0d400000, + FgCol14 = 0x0e400000, + FgCol15 = 0x0f400000, + + BgCol00 = 0x00800000, + BgCol01 = 0x10800000, + BgCol02 = 0x20800000, + BgCol03 = 0x30800000, + BgCol04 = 0x40800000, + BgCol05 = 0x50800000, + BgCol06 = 0x60800000, + BgCol07 = 0x70800000, + BgCol08 = 0x80800000, + BgCol09 = 0x90800000, + BgCol10 = 0xa0800000, + BgCol11 = 0xb0800000, + BgCol12 = 0xc0800000, + BgCol13 = 0xd0800000, + BgCol14 = 0xe0800000, + BgCol15 = 0xf0800000 + + }; + + struct UrlInfo { + int start, end; + QUrl url; + }; + + struct StyledString { + QString plainText; + FormatList formatList; // starting pos, ftypes + }; + + class StyledMessage; + + StyledString styleString(const QString &); + QString mircToInternal(const QString &) const; + + void setFormat(FormatType, QTextCharFormat, Settings::Mode mode/* = Settings::Custom*/); + QTextCharFormat format(FormatType, Settings::Mode mode = Settings::Custom) const; + QTextCharFormat mergedFormat(quint32 formatType); + QFontMetricsF *fontMetrics(quint32 formatType); + + FormatType formatType(const QString &code) const; + QString formatCode(FormatType) const; + + inline QFont defaultFont() const { return _defaultFont; } + + QList toTextLayoutList(const FormatList &, int textLength); + +protected: +private: + QFont _defaultFont; + QTextCharFormat _defaultPlainFormat; + QHash _defaultFormats; + QHash _customFormats; + QHash _cachedFormats; + QHash _cachedFontMetrics; + QHash _formatCodes; + + QString _settingsKey; }; -class UiStyle::StyledMessage { +class UiStyle::StyledMessage : public Message { public: - explicit StyledMessage(const Message &, UiStyle *style); + explicit StyledMessage(const Message &message); + + bool inline needsStyling() const { return _contents.plainText.isNull(); } + void style(UiStyle *style); - QDateTime timestamp() const; QString decoratedTimestamp() const; - QString sender() const; //!< Nickname (no decorations) for Plain and Notice, empty else + QString plainSender() const; //!< Nickname (no decorations) for Plain and Notice, empty else QString decoratedSender() const; - QString contents() const; + const QString &plainContents() const { return _contents.plainText; } - FormatType timestampFormat() const; + inline FormatType timestampFormat() const { return UiStyle::Timestamp; } FormatType senderFormat() const; - FormatList contentsFormatList() const; - - inline Message::Type type() const { return _msgType; } + inline const FormatList &contentsFormatList() const { return _contents.formatList; } private: StyledString _contents; - QDateTime _timestamp; - QString _sender; - Message::Type _msgType; }; QDataStream &operator<<(QDataStream &out, const UiStyle::FormatList &formatList);