/***************************************************************************
- * Copyright (C) 2005-2012 by the Quassel Project *
+ * Copyright (C) 2005-2016 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <QFontMetrics>
{
if (!msg.sender().contains('!'))
_styledMsg.setFlags(msg.flags() |= Message::ServerMsg);
+
+ if (_styledMsg.type() == Message::Nick) {
+ // HACK: Work around nick changes on Quassel core not properly being set as Self
+ // While this is fixed in the core, old cores and past history will still show incorrectly.
+ if (nickFromMask(_styledMsg.sender()) == stripFormatCodes(_styledMsg.contents()).toLower()) {
+ _styledMsg.setFlags(msg.flags() |= Message::Self);
+ }
+ }
+ // Unfortunately, the missing Self flag for other message types can't easily be worked around.
}
QVariant ChatLineModelItem::data(int column, int role) const
{
if (role == ChatLineModel::MsgLabelRole)
- return messageLabel();
+ return QVariant::fromValue<UiStyle::MessageLabel>(messageLabel());
QVariant variant;
MessageModel::ColumnType col = (MessageModel::ColumnType)column;
case ChatLineModel::EditRole:
return _styledMsg.timestamp();
case ChatLineModel::BackgroundRole:
- return backgroundBrush(UiStyle::Timestamp);
+ return backgroundBrush(UiStyle::FormatType::Timestamp);
case ChatLineModel::SelectedBackgroundRole:
- return backgroundBrush(UiStyle::Timestamp, true);
+ return backgroundBrush(UiStyle::FormatType::Timestamp, true);
case ChatLineModel::FormatRole:
- return QVariant::fromValue<UiStyle::FormatList>(UiStyle::FormatList()
- << qMakePair((quint16)0, (quint32) UiStyle::formatType(_styledMsg.type()) | UiStyle::Timestamp));
+ return QVariant::fromValue<UiStyle::FormatList>({std::make_pair(quint16{0}, UiStyle::Format{UiStyle::formatType(_styledMsg.type()) | UiStyle::FormatType::Timestamp, {}, {}})});
}
return QVariant();
}
case ChatLineModel::EditRole:
return _styledMsg.plainSender();
case ChatLineModel::BackgroundRole:
- return backgroundBrush(UiStyle::Sender);
+ return backgroundBrush(UiStyle::FormatType::Sender);
case ChatLineModel::SelectedBackgroundRole:
- return backgroundBrush(UiStyle::Sender, true);
+ return backgroundBrush(UiStyle::FormatType::Sender, true);
case ChatLineModel::FormatRole:
- return QVariant::fromValue<UiStyle::FormatList>(UiStyle::FormatList()
- << qMakePair((quint16)0, (quint32) UiStyle::formatType(_styledMsg.type()) | UiStyle::Sender));
+ return QVariant::fromValue<UiStyle::FormatList>({std::make_pair(quint16{0}, UiStyle::Format{UiStyle::formatType(_styledMsg.type()) | UiStyle::FormatType::Sender, {}, {}})});
}
return QVariant();
}
case ChatLineModel::EditRole:
return _styledMsg.plainContents();
case ChatLineModel::BackgroundRole:
- return backgroundBrush(UiStyle::Contents);
+ return backgroundBrush(UiStyle::FormatType::Contents);
case ChatLineModel::SelectedBackgroundRole:
- return backgroundBrush(UiStyle::Contents, true);
+ return backgroundBrush(UiStyle::FormatType::Contents, true);
case ChatLineModel::FormatRole:
return QVariant::fromValue<UiStyle::FormatList>(_styledMsg.contentsFormatList());
case ChatLineModel::WrapListRole:
}
-quint32 ChatLineModelItem::messageLabel() const
+UiStyle::MessageLabel ChatLineModelItem::messageLabel() const
{
- quint32 label = _styledMsg.senderHash() << 16;
+ using MessageLabel = UiStyle::MessageLabel;
+
+ MessageLabel label = static_cast<MessageLabel>(_styledMsg.senderHash() << 16);
if (_styledMsg.flags() & Message::Self)
- label |= UiStyle::OwnMsg;
+ label |= MessageLabel::OwnMsg;
if (_styledMsg.flags() & Message::Highlight)
- label |= UiStyle::Highlight;
+ label |= MessageLabel::Highlight;
return label;
}
QVariant ChatLineModelItem::backgroundBrush(UiStyle::FormatType subelement, bool selected) const
{
- QTextCharFormat fmt = QtUi::style()->format(UiStyle::formatType(_styledMsg.type()) | subelement, messageLabel() | (selected ? UiStyle::Selected : 0));
+ QTextCharFormat fmt = QtUi::style()->format({UiStyle::formatType(_styledMsg.type()) | subelement, {}, {}},
+ messageLabel() | (selected ? UiStyle::MessageLabel::Selected : UiStyle::MessageLabel::None));
if (fmt.hasProperty(QTextFormat::BackgroundBrush))
return QVariant::fromValue<QBrush>(fmt.background());
return QVariant();