projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing a bug where quit messages from different networks were shown if the user has...
[quassel.git]
/
src
/
client
/
networkmodel.cpp
diff --git
a/src/client/networkmodel.cpp
b/src/client/networkmodel.cpp
index
3e1bb10
..
0ffd9c0
100644
(file)
--- a/
src/client/networkmodel.cpp
+++ b/
src/client/networkmodel.cpp
@@
-39,11
+39,16
@@
NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent)
: PropertyMapItem(QList<QString>() << "networkName" << "currentServer" << "nickCount", parent),
_networkId(netid)
{
: PropertyMapItem(QList<QString>() << "networkName" << "currentServer" << "nickCount", parent),
_networkId(netid)
{
- setFlags(Qt::ItemIsEnabled);
+ setFlags(Qt::ItemIsEnabled
| Qt::ItemIsSelectable
);
}
QVariant NetworkItem::data(int column, int role) const {
switch(role) {
}
QVariant NetworkItem::data(int column, int role) const {
switch(role) {
+ case NetworkModel::BufferIdRole:
+ if(childCount())
+ return child(0)->data(column, role);
+ else
+ return QVariant();
case NetworkModel::NetworkIdRole:
return qVariantFromValue(_networkId);
case NetworkModel::ItemTypeRole:
case NetworkModel::NetworkIdRole:
return qVariantFromValue(_networkId);
case NetworkModel::ItemTypeRole:
@@
-185,7
+190,6
@@
void BufferItem::setActivityLevel(BufferInfo::ActivityLevel level) {
}
}
}
}
-//void BufferItem::updateActivityLevel(BufferInfo::ActivityLevel level) {
void BufferItem::updateActivityLevel(const Message &msg) {
if(isCurrentBuffer())
return;
void BufferItem::updateActivityLevel(const Message &msg) {
if(isCurrentBuffer())
return;
@@
-247,6
+251,11
@@
void BufferItem::setBufferName(const QString &name) {
emit dataChanged(0);
}
emit dataChanged(0);
}
+void BufferItem::setLastSeenMsgId(const MsgId &msgId) {
+ _lastSeenMsgId = msgId;
+ setActivityLevel(BufferInfo::NoActivity);
+}
+
bool BufferItem::isCurrentBuffer() const {
return _bufferInfo.bufferId() == Client::bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>();
}
bool BufferItem::isCurrentBuffer() const {
return _bufferInfo.bufferId() == Client::bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>();
}