X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=f1b1c73bd9f12e33c7bb350b7fa5220a6c43390f;hp=ba9d0c82b5ed099cd6fe6e3e0bfde198ee0d8b19;hb=4787ae231945b6d6ca8b3c255924c4f13178f83c;hpb=6c2003b16b1c8beca376cd47f59dbbd49a024e91

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index ba9d0c82..f1b1c73b 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -29,66 +29,57 @@
 #include "ircchannel.h"
 #include "ircuser.h"
 
+#include "buffersettings.h"
+
 #include "util.h" // get rid of this (needed for isChannelName)
 
+
 /*****************************************
 *  Fancy Buffer Items
 *****************************************/
 BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent)
   : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent),
     _bufferInfo(bufferInfo),
-    _activity(NoActivity)
+    _bufferName(bufferInfo.bufferName()),
+    _activity(Buffer::NoActivity)
 {
-  // determine BufferType
-  if(bufferInfo.buffer().isEmpty())
-    _type = StatusType;
-  else if(isChannelName(bufferInfo.buffer()))
-    _type = ChannelType;
-  else
-    _type = QueryType;
-
   Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
-  if(bufferType() == QueryType)
+  if(bufferType() == BufferInfo::QueryBuffer)
     flags |= Qt::ItemIsDropEnabled;
-  setFlags(flags);
-}
 
-
-const BufferInfo &BufferItem::bufferInfo() const {
-  return _bufferInfo;
+  if(bufferType() == BufferInfo::StatusBuffer) {
+    NetworkItem *networkItem = qobject_cast<NetworkItem *>(parent);
+    connect(networkItem, SIGNAL(dataChanged()), this, SIGNAL(dataChanged()));
+  }
+  setFlags(flags);
 }
 
 quint64 BufferItem::id() const {
-  return bufferInfo().uid().toInt();
-}
-
-bool BufferItem::isStatusBuffer() const {
-   return bufferType() == StatusType;
+  return qHash(bufferInfo().bufferId());
 }
 
-BufferItem::Type BufferItem::bufferType() const {
-  return _type;
-}
+// bool BufferItem::isStatusBuffer() const {
+//   return bufferType() == BufferInfo::StatusBuffer;
+// }
 
 bool BufferItem::isActive() const {
-  if(bufferType() == ChannelType)
+  if(bufferType() == BufferInfo::ChannelBuffer)
     return _ircChannel;
   else
     return qobject_cast<NetworkItem *>(parent())->isActive();
 }
 
