projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
properly rewind oidentd config file
[quassel.git]
/
src
/
client
/
networkmodel.cpp
diff --git
a/src/client/networkmodel.cpp
b/src/client/networkmodel.cpp
index
6bc96f8
..
c25fda6
100644
(file)
--- a/
src/client/networkmodel.cpp
+++ b/
src/client/networkmodel.cpp
@@
-26,6
+26,7
@@
#include "buffermodel.h"
#include "buffersettings.h"
#include "client.h"
#include "buffermodel.h"
#include "buffersettings.h"
#include "client.h"
+#include "clientignorelistmanager.h"
#include "clientsettings.h"
#include "ircchannel.h"
#include "network.h"
#include "clientsettings.h"
#include "ircchannel.h"
#include "network.h"
@@
-108,7
+109,7
@@
BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) {
newChild(bufferItem);
newChild(bufferItem);
- // postprocess... this is necessary because Qt doesn't seem to like adding child
s which already have childs
on their own
+ // postprocess... this is necessary because Qt doesn't seem to like adding child
ren which already have children
on their own
switch(bufferInfo.type()) {
case BufferInfo::ChannelBuffer:
{
switch(bufferInfo.type()) {
case BufferInfo::ChannelBuffer:
{
@@
-235,7
+236,7
@@
void BufferItem::clearActivityLevel() {
_firstUnreadMsgId = MsgId();
// FIXME remove with core proto v11
_firstUnreadMsgId = MsgId();
// FIXME remove with core proto v11
- if(!
Client::coreFeatures() & Quassel::SynchronizedMarkerLine
) {
+ if(!
(Client::coreFeatures() & Quassel::SynchronizedMarkerLine)
) {
_markerLineMsgId = _lastSeenMsgId;
}
_markerLineMsgId = _lastSeenMsgId;
}
@@
-250,6
+251,10
@@
void BufferItem::updateActivityLevel(const Message &msg) {
if(msg.flags() & Message::Self) // don't update activity for our own messages
return;
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;
if(msg.msgId() <= lastSeenMsgId())
return;
@@
-319,7
+324,7
@@
void BufferItem::setLastSeenMsgId(MsgId msgId) {
_lastSeenMsgId = msgId;
// FIXME remove with core protocol v11
_lastSeenMsgId = msgId;
// FIXME remove with core protocol v11
- if(!
Client::coreFeatures() & Quassel::SynchronizedMarkerLine
) {
+ if(!
(Client::coreFeatures() & Quassel::SynchronizedMarkerLine)
) {
if(!isCurrentBuffer())
_markerLineMsgId = msgId;
}
if(!isCurrentBuffer())
_markerLineMsgId = msgId;
}
@@
-424,7
+429,7
@@
QString QueryBufferItem::toolTip(int column) const {
toolTip.append(tr("<b>Query with %1</b>").arg(bufferName()));
if(_ircUser) {
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()));
}
if(_ircUser->isAway()) {
toolTip[0].append(QString(" (away%1)").arg(!_ircUser->awayMessage().isEmpty() ? (QString(" ") + _ircUser->awayMessage()) : QString()));
}
@@
-798,7
+803,7
@@
QString IrcUserItem::toolTip(int column) const {
QStringList toolTip(QString("<b>%1</b>").arg(nickName()));
if(_ircUser->userModes() != "") toolTip[0].append(QString(" (%1)").arg(_ircUser->userModes()));
if(_ircUser->isAway()) {
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()));
}
if(!_ircUser->awayMessage().isEmpty())
toolTip[0].append(QString(" (%1)").arg(_ircUser->awayMessage()));
}
@@
-1022,6
+1027,7
@@
void NetworkModel::setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId
return;
}
bufferItem->setLastSeenMsgId(msgId);
return;
}
bufferItem->setLastSeenMsgId(msgId);
+ emit lastSeenMsgSet(bufferId, msgId);
}
void NetworkModel::setMarkerLineMsgId(const BufferId &bufferId, const MsgId &msgId) {
}
void NetworkModel::setMarkerLineMsgId(const BufferId &bufferId, const MsgId &msgId) {
@@
-1032,6
+1038,7
@@
void NetworkModel::setMarkerLineMsgId(const BufferId &bufferId, const MsgId &msg
return;
}
bufferItem->setMarkerLineMsgId(msgId);
return;
}
bufferItem->setMarkerLineMsgId(msgId);
+ emit markerLineSet(bufferId, msgId);
}
void NetworkModel::updateBufferActivity(Message &msg) {
}
void NetworkModel::updateBufferActivity(Message &msg) {
@@
-1087,7
+1094,7
@@
void NetworkModel::updateBufferActivity(BufferItem *bufferItem, const Message &m
bufferItem->updateActivityLevel(msg);
if(bufferItem->isCurrentBuffer())
bufferItem->updateActivityLevel(msg);
if(bufferItem->isCurrentBuffer())
- emit
s
etLastSeenMsg(bufferItem->bufferId(), msg.msgId());
+ emit
requestS
etLastSeenMsg(bufferItem->bufferId(), msg.msgId());
}
void NetworkModel::setBufferActivity(const BufferId &bufferId, BufferInfo::ActivityLevel level) {
}
void NetworkModel::setBufferActivity(const BufferId &bufferId, BufferInfo::ActivityLevel level) {