X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=8cf95bb69061299ff6cdb0b1fcf6643d7b0e535c;hp=6c2426de3c2cffefadc12e378d121b7e513b58a5;hb=3bb86923bd1b39089abacc4fcb08bb4939ab70e0;hpb=fd7c2c4a41b5bb9cffcfe7a8f86a28ab7f38ac27 diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 6c2426de..8cf95bb6 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -18,8 +18,6 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include // FIXME Dependency on QtGui! - #include "networkmodel.h" #include @@ -31,64 +29,106 @@ #include "ircchannel.h" #include "ircuser.h" +#include "util.h" // get rid of this (needed for isChannelName) + /***************************************** * Fancy Buffer Items *****************************************/ -BufferItem::BufferItem(Buffer *buffer, AbstractTreeItem *parent) +BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent) : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent), - buf(buffer), - activity(Buffer::NoActivity) + _bufferInfo(bufferInfo), + _activity(NoActivity) { + // determine BufferType + if(bufferInfo.bufferName().isEmpty()) + _type = StatusType; + else if(isChannelName(bufferInfo.bufferName())) + _type = ChannelType; + else + _type = QueryType; + Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled; - if(buf->bufferType() == Buffer::QueryType) + if(bufferType() == QueryType) flags |= Qt::ItemIsDropEnabled; setFlags(flags); + + _lastSeen = BufferSettings(bufferInfo.bufferId()).lastSeen(); +} + +const BufferInfo &BufferItem::bufferInfo() const { + return _bufferInfo; } quint64 BufferItem::id() const { - return buf->bufferInfo().uid(); + return qHash(bufferInfo().bufferId()); } -void BufferItem::setActivity(const Buffer::ActivityLevel &level) { - activity = level; +bool BufferItem::isStatusBuffer() const { + return bufferType() == StatusType; } -QColor BufferItem::foreground(int column) const { - Q_UNUSED(column) - // for the time beeing we ignore the column :) - if(activity & Buffer::Highlight) { - return QColor(Qt::red); - } else if(activity & Buffer::NewMessage) { - return QColor(Qt::darkYellow); - } else if(activity & Buffer::OtherActivity) { - return QColor(Qt::darkGreen); - } else { - if(buf->isActive()) - return QColor(Qt::black); - else - return QColor(Qt::gray); - } +BufferItem::Type BufferItem::bufferType() const { + return _type; +} + +bool BufferItem::isActive() const { + if(bufferType() == ChannelType) + return _ircChannel; + else + return qobject_cast(parent())->isActive(); +} + +BufferItem::ActivityLevel BufferItem::activity() const { + return _activity; +} + +bool BufferItem::setActivity(const ActivityLevel &level) { + _activity = level; + emit dataChanged(); + return true; +} + +void BufferItem::updateActivity(const ActivityLevel &level) { + ActivityLevel oldActivity = _activity; + _activity |= level; + if(oldActivity != _activity) + emit dataChanged(); } QVariant BufferItem::data(int column, int role) const { switch(role) { case NetworkModel::ItemTypeRole: return NetworkModel::BufferItemType; - case NetworkModel::BufferUidRole: - return buf->bufferInfo().uid(); + case NetworkModel::BufferIdRole: + return qVariantFromValue(bufferInfo().bufferId()); case NetworkModel::NetworkIdRole: - return buf->bufferInfo().networkId(); + return qVariantFromValue(bufferInfo().networkId()); + case NetworkModel::BufferInfoRole: + return qVariantFromValue(bufferInfo()); case NetworkModel::BufferTypeRole: - return int(buf->bufferType()); - case NetworkModel::BufferActiveRole: - return buf->isActive(); - case Qt::ForegroundRole: - return foreground(column); + return int(bufferType()); + case NetworkModel::ItemActiveRole: + return isActive(); + case NetworkModel::BufferActivityRole: + return qVariantFromValue((int)activity()); default: return PropertyMapItem::data(column, role); } } +bool BufferItem::setData(int column, const QVariant &value, int role) { + switch(role) { + case NetworkModel::BufferActivityRole: + return setActivity((ActivityLevel)value.toInt()); + case NetworkModel::LastSeenRole: + return setLastSeen(); + default: + return PropertyMapItem::setData(column, value, role); + } + return true; +} + + void BufferItem::attachIrcChannel(IrcChannel *ircChannel) { if(!ircChannel) return; @@ -101,10 +141,35 @@ void BufferItem::attachIrcChannel(IrcChannel *ircChannel) { this, SLOT(join(IrcUser *))); connect(ircChannel, SIGNAL(ircUserParted(IrcUser *)), this, SLOT(part(IrcUser *))); + connect(ircChannel, SIGNAL(destroyed()), + this, SLOT(ircChannelDestroyed())); + connect(ircChannel, SIGNAL(ircUserModesSet(IrcUser *, QString)), + this, SLOT(userModeChanged(IrcUser *))); + connect(ircChannel, SIGNAL(ircUserModeAdded(IrcUser *, QString)), + this, SLOT(userModeChanged(IrcUser *))); + connect(ircChannel, SIGNAL(ircUserModeRemoved(IrcUser *, QString)), + this, SLOT(userModeChanged(IrcUser *))); + + if(!ircChannel->ircUsers().isEmpty()) { + qWarning() << "Channel" << ircChannel->name() << "has already users which is quite surprising :)"; + foreach(IrcUser *ircUser, ircChannel->ircUsers()) { + join(ircUser); + } + } + + emit dataChanged(); +} + +void BufferItem::ircChannelDestroyed() { + emit dataChanged(); + removeAllChilds(); } QString BufferItem::bufferName() const { - return buf->name(); + if(bufferType() == StatusType) + return tr("Status Buffer"); + else + return bufferInfo().bufferName(); } QString BufferItem::topic() const { @@ -114,6 +179,13 @@ QString BufferItem::topic() const { return QString(); } +void BufferItem::ircUserDestroyed() { + // PRIVATE + IrcUser *ircUser = static_cast(sender()); + removeUserFromCategory(ircUser); + emit dataChanged(2); +} + int BufferItem::nickCount() const { if(_ircChannel) return _ircChannel->ircUsers().count(); @@ -127,22 +199,110 @@ void BufferItem::setTopic(const QString &topic) { } void BufferItem::join(IrcUser *ircUser) { - emit newChild(new IrcUserItem(ircUser, this)); + if(!ircUser) + return; + + addUserToCategory(ircUser); + connect(ircUser, SIGNAL(destroyed()), + this, SLOT(ircUserDestroyed())); emit dataChanged(2); } +void BufferItem::addUserToCategory(IrcUser *ircUser) { + Q_ASSERT(_ircChannel); + + UserCategoryItem *categoryItem; + int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser)); + if(!(categoryItem = qobject_cast(childById(qHash(categoryId))))) { + categoryItem = new UserCategoryItem(categoryId, this); + newChild(categoryItem); + } + categoryItem->addUser(ircUser); + + int totalusers = 0; + for(int i = 0; i < childCount(); i++) { + totalusers += child(i)->childCount(); + } +} + void BufferItem::part(IrcUser *ircUser) { - Q_UNUSED(ircUser); + if(!ircUser) { + qWarning() << bufferName() << "BufferItem::part(): unknown User" << ircUser; + return; + } + + disconnect(ircUser, 0, this, 0); + removeUserFromCategory(ircUser); emit dataChanged(2); } +void BufferItem::removeUserFromCategory(IrcUser *ircUser) { + Q_ASSERT(_ircChannel); + + bool success = false; + UserCategoryItem *categoryItem = 0; + for(int i = 0; i < childCount(); i++) { + categoryItem = qobject_cast(child(i)); + if(success = categoryItem->removeUser(ircUser)) { + if(categoryItem->childCount() == 0) + removeChild(i); + break; + } + } + + if(!success) { + qDebug() << "didn't find User:" << ircUser << qHash(ircUser); + qDebug() << "==== Childlist for Item:" << this << id() << bufferName() << "===="; + for(int i = 0; i < childCount(); i++) { + categoryItem = qobject_cast(child(i)); + categoryItem->dumpChildList(); + } + qDebug() << "==== End Of Childlist for Item:" << this << id() << bufferName() << "===="; + } + Q_ASSERT(success); + + int totalusers = 0; + for(int i = 0; i < childCount(); i++) { + totalusers += child(i)->childCount(); + } +} + +void BufferItem::userModeChanged(IrcUser *ircUser) { + Q_ASSERT(_ircChannel); + + UserCategoryItem *categoryItem; + int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser)); + if((categoryItem = qobject_cast(childById(qHash(categoryId)))) && categoryItem->childById(qHash(ircUser))) + return; // already in the right category; + + removeUserFromCategory(ircUser); + addUserToCategory(ircUser); +} + +void BufferItem::setLastMsgInsert(QDateTime msgDate) { + if(msgDate.isValid() && msgDate > _lastMsgInsert) + _lastMsgInsert = msgDate; +} + +bool BufferItem::setLastSeen() { + if(_lastSeen > _lastMsgInsert) + return false; + + _lastSeen = _lastMsgInsert; + BufferSettings(bufferInfo().bufferId()).setLastSeen(_lastSeen); + return true; +} + +QDateTime BufferItem::lastSeen() { + return _lastSeen; +} + /***************************************** * Network Items *****************************************/ -NetworkItem::NetworkItem(const uint &netid, const QString &network, AbstractTreeItem *parent) +NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent) : PropertyMapItem(QList() << "networkName" << "currentServer" << "nickCount", parent), - _networkId(netid), - _networkName(network) + _networkId(netid) { setFlags(Qt::ItemIsEnabled); } @@ -150,23 +310,37 @@ NetworkItem::NetworkItem(const uint &netid, const QString &network, AbstractTree QVariant NetworkItem::data(int column, int role) const { switch(role) { case NetworkModel::NetworkIdRole: - return _networkId; + return qVariantFromValue(_networkId); case NetworkModel::ItemTypeRole: return NetworkModel::NetworkItemType; + case NetworkModel::ItemActiveRole: + return isActive(); default: return PropertyMapItem::data(column, role); } } quint64 NetworkItem::id() const { - return _networkId; + return qHash(_networkId); +} + +void NetworkItem::setActive(bool connected) { + Q_UNUSED(connected); + emit dataChanged(); +} + +bool NetworkItem::isActive() const { + if(_network) + return _network->isConnected(); + else + return false; } QString NetworkItem::networkName() const { if(_network) return _network->networkName(); else - return _networkName; + return QString(); } QString NetworkItem::currentServer() const { @@ -177,15 +351,10 @@ QString NetworkItem::currentServer() const { } int NetworkItem::nickCount() const { - BufferItem *bufferItem; - int count = 0; - for(int i = 0; i < childCount(); i++) { - bufferItem = qobject_cast(child(i)); - if(!bufferItem) - continue; - count += bufferItem->nickCount(); - } - return count; + if(_network) + return _network->ircUsers().count(); + else + return 0; } void NetworkItem::attachNetwork(Network *network) { @@ -200,7 +369,12 @@ void NetworkItem::attachNetwork(Network *network) { this, SLOT(setCurrentServer(QString))); connect(network, SIGNAL(ircChannelAdded(QString)), this, SLOT(attachIrcChannel(QString))); + connect(network, SIGNAL(connectedSet(bool)), + this, SLOT(setActive(bool))); + // FIXME: connect this and that... + + emit dataChanged(); } void NetworkItem::attachIrcChannel(const QString &channelName) { @@ -230,32 +404,165 @@ void NetworkItem::setCurrentServer(const QString &serverName) { emit dataChanged(1); } +/***************************************** +* User Category Items (like @vh etc.) +*****************************************/ +// we hardcode this even though we have PREFIX in network... but that wouldn't help with mapping modes to +// category strings anyway. +const QList UserCategoryItem::categories = QList() + << UserCategoryItem::Category('q', "Owners") + << UserCategoryItem::Category('a', "Admins") + << UserCategoryItem::Category('a', "Admins") + << UserCategoryItem::Category('o', "Operators") + << UserCategoryItem::Category('h', "Half-Ops") + << UserCategoryItem::Category('v', "Voiced"); + +UserCategoryItem::UserCategoryItem(int category, AbstractTreeItem *parent) + : PropertyMapItem(QStringList() << "categoryId", parent), + _category(category) +{ +} + +QString UserCategoryItem::categoryId() { + if(_category < categories.count()) + return categories[_category].displayString; + else + return QString("Users"); +} + +quint64 UserCategoryItem::id() const { + return qHash(_category); +} + +void UserCategoryItem::addUser(IrcUser *ircUser) { + newChild(new IrcUserItem(ircUser, this)); +} + +bool UserCategoryItem::removeUser(IrcUser *ircUser) { + return removeChildById(qHash(ircUser)); +} + +int UserCategoryItem::categoryFromModes(const QString &modes) { + for(int i = 0; i < categories.count(); i++) { + if(modes.contains(categories[i].mode)) + return i; + } + return categories.count(); +} + +QVariant UserCategoryItem::data(int column, int role) const { + switch(role) { + case NetworkModel::ItemActiveRole: + return true; + case NetworkModel::ItemTypeRole: + return NetworkModel::UserCategoryItemType; + case NetworkModel::BufferIdRole: + return parent()->data(column, role); + case NetworkModel::NetworkIdRole: + return parent()->data(column, role); + case NetworkModel::BufferInfoRole: + return parent()->data(column, role); + default: + return PropertyMapItem::data(column, role); + } +} + + /***************************************** * Irc User Items *****************************************/ IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent) : PropertyMapItem(QStringList() << "nickName", parent), - _ircUser(ircUser) + _ircUser(ircUser), + _id(qHash(ircUser)) { - connect(ircUser, SIGNAL(destroyed()), - this, SLOT(ircUserDestroyed())); + // we don't need to handle the ircUser's destroyed signal since it's automatically removed + // by the IrcChannel::ircUserParted(); connect(ircUser, SIGNAL(nickSet(QString)), this, SLOT(setNick(QString))); } -QString IrcUserItem::nickName() { - return _ircUser->nick(); +QString IrcUserItem::nickName() const { + if(_ircUser) + return _ircUser->nick(); + else + return QString(); +} + +bool IrcUserItem::isActive() const { + if(_ircUser) + return !_ircUser->isAway(); + else + return false; +} + +IrcUser *IrcUserItem::ircUser() { + return _ircUser; +} + +quint64 IrcUserItem::id() const { + return _id; +} + +QVariant IrcUserItem::data(int column, int role) const { + switch(role) { + case NetworkModel::ItemActiveRole: + return isActive(); + case NetworkModel::ItemTypeRole: + return NetworkModel::IrcUserItemType; + case NetworkModel::BufferIdRole: + return parent()->data(column, role); + case NetworkModel::NetworkIdRole: + return parent()->data(column, role); + case NetworkModel::BufferInfoRole: + return parent()->data(column, role); + default: + return PropertyMapItem::data(column, role); + } +} + +QString IrcUserItem::toolTip(int column) const { + Q_UNUSED(column); + QStringList toolTip(QString("%1").arg(nickName())); + if(_ircUser->isAway()) toolTip[0].append(" is away"); + if(!_ircUser->awayMessage().isEmpty()) toolTip[0].append(QString(" (%1)").arg(_ircUser->awayMessage())); + if(!_ircUser->realName().isEmpty()) toolTip.append(_ircUser->realName()); + if(!_ircUser->ircOperator().isEmpty()) toolTip.append(_ircUser->ircOperator()); + toolTip.append(_ircUser->hostmask()); + + if(_ircUser->idleTime().isValid()) { + QDateTime now = QDateTime::currentDateTime(); + QDateTime idle = _ircUser->idleTime(); + int idleTime = idle.secsTo(now); + + QList< QPair > timeUnit; + timeUnit.append(qMakePair(365*60*60, tr("year"))); + timeUnit.append(qMakePair(24*60*60, tr("day"))); + timeUnit.append(qMakePair(60*60, tr("h"))); + timeUnit.append(qMakePair(60, tr("min"))); + timeUnit.append(qMakePair(1, tr("sec"))); + + QString idleString(' '); + for(int i=0; i < timeUnit.size(); i++) { + int n = idleTime / timeUnit[i].first; + if(n > 0) { + idleString += QString("%1 %2 ").arg(QString::number(n), timeUnit[i].second); + } + idleTime = idleTime % timeUnit[i].first; + } + toolTip.append(QString("idling since %1").arg(idleString)); + } + + if(!_ircUser->server().isEmpty()) toolTip.append(QString("server: %1").arg(_ircUser->server())); + + return QString("