-BufferItem::ActivityLevel BufferItem::activity() const {
-  return _activity;
-}
-
-void BufferItem::setActivity(const ActivityLevel &level) {
+bool BufferItem::setActivityLevel(Buffer::ActivityLevel level) {
   _activity = level;
   emit dataChanged();
+  return true;
 }
 
-void BufferItem::updateActivity(const ActivityLevel &level) {
+void BufferItem::updateActivityLevel(Buffer::ActivityLevel level) {
+  Buffer::ActivityLevel oldActivity = _activity;
   _activity |= level;
-  emit dataChanged();
+  if(oldActivity != _activity)
+    emit dataChanged();
 }
 
 QVariant BufferItem::data(int column, int role) const {
@@ -96,7 +87,7 @@ QVariant BufferItem::data(int column, int role) const {
   case NetworkModel::ItemTypeRole:
     return NetworkModel::BufferItemType;
   case NetworkModel::BufferIdRole:
-    return qVariantFromValue(bufferInfo().uid());
+    return qVariantFromValue(bufferInfo().bufferId());
   case NetworkModel::NetworkIdRole:
     return qVariantFromValue(bufferInfo().networkId());
   case NetworkModel::BufferInfoRole:
@@ -106,7 +97,7 @@ QVariant BufferItem::data(int column, int role) const {
   case NetworkModel::ItemActiveRole:
     return isActive();
   case NetworkModel::BufferActivityRole:
-    return qVariantFromValue((int)activity());
+    return (int)activityLevel();
   default:
     return PropertyMapItem::data(column, role);
   }
@@ -115,7 +106,7 @@ QVariant BufferItem::data(int column, int role) const {
 bool BufferItem::setData(int column, const QVariant &value, int role) {
   switch(role) {
   case NetworkModel::BufferActivityRole:
-    setActivity((ActivityLevel)value.toInt());
+    return setActivityLevel((Buffer::ActivityLevel)value.toInt());
   default:
     return PropertyMapItem::setData(column, value, role);
   }
@@ -131,8 +122,8 @@ void BufferItem::attachIrcChannel(IrcChannel *ircChannel) {
 
   connect(ircChannel, SIGNAL(topicSet(QString)),
 	  this, SLOT(setTopic(QString)));
-  connect(ircChannel, SIGNAL(ircUserJoined(IrcUser *)),
-	  this, SLOT(join(IrcUser *)));
+  connect(ircChannel, SIGNAL(ircUsersJoined(QList<IrcUser *>)),
+	  this, SLOT(join(QList<IrcUser *>)));
   connect(ircChannel, SIGNAL(ircUserParted(IrcUser *)),
 	  this, SLOT(part(IrcUser *)));
   connect(ircChannel, SIGNAL(destroyed()),
@@ -146,9 +137,7 @@ void BufferItem::attachIrcChannel(IrcChannel *ircChannel) {
 
   if(!ircChannel->ircUsers().isEmpty()) {
     qWarning() << "Channel" << ircChannel->name() << "has already users which is quite surprising :)";
-    foreach(IrcUser *ircUser, ircChannel->ircUsers()) {
-      join(ircUser);
-    }
+    join(ircChannel->ircUsers());
   }
   
   emit dataChanged();
@@ -160,10 +149,18 @@ void BufferItem::ircChannelDestroyed() {
 }
 
 QString BufferItem::bufferName() const {
-  if(bufferType() == StatusType)
+  if(bufferType() == BufferInfo::StatusBuffer)
     return tr("Status Buffer");
   else
-    return bufferInfo().buffer();
+    return _bufferName;
+}
+
+void BufferItem::setBufferName(const QString &name) {
+  _bufferName = name;
+  // as long as we need those bufferInfos, we have to update that one aswell.
+  // pretty ugly though :/
+  _bufferInfo = BufferInfo(_bufferInfo.bufferId(), _bufferInfo.networkId(), _bufferInfo.type(), _bufferInfo.groupId(), name);
+  emit dataChanged(0);
 }
 
 QString BufferItem::topic() const {
@@ -173,6 +170,13 @@ QString BufferItem::topic() const {
     return QString();
 }
 
+void BufferItem::ircUserDestroyed() {
+  // PRIVATE
+  IrcUser *ircUser = static_cast<IrcUser *>(sender());
+  removeUserFromCategory(ircUser);
+  emit dataChanged(2);
+}
+
 int BufferItem::nickCount() const {
   if(_ircChannel)
     return _ircChannel->ircUsers().count();
@@ -185,28 +189,41 @@ void BufferItem::setTopic(const QString &topic) {
   emit dataChanged(1);
 }
 
-void BufferItem::join(IrcUser *ircUser) {
-  if(!ircUser)
-    return;
+void BufferItem::join(const QList<IrcUser *> &ircUsers) {
+  addUsersToCategory(ircUsers);
 
-  addUserToCategory(ircUser);
+  foreach(IrcUser *ircUser, ircUsers) {
+    if(!ircUser)
+      continue;
+    connect(ircUser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed()));
+  }
+  
   emit dataChanged(2);
 }
 
 void BufferItem::addUserToCategory(IrcUser *ircUser) {
+  addUsersToCategory(QList<IrcUser *>() << ircUser);
+}
+
+void BufferItem::addUsersToCategory(const QList<IrcUser *> &ircUsers) {
   Q_ASSERT(_ircChannel);
 
-  UserCategoryItem *categoryItem;
-  int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
-  if(!(categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId))))) {
-    categoryItem = new UserCategoryItem(categoryId, this);
-    newChild(categoryItem);
+  QHash<UserCategoryItem *, QList<IrcUser *> > categories;
+  foreach(IrcUser *ircUser, ircUsers) {
+    UserCategoryItem *categoryItem;
+    int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
+    if(!(categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId))))) {
+      categoryItem = new UserCategoryItem(categoryId, this);
+      categories[categoryItem] = QList<IrcUser *>();
+      newChild(categoryItem);
+    }
+    categories[categoryItem] << ircUser;
   }
-  categoryItem->addUser(ircUser);
 
-  int totalusers = 0;
-  for(int i = 0; i < childCount(); i++) {
-    totalusers += child(i)->childCount();
+  QHash<UserCategoryItem *, QList<IrcUser *> >::const_iterator catIter = categories.constBegin();
+  while(catIter != categories.constEnd()) {
+    catIter.key()->addUsers(catIter.value());
+    catIter++;
   }
 }
 
@@ -216,27 +233,32 @@ void BufferItem::part(IrcUser *ircUser) {
     return;
   }
 
+  disconnect(ircUser, 0, this, 0);
   removeUserFromCategory(ircUser);
   emit dataChanged(2);
 }
 
 void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
-  Q_ASSERT(_ircChannel);
+  if(!_ircChannel) {
+    // If we parted the channel there might still be some ircUsers connected.
+    // in that case we just ignore the call
+    Q_ASSERT(childCount() == 0);
+    return;
+  }
 
   bool success = false;
   UserCategoryItem *categoryItem = 0;
   for(int i = 0; i < childCount(); i++) {
     categoryItem = qobject_cast<UserCategoryItem *>(child(i));
-    if(success = categoryItem->removeChildById((quint64)ircUser)) {
+    if(success = categoryItem->removeUser(ircUser)) {
       if(categoryItem->childCount() == 0)
 	removeChild(i);
       break;
     }
   }
 
-  
   if(!success) {
-    qDebug() << "didn't find User:" << ircUser << (quint64)ircUser;
+    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<UserCategoryItem *>(child(i));
@@ -245,11 +267,6 @@ void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
     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) {
@@ -257,13 +274,77 @@ void BufferItem::userModeChanged(IrcUser *ircUser) {
 
   UserCategoryItem *categoryItem;
   int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
-  if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))) && categoryItem->childById((quint64)(ircUser)))
+  if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))) && categoryItem->childById(qHash(ircUser)))
     return; // already in the right category;
   
   removeUserFromCategory(ircUser);
   addUserToCategory(ircUser);
 }
 
