From b18eac231c8a124a4e3a0792792343863eb10ab2 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Mon, 11 Aug 2008 18:24:15 +0200 Subject: [PATCH] fixing strange looking CTCP ACTIONs (/me style message) in the chat monitor --- src/qtui/chatmonitorfilter.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/qtui/chatmonitorfilter.cpp b/src/qtui/chatmonitorfilter.cpp index d11378d1..ef68a9cd 100644 --- a/src/qtui/chatmonitorfilter.cpp +++ b/src/qtui/chatmonitorfilter.cpp @@ -54,6 +54,8 @@ QVariant ChatMonitorFilter::data(const QModelIndex &index, int role) const { qDebug() << "ChatMonitorFilter::data(): chatline belongs to an invalid buffer!"; return QVariant(); } + + QModelIndex source_index = mapToSource(index); QStringList fields; if(showFields_ & NetworkField) { @@ -62,8 +64,14 @@ QVariant ChatMonitorFilter::data(const QModelIndex &index, int role) const { if(showFields_ & BufferField) { fields << Client::networkModel()->bufferName(bufid); } - fields << MessageFilter::data(index, role).toString().mid(1); - return QString("<%1").arg(fields.join(":")); + + Message::Type messageType = (Message::Type)sourceModel()->data(source_index, MessageModel::TypeRole).toInt(); + if(messageType & (Message::Plain | Message::Notice)) { + QString sender = MessageFilter::data(index, role).toString(); + // we have to strip leading and traling < / > + fields << sender.mid(1, sender.count() - 2); + } + return QString("<%1>").arg(fields.join(":")); } void ChatMonitorFilter::addShowField(int field) { -- 2.20.1