%1

").arg(toolTip.join("
")); } void IrcUserItem::setNick(QString newNick) { Q_UNUSED(newNick); emit dataChanged(0); } -void IrcUserItem::ircUserDestroyed() { - deleteLater(); -} - /***************************************** * NetworkModel @@ -275,64 +582,64 @@ bool NetworkModel::isBufferIndex(const QModelIndex &index) const { return index.data(NetworkModel::ItemTypeRole) == NetworkModel::BufferItemType; } +/* Buffer *NetworkModel::getBufferByIndex(const QModelIndex &index) const { BufferItem *item = static_cast(index.internalPointer()); - // FIXME get rid of this - Q_ASSERT(item->buffer() == Client::instance()->buffer(item->id())); - return item->buffer(); + return Client::instance()->buffer(item->id()); } +*/ // experimental stuff :) -QModelIndex NetworkModel::networkIndex(uint networkId) { - return indexById(networkId); +QModelIndex NetworkModel::networkIndex(NetworkId networkId) { + return indexById(networkId.toInt()); } -NetworkItem *NetworkModel::network(uint networkId) { - return qobject_cast(rootItem->childById(networkId)); +NetworkItem *NetworkModel::existsNetworkItem(NetworkId networkId) { + return qobject_cast(rootItem->childById(networkId.toInt())); } -NetworkItem *NetworkModel::newNetwork(uint networkId, const QString &networkName) { - NetworkItem *networkItem = network(networkId); +NetworkItem *NetworkModel::networkItem(NetworkId networkId) { + NetworkItem *netItem = existsNetworkItem(networkId); - if(networkItem == 0) { - networkItem = new NetworkItem(networkId, networkName, rootItem); - appendChild(rootItem, networkItem); + if(netItem == 0) { + netItem = new NetworkItem(networkId, rootItem); + rootItem->newChild(netItem); } - Q_ASSERT(networkItem); - return networkItem; + Q_ASSERT(netItem); + return netItem; } -QModelIndex NetworkModel::bufferIndex(BufferInfo bufferInfo) { - QModelIndex networkIdx = networkIndex(bufferInfo.networkId()); - if(!networkIdx.isValid()) - return QModelIndex(); - else - return indexById(bufferInfo.uid(), networkIdx); +QModelIndex NetworkModel::bufferIndex(BufferId bufferId) { + AbstractTreeItem *netItem, *bufferItem; + for(int i = 0; i < rootItem->childCount(); i++) { + netItem = rootItem->child(i); + if((bufferItem = netItem->childById(bufferId.toInt()))) { + return indexById(bufferItem->id(), networkIndex(netItem->id())); + } + } + return QModelIndex(); } -BufferItem *NetworkModel::buffer(BufferInfo bufferInfo) { - QModelIndex bufferIdx = bufferIndex(bufferInfo); +BufferItem *NetworkModel::existsBufferItem(const BufferInfo &bufferInfo) { + QModelIndex bufferIdx = bufferIndex(bufferInfo.bufferId()); if(bufferIdx.isValid()) return static_cast(bufferIdx.internalPointer()); else return 0; } -BufferItem *NetworkModel::newBuffer(BufferInfo bufferInfo) { - BufferItem *bufferItem = buffer(bufferInfo); - if(bufferItem == 0) { - NetworkItem *networkItem = newNetwork(bufferInfo.networkId(), bufferInfo.network()); - - // FIXME: get rid of the buffer pointer - Buffer *buffer = Client::instance()->buffer(bufferInfo.uid()); - bufferItem = new BufferItem(buffer, networkItem); - appendChild(networkItem, bufferItem); +BufferItem *NetworkModel::bufferItem(const BufferInfo &bufferInfo) { + BufferItem *bufItem = existsBufferItem(bufferInfo); + if(bufItem == 0) { + NetworkItem *netItem = networkItem(bufferInfo.networkId()); + bufItem = new BufferItem(bufferInfo, netItem); + netItem->newChild(bufItem); } - Q_ASSERT(bufferItem); - return bufferItem; + Q_ASSERT(bufItem); + return bufItem; } QStringList NetworkModel::mimeTypes() const { @@ -348,19 +655,20 @@ bool NetworkModel::mimeContainsBufferList(const QMimeData *mimeData) { return mimeData->hasFormat("application/Quassel/BufferItemList"); } -QList< QPair > NetworkModel::mimeDataToBufferList(const QMimeData *mimeData) { - QList< QPair > bufferList; +QList< QPair > NetworkModel::mimeDataToBufferList(const QMimeData *mimeData) { + QList< QPair > bufferList; if(!mimeContainsBufferList(mimeData)) return bufferList; QStringList rawBufferList = QString::fromAscii(mimeData->data("application/Quassel/BufferItemList")).split(","); - uint networkId, bufferUid; + NetworkId networkId; + BufferId bufferUid; foreach(QString rawBuffer, rawBufferList) { if(!rawBuffer.contains(":")) continue; - networkId = rawBuffer.section(":", 0, 0).toUInt(); - bufferUid = rawBuffer.section(":", 1, 1).toUInt(); + networkId = rawBuffer.section(":", 0, 0).toInt(); + bufferUid = rawBuffer.section(":", 1, 1).toInt(); bufferList.append(qMakePair(networkId, bufferUid)); } return bufferList; @@ -373,8 +681,8 @@ QMimeData *NetworkModel::mimeData(const QModelIndexList &indexes) const { QStringList bufferlist; QString netid, uid, bufferid; foreach(QModelIndex index, indexes) { - netid = QString::number(index.data(NetworkIdRole).toUInt()); - uid = QString::number(index.data(BufferUidRole).toUInt()); + netid = QString::number(index.data(NetworkIdRole).value().toInt()); + uid = QString::number(index.data(BufferIdRole).value().toInt()); bufferid = QString("%1:%2").arg(netid).arg(uid); if(!bufferlist.contains(bufferid)) bufferlist << bufferid; @@ -394,60 +702,78 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in return false; // target must be a query - Buffer::Type targetType = (Buffer::Type)parent.data(NetworkModel::BufferTypeRole).toInt(); - if(targetType != Buffer::QueryType) + BufferItem::Type targetType = (BufferItem::Type)parent.data(NetworkModel::BufferTypeRole).toInt(); + if(targetType != BufferItem::QueryType) return false; - QList< QPair > bufferList = mimeDataToBufferList(data); + QList< QPair > bufferList = mimeDataToBufferList(data); // exactly one buffer has to be dropped if(bufferList.count() != 1) return false; - uint netId = bufferList.first().first; - uint bufferId = bufferList.first().second; + NetworkId netId = bufferList.first().first; + BufferId bufferId = bufferList.first().second; // no self merges (would kill us) - if(bufferId == parent.data(BufferUidRole).toUInt()) + if(bufferId == parent.data(BufferIdRole).value()) return false; - Q_ASSERT(rootItem->childById(netId)); - Q_ASSERT(rootItem->childById(netId)->childById(bufferId)); + Q_ASSERT(rootItem->childById(netId.toInt())); + Q_ASSERT(rootItem->childById(netId.toInt())->childById(bufferId.toInt())); // source must be a query too - Buffer::Type sourceType = (Buffer::Type)rootItem->childById(netId)->childById(bufferId)->data(0, BufferTypeRole).toInt(); - if(sourceType != Buffer::QueryType) + BufferItem::Type sourceType = (BufferItem::Type)rootItem->childById(netId.toInt())->childById(bufferId.toInt())->data(0, BufferTypeRole).toInt(); + if(sourceType != BufferItem::QueryType) return false; // TODO: warn user about buffermerge! - qDebug() << "merging" << bufferId << parent.data(BufferUidRole).toInt(); + qDebug() << "merging" << bufferId << parent.data(BufferIdRole).value(); removeRow(parent.row(), parent.parent()); return true; } void NetworkModel::attachNetwork(Network *net) { - NetworkItem *networkItem = network(net->networkId()); - if(!networkItem) { - qWarning() << "NetworkModel::attachNetwork(): network is unknown!"; - return; - } - networkItem->attachNetwork(net); + NetworkItem *netItem = networkItem(net->networkId()); + netItem->attachNetwork(net); } -void NetworkModel::bufferUpdated(Buffer *buffer) { - BufferItem *bufferItem = newBuffer(buffer->bufferInfo()); - QModelIndex itemindex = indexByItem(bufferItem); +void NetworkModel::bufferUpdated(BufferInfo bufferInfo) { + BufferItem *bufItem = bufferItem(bufferInfo); + QModelIndex itemindex = indexByItem(bufItem); emit dataChanged(itemindex, itemindex); } -void NetworkModel::bufferActivity(Buffer::ActivityLevel level, Buffer *buf) { - BufferItem *bufferItem = buffer(buf->bufferInfo()); - if(!bufferItem) { - qWarning() << "NetworkModel::bufferActivity(): received Activity Info for uknown Buffer"; +void NetworkModel::updateBufferActivity(const Message &msg) { + BufferItem *buff = bufferItem(msg.bufferInfo()); + Q_ASSERT(buff); + + buff->setLastMsgInsert(msg.timestamp()); + + if(buff->lastSeen() >= msg.timestamp()) return; + + BufferItem::ActivityLevel level = BufferItem::OtherActivity; + if(msg.type() == Message::Plain || msg.type() == Message::Notice) + level |= BufferItem::NewMessage; + + + const Network *net = Client::network(msg.bufferInfo().networkId()); + if(net) { + QRegExp nickRegExp("^(.*\\W)?"+net->myNick()+"(\\W.*)?$"); + if((msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) && nickRegExp.exactMatch(msg.text())) + level |= BufferItem::Highlight; } - bufferItem->setActivity(level); - bufferUpdated(buf); + + bufferItem(msg.bufferInfo())->updateActivity(level); } +const Network *NetworkModel::networkByIndex(const QModelIndex &index) const { + QVariant netVariant = index.data(NetworkIdRole); + if(!netVariant.isValid()) + return 0; + + NetworkId networkId = netVariant.value(); + return Client::network(networkId); +}