+QString BufferItem::toolTip(int column) const {
+  Q_UNUSED(column);
+  QStringList toolTip;
+
+  switch(bufferType()) {
+    case BufferInfo::StatusBuffer: {
+      QString netName = Client::network(bufferInfo().networkId())->networkName();
+      toolTip.append(tr("<b>Status buffer of %1</b>").arg(netName));
+      break;
+    }
+    case BufferInfo::ChannelBuffer:
+      toolTip.append(tr("<b>Channel %1</b>").arg(bufferName()));
+      if(isActive()) {
+        //TODO: add channel modes 
+        toolTip.append(tr("<b>Users:</b> %1").arg(nickCount()));
+
+        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));
+          }
+        }
+      } else {
+        toolTip.append(tr("Not active <br /> Double-click to join"));
+      }
+      break;
+    case BufferInfo::QueryBuffer:
+      toolTip.append(tr("<b>Query with %1</b>").arg(bufferName()));
+      if(topic() != "") toolTip.append(tr("Away Message: %1").arg(topic()));
+      break;
+    default: //this should not happen
+      toolTip.append(tr("%1 - %2").arg(bufferInfo().bufferId().toInt()).arg(bufferName()));
+      break;
+  }
+
+  return tr("<p> %1 </p>").arg(toolTip.join("<br />"));
+}
+
+/*
+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;
+}
+
+QDateTime BufferItem::lastSeen() {
+  return _lastSeen;
+}
+*/
 /*****************************************
 *  Network Items
 *****************************************/
@@ -288,12 +369,7 @@ QVariant NetworkItem::data(int column, int role) const {
 }
 
 quint64 NetworkItem::id() const {
-  return _networkId.toInt();
-}
-
-void NetworkItem::setActive(bool connected) {
-  Q_UNUSED(connected);
-  emit dataChanged();
+  return qHash(_networkId);
 }
 
 bool NetworkItem::isActive() const {
@@ -337,9 +413,7 @@ void NetworkItem::attachNetwork(Network *network) {
   connect(network, SIGNAL(ircChannelAdded(QString)),
 	  this, SLOT(attachIrcChannel(QString)));
   connect(network, SIGNAL(connectedSet(bool)),
-	  this, SLOT(setActive(bool)));
-  
-  // FIXME: connect this and that...
+	  this, SIGNAL(dataChanged()));
 
   emit dataChanged();
 }
