#include "buffermodel.h"
#include "buffersettings.h"
#include "client.h"
+#include "clientignorelistmanager.h"
#include "clientsettings.h"
#include "ircchannel.h"
#include "network.h"
newChild(bufferItem);
- // postprocess... this is necessary because Qt doesn't seem to like adding childs which already have childs on their own
+ // postprocess... this is necessary because Qt doesn't seem to like adding children which already have children on their own
switch(bufferInfo.type()) {
case BufferInfo::ChannelBuffer:
{
_firstUnreadMsgId = MsgId();
// FIXME remove with core proto v11
- if(!Client::coreFeatures() & Quassel::SynchronizedMarkerLine) {
+ if(!(Client::coreFeatures() & Quassel::SynchronizedMarkerLine)) {
_markerLineMsgId = _lastSeenMsgId;
}
if(msg.flags() & Message::Self) // don't update activity for our own messages
return;
+ if (Client::ignoreListManager()
+ && Client::ignoreListManager()->match(msg, qobject_cast<NetworkItem *>(parent())->networkName()))
+ return;
+
if(msg.msgId() <= lastSeenMsgId())
return;
_lastSeenMsgId = msgId;
// FIXME remove with core protocol v11
- if(!Client::coreFeatures() & Quassel::SynchronizedMarkerLine) {
+ if(!(Client::coreFeatures() & Quassel::SynchronizedMarkerLine)) {
if(!isCurrentBuffer())
_markerLineMsgId = msgId;
}
toolTip.append(tr("<b>Query with %1</b>").arg(bufferName()));
if(_ircUser) {
- if(_ircUser->userModes() != "") toolTip[0].append(QString(" (%1)").arg(_ircUser->userModes()));
+ if(_ircUser->userModes() != "") toolTip[0].append(QString(" (+%1)").arg(_ircUser->userModes()));
if(_ircUser->isAway()) {
toolTip[0].append(QString(" (away%1)").arg(!_ircUser->awayMessage().isEmpty() ? (QString(" ") + _ircUser->awayMessage()) : QString()));
}
QStringList toolTip(QString("<b>%1</b>").arg(nickName()));
if(_ircUser->userModes() != "") toolTip[0].append(QString(" (%1)").arg(_ircUser->userModes()));
if(_ircUser->isAway()) {
- toolTip[0].append(" is away");
+ toolTip[0].append(tr(" is away"));
if(!_ircUser->awayMessage().isEmpty())
toolTip[0].append(QString(" (%1)").arg(_ircUser->awayMessage()));
}
return;
}
bufferItem->setLastSeenMsgId(msgId);
+ emit lastSeenMsgSet(bufferId, msgId);
}
void NetworkModel::setMarkerLineMsgId(const BufferId &bufferId, const MsgId &msgId) {
return;
}
bufferItem->setMarkerLineMsgId(msgId);
+ emit markerLineSet(bufferId, msgId);
}
void NetworkModel::updateBufferActivity(Message &msg) {
bufferItem->updateActivityLevel(msg);
if(bufferItem->isCurrentBuffer())
- emit setLastSeenMsg(bufferItem->bufferId(), msg.msgId());
+ emit requestSetLastSeenMsg(bufferItem->bufferId(), msg.msgId());
}
void NetworkModel::setBufferActivity(const BufferId &bufferId, BufferInfo::ActivityLevel level) {