X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=7d644422d2dd7879c605a8282d534c9010e3ef3f;hp=d51e0ffc5dd92ca5afbb11dac3c102421914fd32;hb=1658ab9a8f4287fde15f3ceb13503282a6948990;hpb=197cf9c0d5e227dd475124515f6e6005cf87ac8e

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index d51e0ffc..7d644422 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -22,7 +22,7 @@
 
 #include <QAbstractItemView>
 
-#include "bufferinfo.h"
+#include "buffermodel.h"
 #include "client.h"
 #include "signalproxy.h"
 #include "network.h"
@@ -39,11 +39,18 @@ NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent)
   : 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) {
+  case NetworkModel::BufferIdRole:
+  case NetworkModel::BufferInfoRole:
+  case NetworkModel::BufferTypeRole:
+    if(childCount())
+      return child(0)->data(column, role);
+    else
+      return QVariant();
   case NetworkModel::NetworkIdRole:
     return qVariantFromValue(_networkId);
   case NetworkModel::ItemTypeRole:
@@ -57,7 +64,7 @@ QVariant NetworkItem::data(int column, int role) const {
 
 BufferItem *NetworkItem::findBufferItem(BufferId bufferId) {
   BufferItem *bufferItem = 0;
-  
+
   for(int i = 0; i < childCount(); i++) {
     bufferItem = qobject_cast<BufferItem *>(child(i));
     if(!bufferItem)
@@ -73,7 +80,7 @@ BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) {
   BufferItem *bufferItem = findBufferItem(bufferInfo);
   if(bufferItem)
     return bufferItem;
-  
+
   switch(bufferInfo.type()) {
   case BufferInfo::StatusBuffer:
     bufferItem = new StatusBufferItem(bufferInfo, this);
@@ -95,7 +102,7 @@ BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) {
 void NetworkItem::attachNetwork(Network *network) {
   if(!network)
     return;
-  
+
   _network = network;
 
   connect(network, SIGNAL(networkNameSet(QString)),
@@ -110,7 +117,7 @@ void NetworkItem::attachNetwork(Network *network) {
 	  this, SIGNAL(dataChanged()));
   connect(network, SIGNAL(destroyed()),
 	  this, SIGNAL(dataChanged()));
-  
+
   emit dataChanged();
 }
 
@@ -123,7 +130,7 @@ void NetworkItem::attachIrcChannel(IrcChannel *ircChannel) {
 
     if(channelItem->bufferName().toLower() == ircChannel->name().toLower()) {
       channelItem->attachIrcChannel(ircChannel);
-      break;
+      return;
     }
   }
 }
@@ -157,11 +164,11 @@ QString NetworkItem::toolTip(int column) const {
   Q_UNUSED(column);
 
   QStringList toolTip(QString("<b>%1</b>").arg(networkName()));
-  toolTip.append(QString("Server: %1").arg(currentServer()));
-  toolTip.append(QString("Users: %1").arg(nickCount()));
+  toolTip.append(tr("Server: %1").arg(currentServer()));
+  toolTip.append(tr("Users: %1").arg(nickCount()));
 
   if(_network) {
-    toolTip.append(QString("Lag: %1 msecs").arg(_network->latency()));
+    toolTip.append(tr("Lag: %1 msecs").arg(_network->latency()));
   }
 
   return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
@@ -173,22 +180,45 @@ QString NetworkItem::toolTip(int column) const {
 BufferItem::BufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent)
   : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent),
     _bufferInfo(bufferInfo),
-    _activity(Buffer::NoActivity)
+    _activity(BufferInfo::NoActivity)
 {
   setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled);
 }
 
-void BufferItem::setActivityLevel(Buffer::ActivityLevel level) {
+void BufferItem::setActivityLevel(BufferInfo::ActivityLevel level) {
   if(_activity != level) {
     _activity = level;
     emit dataChanged();
   }
 }
 
-void BufferItem::updateActivityLevel(Buffer::ActivityLevel level) {
-  Buffer::ActivityLevel oldActivity = _activity;
-  _activity |= level;
-  if(oldActivity != _activity)
+void BufferItem::clearActivityLevel() {
+  _activity = BufferInfo::NoActivity;
+  _lastSeenMarkerMsgId = _lastSeenMsgId;
+  emit dataChanged();
+}
+
+void BufferItem::updateActivityLevel(const Message &msg) {
+  if(isCurrentBuffer()) {
+    return;
+  }
+
+  if(msg.flags() & Message::Self)	// don't update activity for our own messages
+    return;
+
+  if(lastSeenMsgId() >= msg.msgId())
+    return;
+
+  BufferInfo::ActivityLevel oldLevel = activityLevel();
+
+  _activity |= BufferInfo::OtherActivity;
+  if(msg.type() & (Message::Plain | Message::Notice | Message::Action))
+    _activity |= BufferInfo::NewMessage;
+
+  if(msg.flags() & Message::Highlight)
+    _activity |= BufferInfo::Highlight;
+
+  if(oldLevel != _activity)
     emit dataChanged();
 }
 
@@ -214,10 +244,9 @@ QVariant BufferItem::data(int column, int role) const {
 }
 
 bool BufferItem::setData(int column, const QVariant &value, int role) {
-  qDebug() << "BufferItem::setData(int column, const QVariant &value, int role):" << this << column << value << role;
   switch(role) {
   case NetworkModel::BufferActivityRole:
-    setActivityLevel((Buffer::ActivityLevel)value.toInt());
+    setActivityLevel((BufferInfo::ActivityLevel)value.toInt());
     return true;
   default:
     return PropertyMapItem::setData(column, value, role);
@@ -230,32 +259,22 @@ void BufferItem::setBufferName(const QString &name) {
   emit dataChanged(0);
 }
 
-QString BufferItem::toolTip(int column) const {
-  Q_UNUSED(column);
-  return tr("<p> %1 - %2 </p>").arg(bufferInfo().bufferId().toInt()).arg(bufferName());
+void BufferItem::setLastSeenMsgId(const MsgId &msgId) {
+  _lastSeenMsgId = msgId;
+  if(!isCurrentBuffer()) {
+    _lastSeenMarkerMsgId = msgId;
+  }
+  setActivityLevel(BufferInfo::NoActivity);
 }
 
-/*
-void BufferItem::setLastMsgInsert(QDateTime msgDate) {
-  if(msgDate.isValid() && msgDate > _lastMsgInsert)
-    _lastMsgInsert = msgDate;
-}
-*/
-/*
-// FIXME emit dataChanged()
-bool BufferItem::setLastSeen() {
-  if(_lastSeen > _lastMsgInsert)
-    return false;
-  
-  _lastSeen = _lastMsgInsert;
-  BufferSettings(bufferInfo().bufferId()).setLastSeen(_lastSeen);
-  return true;
+bool BufferItem::isCurrentBuffer() const {
+  return _bufferInfo.bufferId() == Client::bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>();
 }
 
-QDateTime BufferItem::lastSeen() {
-  return _lastSeen;
+QString BufferItem::toolTip(int column) const {
+  Q_UNUSED(column);
+  return tr("<p> %1 - %2 </p>").arg(bufferInfo().bufferId().toInt()).arg(bufferName());
 }
-*/
 
 /*****************************************
 *  StatusBufferItem
@@ -284,7 +303,7 @@ QueryBufferItem::QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *pare
   : BufferItem(bufferInfo, parent),
     _ircUser(0)
 {
-  setFlags(flags() | Qt::ItemIsDropEnabled);
+  setFlags(flags() | Qt::ItemIsDropEnabled | Qt::ItemIsEditable);
 
   const Network *net = Client::network(bufferInfo.networkId());
   if(!net)
@@ -293,18 +312,42 @@ QueryBufferItem::QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *pare
   IrcUser *ircUser = net->ircUser(bufferInfo.bufferName());
   if(ircUser)
     attachIrcUser(ircUser);
+}
 
+QVariant QueryBufferItem::data(int column, int role) const {
+  switch(role) {
+  case NetworkModel::IrcUserRole:
+    return QVariant::fromValue<QObject *>(_ircUser);
+  case NetworkModel::UserAwayRole:
+    return (bool)_ircUser ? _ircUser->isAway() : false;
+  default:
+    return BufferItem::data(column, role);
+  }
 }
 
-bool QueryBufferItem::isActive() const {
-  if(_ircUser)
-    return !_ircUser->isAway();
-  else
-    return false;
+bool QueryBufferItem::setData(int column, const QVariant &value, int role) {
+  if(column != 0)
+    return BufferItem::setData(column, value, role);
+
+  switch(role) {
+  case Qt::EditRole:
+    {
+      QString newName = value.toString();
+      if(!newName.isEmpty()) {
+	Client::renameBuffer(bufferId(), newName);
+	return true;
+      } else {
+	return false;
+      }
+    }
+    break;
+  default:
+    return BufferItem::setData(column, value, role);
+  }
 }
 
 QString QueryBufferItem::toolTip(int column) const {
-  // pretty much code duplication of IrcUserItem::toolTip() but inheritance won't solve this... 
+  // pretty much code duplication of IrcUserItem::toolTip() but inheritance won't solve this...
   Q_UNUSED(column);
   QStringList toolTip;
 
@@ -319,9 +362,9 @@ QString QueryBufferItem::toolTip(int column) const {
     if(!_ircUser->ircOperator().isEmpty()) toolTip.append(QString("%1 %2").arg(_ircUser->nick()).arg(_ircUser->ircOperator()));
     if(!_ircUser->suserHost().isEmpty()) toolTip.append(_ircUser->suserHost());
     if(!_ircUser->whoisServiceReply().isEmpty()) toolTip.append(_ircUser->whoisServiceReply());
-    
+
     toolTip.append(_ircUser->hostmask().remove(0, _ircUser->hostmask().indexOf("!")+1));
-    
+
     if(_ircUser->idleTime().isValid()) {
       QDateTime now = QDateTime::currentDateTime();
       QDateTime idle = _ircUser->idleTime();
@@ -331,7 +374,7 @@ QString QueryBufferItem::toolTip(int column) const {
     if(_ircUser->loginTime().isValid()) {
       toolTip.append(tr("login time: %1").arg(_ircUser->loginTime().toString()));
     }
-    
+
     if(!_ircUser->server().isEmpty()) toolTip.append(tr("server: %1").arg(_ircUser->server()));
   }
 
@@ -340,12 +383,12 @@ QString QueryBufferItem::toolTip(int column) const {
 
 void QueryBufferItem::attachIrcUser(IrcUser *ircUser) {
   _ircUser = ircUser;
-  connect(_ircUser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed()));
+  connect(_ircUser, SIGNAL(quited()), this, SLOT(ircUserQuited()));
   connect(_ircUser, SIGNAL(awaySet(bool)), this, SIGNAL(dataChanged()));
   emit dataChanged();
 }
 
-void QueryBufferItem::ircUserDestroyed() {
+void QueryBufferItem::ircUserQuited() {
   _ircUser = 0;
   emit dataChanged();
 }
@@ -366,41 +409,51 @@ ChannelBufferItem::ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeI
     attachIrcChannel(ircChannel);
 }
 
+QVariant ChannelBufferItem::data(int column, int role) const {
+  switch(role) {
+    case NetworkModel::IrcChannelRole:
+      return QVariant::fromValue<QObject *>(_ircChannel);
+    default:
+      return BufferItem::data(column, role);
+  }
+}
+
 QString ChannelBufferItem::toolTip(int column) const {
   Q_UNUSED(column);
   QStringList toolTip;
 
   toolTip.append(tr("<b>Channel %1</b>").arg(bufferName()));
   if(isActive()) {
-    //TODO: add channel modes 
+    //TODO: add channel modes
     toolTip.append(tr("<b>Users:</b> %1").arg(nickCount()));
     if(_ircChannel) {
       QString channelMode = _ircChannel->channelModeString(); // channelModeString is compiled on the fly -> thus cache the result
       if(!channelMode.isEmpty())
-	toolTip.append(tr("<b>Mode:</b> %1").arg(channelMode));
+        toolTip.append(tr("<b>Mode:</b> %1").arg(channelMode));
     }
-    
+
     BufferSettings s;
     bool showTopic = s.value("DisplayTopicInTooltip", QVariant(false)).toBool();
     if(showTopic) {
       QString _topic = topic();
       if(_topic != "") {
-	_topic.replace(QString("<"), QString("&lt;"));
-	_topic.replace(QString(">"), QString("&gt;"));
-	toolTip.append(QString("<font size='-2'>&nbsp;</font>"));
-	toolTip.append(tr("<b>Topic:</b> %1").arg(_topic));
+        _topic = stripFormatCodes(_topic);
+        _topic.replace(QString("<"), QString("&lt;"));
+        _topic.replace(QString(">"), QString("&gt;"));
+        toolTip.append(QString("<font size='-2'>&nbsp;</font>"));
+        toolTip.append(tr("<b>Topic:</b> %1").arg(_topic));
       }
     }
   } else {
     toolTip.append(tr("Not active <br /> Double-click to join"));
   }
 
-  return tr("<p> %1 </p>").arg(toolTip.join("<br />"));  
+  return tr("<p> %1 </p>").arg(toolTip.join("<br />"));
 }
 
 void ChannelBufferItem::attachIrcChannel(IrcChannel *ircChannel) {
   Q_ASSERT(!_ircChannel && ircChannel);
-  
+
   _ircChannel = ircChannel;
 
   connect(ircChannel, SIGNAL(topicSet(QString)),
@@ -409,8 +462,8 @@ void ChannelBufferItem::attachIrcChannel(IrcChannel *ircChannel) {
 	  this, SLOT(join(QList<IrcUser *>)));
   connect(ircChannel, SIGNAL(ircUserParted(IrcUser *)),
 	  this, SLOT(part(IrcUser *)));
-  connect(ircChannel, SIGNAL(destroyed()),
-	  this, SLOT(ircChannelDestroyed()));
+  connect(ircChannel, SIGNAL(parted()),
+	  this, SLOT(ircChannelParted()));
   connect(ircChannel, SIGNAL(ircUserModesSet(IrcUser *, QString)),
 	  this, SLOT(userModeChanged(IrcUser *)));
   connect(ircChannel, SIGNAL(ircUserModeAdded(IrcUser *, QString)),
@@ -420,11 +473,11 @@ void ChannelBufferItem::attachIrcChannel(IrcChannel *ircChannel) {
 
   if(!ircChannel->ircUsers().isEmpty())
     join(ircChannel->ircUsers());
-  
+
   emit dataChanged();
 }
 
-void ChannelBufferItem::ircChannelDestroyed() {
+void ChannelBufferItem::ircChannelParted() {
   Q_CHECK_PTR(_ircChannel);
   disconnect(_ircChannel, 0, this, 0);
   _ircChannel = 0;
@@ -439,7 +492,7 @@ void ChannelBufferItem::join(const QList<IrcUser *> &ircUsers) {
 
 UserCategoryItem *ChannelBufferItem::findCategoryItem(int categoryId) {
   UserCategoryItem *categoryItem = 0;
-  
+
   for(int i = 0; i < childCount(); i++) {
     categoryItem = qobject_cast<UserCategoryItem *>(child(i));
     if(!categoryItem)
@@ -461,7 +514,7 @@ void ChannelBufferItem::addUsersToCategory(const QList<IrcUser *> &ircUsers) {
 
   int categoryId = -1;
   UserCategoryItem *categoryItem = 0;
-  
+
   foreach(IrcUser *ircUser, ircUsers) {
     categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
     categoryItem = findCategoryItem(categoryId);
@@ -515,7 +568,7 @@ void ChannelBufferItem::userModeChanged(IrcUser *ircUser) {
 
   int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
   UserCategoryItem *categoryItem = findCategoryItem(categoryId);
-    
+
   if(categoryItem) {
     if(categoryItem->findIrcUser(ircUser)) {
       return; // already in the right category;
@@ -638,8 +691,8 @@ IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent)
   : PropertyMapItem(QStringList() << "nickName", parent),
     _ircUser(ircUser)
 {
-  setObjectName(ircUser->nick());  
-  connect(ircUser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed()));
+  setObjectName(ircUser->nick());
+  connect(ircUser, SIGNAL(quited()), this, SLOT(ircUserQuited()));
   connect(ircUser, SIGNAL(nickSet(QString)), this, SIGNAL(dataChanged()));
   connect(ircUser, SIGNAL(awaySet(bool)), this, SIGNAL(dataChanged()));
 }
@@ -656,6 +709,12 @@ QVariant IrcUserItem::data(int column, int role) const {
     return parent()->data(column, role);
   case NetworkModel::BufferInfoRole:
     return parent()->data(column, role);
+  case NetworkModel::IrcChannelRole:
+    return parent()->data(column, role);
+  case NetworkModel::IrcUserRole:
+    return QVariant::fromValue<QObject *>(_ircUser.data());
+  case NetworkModel::UserAwayRole:
+    return (bool)_ircUser ? _ircUser->isAway() : false;
   default:
     return PropertyMapItem::data(column, role);
   }
@@ -692,18 +751,16 @@ QString IrcUserItem::toolTip(int column) const {
   return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
 }
 
-// void IrcUserItem::ircUserDestroyed() {
-//   parent()->removeChild(this);
-//   if(parent()->childCount() == 0)
-//     parent()->parent()->removeChild(parent());
-// }
-
 /*****************************************
  * NetworkModel
  *****************************************/
 NetworkModel::NetworkModel(QObject *parent)
   : TreeModel(NetworkModel::defaultHeader(), parent)
 {
+  connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+	  this, SLOT(checkForNewBuffers(const QModelIndex &, int, int)));
+  connect(this, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)),
+	  this, SLOT(checkForRemovedBuffers(const QModelIndex &, int, int)));
 }
 
 QList<QVariant >NetworkModel::defaultHeader() {
@@ -716,14 +773,7 @@ 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<BufferItem *>(index.internalPointer());
-  return Client::instance()->buffer(item->id());
-}
-*/
-
-int NetworkModel::networkRow(NetworkId networkId) {
+int NetworkModel::networkRow(NetworkId networkId) const {
   NetworkItem *netItem = 0;
   for(int i = 0; i < rootItem->childCount(); i++) {
     netItem = qobject_cast<NetworkItem *>(rootItem->child(i));
@@ -743,7 +793,7 @@ QModelIndex NetworkModel::networkIndex(NetworkId networkId) {
     return indexByItem(qobject_cast<NetworkItem *>(rootItem->child(netRow)));
 }
 
-NetworkItem *NetworkModel::findNetworkItem(NetworkId networkId) {
+NetworkItem *NetworkModel::findNetworkItem(NetworkId networkId) const {
   int netRow = networkRow(networkId);
   if(netRow == -1)
     return 0;
@@ -769,35 +819,23 @@ void NetworkModel::networkRemoved(const NetworkId &networkId) {
 }
 
 QModelIndex NetworkModel::bufferIndex(BufferId bufferId) {
-  BufferItem *bufferItem = findBufferItem(bufferId);
-  if(bufferItem)
-    return indexByItem(bufferItem);
-  else
+  if(!_bufferItemCache.contains(bufferId))
     return QModelIndex();
-}
 
-BufferItem *NetworkModel::findBufferItem(const BufferInfo &bufferInfo) {
-  NetworkItem *netItem = findNetworkItem(bufferInfo.networkId());
-  if(!netItem)
-    return 0;
-
-  BufferItem *bufferItem = netItem->findBufferItem(bufferInfo);
-  return bufferItem;
+  return indexByItem(_bufferItemCache[bufferId]);
 }
 
-BufferItem *NetworkModel::findBufferItem(BufferId bufferId) {
-  NetworkItem *netItem;
-  BufferItem *bufferItem;
-  
-  for(int i = 0; i < rootItem->childCount(); i++) {
-    netItem = qobject_cast<NetworkItem *>(rootItem->child(i));
-    if((bufferItem = netItem->findBufferItem(bufferId)))
-      return bufferItem;
-  }
-  return 0;
+BufferItem *NetworkModel::findBufferItem(BufferId bufferId) const {
+  if(_bufferItemCache.contains(bufferId))
+    return _bufferItemCache[bufferId];
+  else
+    return 0;
 }
 
 BufferItem *NetworkModel::bufferItem(const BufferInfo &bufferInfo) {
+  if(_bufferItemCache.contains(bufferInfo.bufferId()))
+    return _bufferItemCache[bufferInfo.bufferId()];
+
   NetworkItem *netItem = networkItem(bufferInfo.networkId());
   return netItem->bufferItem(bufferInfo);
 }
@@ -877,7 +915,7 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in
 
   // no self merges (would kill us)
   if(bufferId == parent.data(BufferIdRole).value<BufferId>())
-    return false; 
+    return false;
 
   NetworkItem *netItem = findNetworkItem(netId);
   Q_ASSERT(netItem);
@@ -888,11 +926,11 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in
   // source must be a query too
   if(bufferItem->bufferType() != BufferInfo::QueryBuffer)
     return false;
-    
+
   // TODO: warn user about buffermerge!
   qDebug() << "merging" << bufferId << parent.data(BufferIdRole).value<BufferId>();
   removeRow(parent.row(), parent.parent());
-  
+
   return true;
 }
 
@@ -908,37 +946,59 @@ void NetworkModel::bufferUpdated(BufferInfo bufferInfo) {
 }
 
 void NetworkModel::removeBuffer(BufferId bufferId) {
-  BufferItem *bufferItem = findBufferItem(bufferId);
-  if(bufferItem)
-    bufferItem->parent()->removeChild(bufferItem);
+  BufferItem *buffItem = findBufferItem(bufferId);
+  if(!buffItem)
+    return;
+
+  buffItem->parent()->removeChild(buffItem);
 }
 
-/*
-void NetworkModel::updateBufferActivity(const Message &msg) {
-  BufferItem *buff = bufferItem(msg.bufferInfo());
-  Q_ASSERT(buff);
+MsgId NetworkModel::lastSeenMsgId(BufferId bufferId) const {
+  if(!_bufferItemCache.contains(bufferId))
+    return MsgId();
 
-  buff->setLastMsgInsert(msg.timestamp());
+  return _bufferItemCache[bufferId]->lastSeenMsgId();
+}
 
-  if(buff->lastSeen() >= msg.timestamp())
-    return;
+MsgId NetworkModel::lastSeenMarkerMsgId(BufferId bufferId) const {
+  if(!_bufferItemCache.contains(bufferId))
+    return MsgId();
 
-  BufferItem::ActivityLevel level = BufferItem::OtherActivity;
-  if(msg.type() == Message::Plain || msg.type() == Message::Notice)
-    level |= BufferItem::NewMessage;
+  return _bufferItemCache[bufferId]->lastSeenMarkerMsgId();
+}
 
-  if(msg.flags() & Message::Highlight) 
-      level |= BufferItem::Highlight;
+void NetworkModel::setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId) {
+  BufferItem *bufferItem = findBufferItem(bufferId);
+  if(!bufferItem) {
+    qDebug() << "NetworkModel::setLastSeenMsgId(): buffer is unknown:" << bufferId;
+    return;
+  }
+  bufferItem->setLastSeenMsgId(msgId);
+}
 
-  bufferItem(msg.bufferInfo())->updateActivity(level);
+void NetworkModel::updateBufferActivity(const Message &msg) {
+  BufferItem *item = bufferItem(msg.bufferInfo());
+  item->updateActivityLevel(msg);
+  if(item->isCurrentBuffer())
+    emit setLastSeenMsg(item->bufferId(), msg.msgId());
 }
-*/
 
-void NetworkModel::setBufferActivity(const BufferInfo &info, Buffer::ActivityLevel level) {
-  BufferItem *buff = bufferItem(info);
-  Q_ASSERT(buff);
+void NetworkModel::setBufferActivity(const BufferId &bufferId, BufferInfo::ActivityLevel level) {
+  BufferItem *bufferItem = findBufferItem(bufferId);
+  if(!bufferItem) {
+    qDebug() << "NetworkModel::setBufferActivity(): buffer is unknown:" << bufferId;
+    return;
+  }
+  bufferItem->setActivityLevel(level);
+}
 
-  buff->setActivityLevel(level);
+void NetworkModel::clearBufferActivity(const BufferId &bufferId) {
+  BufferItem *bufferItem = findBufferItem(bufferId);
+  if(!bufferItem) {
+    qDebug() << "NetworkModel::clearBufferActivity(): buffer is unknown:" << bufferId;
+    return;
+  }
+  bufferItem->clearActivityLevel();
 }
 
 const Network *NetworkModel::networkByIndex(const QModelIndex &index) const {
@@ -950,3 +1010,77 @@ const Network *NetworkModel::networkByIndex(const QModelIndex &index) const {
   return Client::network(networkId);
 }
 
+void NetworkModel::checkForRemovedBuffers(const QModelIndex &parent, int start, int end) {
+  if(parent.data(ItemTypeRole) != NetworkItemType)
+    return;
+
+  for(int row = start; row <= end; row++) {
+    _bufferItemCache.remove(parent.child(row, 0).data(BufferIdRole).value<BufferId>());
+  }
+}
+
+void NetworkModel::checkForNewBuffers(const QModelIndex &parent, int start, int end) {
+  if(parent.data(ItemTypeRole) != NetworkItemType)
+    return;
+
+  for(int row = start; row <= end; row++) {
+    QModelIndex child = parent.child(row, 0);
+    _bufferItemCache[child.data(BufferIdRole).value<BufferId>()] = static_cast<BufferItem *>(child.internalPointer());
+  }
+}
+
+QString NetworkModel::bufferName(BufferId bufferId) const {
+  if(!_bufferItemCache.contains(bufferId))
+    return QString();
+
+  return _bufferItemCache[bufferId]->bufferName();
+}
+
+BufferInfo::Type NetworkModel::bufferType(BufferId bufferId) const {
+  if(!_bufferItemCache.contains(bufferId))
+    return BufferInfo::InvalidBuffer;
+
+  return _bufferItemCache[bufferId]->bufferType();
+}
+
+BufferInfo NetworkModel::bufferInfo(BufferId bufferId) const {
+  if(!_bufferItemCache.contains(bufferId))
+    return BufferInfo();
+
+  return _bufferItemCache[bufferId]->bufferInfo();
+}
+
+NetworkId NetworkModel::networkId(BufferId bufferId) const {
+  if(!_bufferItemCache.contains(bufferId))
+    return NetworkId();
+
+  NetworkItem *netItem = qobject_cast<NetworkItem *>(_bufferItemCache[bufferId]->parent());
+  if(netItem)
+    return netItem->networkId();
+  else
+    return NetworkId();
+}
+
+QString NetworkModel::networkName(BufferId bufferId) const {
+  if(!_bufferItemCache.contains(bufferId))
+    return QString();
+
+  NetworkItem *netItem = qobject_cast<NetworkItem *>(_bufferItemCache[bufferId]->parent());
+  if(netItem)
+    return netItem->networkName();
+  else
+    return QString();
+}
+
+BufferId NetworkModel::bufferId(NetworkId networkId, const QString &bufferName, Qt::CaseSensitivity cs) const {
+  const NetworkItem *netItem = findNetworkItem(networkId);
+  if(!netItem)
+    return BufferId();
+
+  for(int i = 0; i < netItem->childCount(); i++) {
+    BufferItem *bufferItem = qobject_cast<BufferItem *>(netItem->child(i));
+    if(bufferItem && !bufferItem->bufferName().compare(bufferName, cs))
+      return bufferItem->bufferId();
+  }
+  return BufferId();
+}