@@ -354,7 +428,7 @@ void NetworkItem::attachIrcChannel(const QString &channelName) {
   BufferItem *bufferItem;
   for(int i = 0; i < childCount(); i++) {
     bufferItem = qobject_cast<BufferItem *>(child(i));
-    if(bufferItem->bufferName() == ircChannel->name()) {
+    if(bufferItem->bufferName().toLower() == ircChannel->name().toLower()) {
       bufferItem->attachIrcChannel(ircChannel);
       break;
     }
@@ -371,18 +445,32 @@ void NetworkItem::setCurrentServer(const QString &serverName) {
   emit dataChanged(1);
 }
 
+
+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()));
+
+  return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
+}
+
+
 /*****************************************
 *  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.
+// TODO make this translateable depending on the number of users in a category
+//      -> we can't set the real string here, because tr() needs to get the actual number as second param
+//      -> tr("%n User(s)", n) needs to be used somewhere where we do know the user number n
 const QList<UserCategoryItem::Category> UserCategoryItem::categories = QList<UserCategoryItem::Category>()
-  << 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::Category('q', tr("Owners"))
+  << UserCategoryItem::Category('a', tr("Admins"))
+  << UserCategoryItem::Category('o', tr("Operators"))
+  << UserCategoryItem::Category('h', tr("Half-Ops"))
+  << UserCategoryItem::Category('v', tr("Voiced"));
 
 UserCategoryItem::UserCategoryItem(int category, AbstractTreeItem *parent)
   : PropertyMapItem(QStringList() << "categoryId", parent),
@@ -394,15 +482,22 @@ QString UserCategoryItem::categoryId() {
   if(_category < categories.count())
     return categories[_category].displayString;
   else
-    return QString("Users");
+    return tr("Users");
 }
 
 quint64 UserCategoryItem::id() const {
   return qHash(_category);
 }
 
-void UserCategoryItem::addUser(IrcUser *ircUser) {
-  newChild(new IrcUserItem(ircUser, this));
+void UserCategoryItem::addUsers(const QList<IrcUser *> &ircUsers) {
+  QList<AbstractTreeItem *> userItems;
+  foreach(IrcUser *ircUser, ircUsers)
+    userItems << new IrcUserItem(ircUser, this);
+  newChilds(userItems);
+}
+
+bool UserCategoryItem::removeUser(IrcUser *ircUser) {
+  return removeChildById(qHash(ircUser));
 }
 
 int UserCategoryItem::categoryFromModes(const QString &modes) {
@@ -415,6 +510,8 @@ int UserCategoryItem::categoryFromModes(const QString &modes) {
 
 QVariant UserCategoryItem::data(int column, int role) const {
   switch(role) {
+  case NetworkModel::ItemActiveRole:
+    return true;
   case NetworkModel::ItemTypeRole:
     return NetworkModel::UserCategoryItemType;
   case NetworkModel::BufferIdRole:
@@ -434,17 +531,30 @@ QVariant UserCategoryItem::data(int column, int role) const {
 *****************************************/
 IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent)
   : PropertyMapItem(QStringList() << "nickName", parent),
-    _ircUser(ircUser)
+    _ircUser(ircUser),
+    _id(qHash(ircUser))
 {
   // 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)));
+  connect(ircUser, SIGNAL(awaySet(bool)),
+          this, SLOT(setAway(bool)));
 }
 
 QString IrcUserItem::nickName() const {
-  return _ircUser->nick();
+  if(_ircUser)
+    return _ircUser->nick();
+  else
+    return QString();
+}
+
+bool IrcUserItem::isActive() const {
+  if(_ircUser)
+    return !_ircUser->isAway();
+  else
+    return false;
 }
 
 IrcUser *IrcUserItem::ircUser() {
@@ -452,11 +562,13 @@ IrcUser *IrcUserItem::ircUser() {
 }
 
 quint64 IrcUserItem::id() const {
-  return (quint64)_ircUser;
+  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:
@@ -472,7 +584,27 @@ QVariant IrcUserItem::data(int column, int role) const {
 
 QString IrcUserItem::toolTip(int column) const {
   Q_UNUSED(column);
-  return "<p><b>" + nickName() + "</b><br />" + _ircUser->hostmask() + "</p>";
+  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");
+  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().remove(0, _ircUser->hostmask().indexOf("!")+1));
+
+  if(_ircUser->idleTime().isValid()) {
+    QDateTime now = QDateTime::currentDateTime();
+    QDateTime idle = _ircUser->idleTime();
+    int idleTime = idle.secsTo(now);
+    toolTip.append(tr("idling since %1").arg(secondsToString(idleTime)));
+  }
+  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()));
+
+  return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
 }
 
 void IrcUserItem::setNick(QString newNick) {
@@ -480,6 +612,11 @@ void IrcUserItem::setNick(QString newNick) {
   emit dataChanged(0);
 }
 
+void IrcUserItem::setAway(bool away) {
+  Q_UNUSED(away);
+  emit dataChanged(0);
+}
+
 /*****************************************
  * NetworkModel
  *****************************************/
@@ -508,7 +645,7 @@ Buffer *NetworkModel::getBufferByIndex(const QModelIndex &index) const {
 
 // experimental stuff :)
 QModelIndex NetworkModel::networkIndex(NetworkId networkId) {
-  return indexById(networkId.toInt());
+  return indexById(qHash(networkId));
 }
 
 NetworkItem *NetworkModel::existsNetworkItem(NetworkId networkId) {
@@ -527,19 +664,23 @@ NetworkItem *NetworkModel::networkItem(NetworkId networkId) {
   return netItem;
 }
 
+void NetworkModel::networkRemoved(const NetworkId &networkId) {
+  rootItem->removeChildById(qHash(networkId));
+}
+
 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()));
+    if((bufferItem = netItem->childById(qHash(bufferId)))) {
+      return indexByItem(bufferItem);
     }
   }
   return QModelIndex();
 }
 
 BufferItem *NetworkModel::existsBufferItem(const BufferInfo &bufferInfo) {
-  QModelIndex bufferIdx = bufferIndex(bufferInfo.uid());
+  QModelIndex bufferIdx = bufferIndex(bufferInfo.bufferId());
   if(bufferIdx.isValid())
     return static_cast<BufferItem *>(bufferIdx.internalPointer());
   else
@@ -618,8 +759,8 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in
     return false;
 
   // target must be a query
-  BufferItem::Type targetType = (BufferItem::Type)parent.data(NetworkModel::BufferTypeRole).toInt();
-  if(targetType != BufferItem::QueryType)
+  BufferInfo::Type targetType = (BufferInfo::Type)parent.data(NetworkModel::BufferTypeRole).toInt();
+  if(targetType != BufferInfo::QueryBuffer)
     return false;
 
   QList< QPair<NetworkId, BufferId> > bufferList = mimeDataToBufferList(data);
@@ -635,12 +776,12 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in
   if(bufferId == parent.data(BufferIdRole).value<BufferId>())
     return false; 
   
-  Q_ASSERT(rootItem->childById(netId.toInt()));
-  Q_ASSERT(rootItem->childById(netId.toInt())->childById(bufferId.toInt()));
+  Q_ASSERT(rootItem->childById(qHash(netId)));
+  Q_ASSERT(rootItem->childById(qHash(netId))->childById(qHash(bufferId)));
 
   // source must be a query too
-  BufferItem::Type sourceType = (BufferItem::Type)rootItem->childById(netId.toInt())->childById(bufferId.toInt())->data(0, BufferTypeRole).toInt();
-  if(sourceType != BufferItem::QueryType)
+  BufferInfo::Type sourceType = (BufferInfo::Type)rootItem->childById(qHash(netId))->childById(qHash(bufferId))->data(0, BufferTypeRole).toInt();
+  if(sourceType != BufferInfo::QueryBuffer)
     return false;
     
   // TODO: warn user about buffermerge!
@@ -661,14 +802,51 @@ void NetworkModel::bufferUpdated(BufferInfo bufferInfo) {
   emit dataChanged(itemindex, itemindex);
 }
 
+void NetworkModel::removeBuffer(BufferId bufferId) {
+  const int numNetworks = rootItem->childCount();
+  if(numNetworks == 0)
+    return;
+
+  for(int i = 0; i < numNetworks; i++) {
+    if(rootItem->child(i)->removeChildById(qHash(bufferId)))
+      break;
+  }
+}
+
+/*
 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;
 
-  if(msg.flags() & Message::Highlight)
-    level |= BufferItem::Highlight;
-  
-  bufferItem(msg.buffer())->updateActivity(level);
+  if(msg.flags() & Message::Highlight) 
+      level |= BufferItem::Highlight;
+
+  bufferItem(msg.bufferInfo())->updateActivity(level);
+}
+*/
+
+void NetworkModel::setBufferActivity(const BufferInfo &info, Buffer::ActivityLevel level) {
+  BufferItem *buff = bufferItem(info);
+  Q_ASSERT(buff);
+
+  buff->setActivityLevel(level);
+}
+
+const Network *NetworkModel::networkByIndex(const QModelIndex &index) const {
+  QVariant netVariant = index.data(NetworkIdRole);
+  if(!netVariant.isValid())
+    return 0;
+
+  NetworkId networkId = netVariant.value<NetworkId>();
+  return Client::network(networkId);
 }