X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=23ab2616380fc411f6fd63b8741395206c916526;hp=0401dca1da4833956f07f4eea8ad3a64dbad96d2;hb=172c8f1cfa164852bda7f0112fed2b0fa52c902f;hpb=8c38d6c5248c1b364bf56e25be0069f32c4f0408

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 0401dca1..23ab2616 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -22,75 +22,244 @@
 
 #include <QAbstractItemView>
 
-#include "bufferinfo.h"
+#include "buffermodel.h"
 #include "client.h"
 #include "signalproxy.h"
 #include "network.h"
 #include "ircchannel.h"
-#include "ircuser.h"
+
+#include "buffersettings.h"
 
 #include "util.h" // get rid of this (needed for isChannelName)
 
 /*****************************************
-*  Fancy Buffer Items
+*  Network Items
 *****************************************/
-BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent)
-  : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent),
-    _bufferInfo(bufferInfo),
-    _activity(NoActivity)
+NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent)
+  : PropertyMapItem(QList<QString>() << "networkName" << "currentServer" << "nickCount", parent),
+    _networkId(netid),
+    _statusBufferItem(0)
 {
-  // determine BufferType
-  if(bufferInfo.bufferName().isEmpty())
-    _type = StatusType;
-  else if(isChannelName(bufferInfo.bufferName()))
-    _type = ChannelType;
-  else
-    _type = QueryType;
+  // DO NOT EMIT dataChanged() DIRECTLY IN NetworkItem
+  // use networkDataChanged() instead. Otherwise you will end up in a infinite loop
+  // as we "sync" the dataChanged() signals of NetworkItem and StatusBufferItem
+  setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
+  connect(this, SIGNAL(networkDataChanged(int)), this, SIGNAL(dataChanged(int)));
+  connect(this, SIGNAL(beginRemoveChilds(int, int)), this, SLOT(onBeginRemoveChilds(int, int)));
+}
+
+QVariant NetworkItem::data(int column, int role) const {
+  switch(role) {
+  case NetworkModel::BufferIdRole:
+  case NetworkModel::BufferInfoRole:
+  case NetworkModel::BufferTypeRole:
+  case NetworkModel::BufferActivityRole:
+    if(_statusBufferItem)
+      return _statusBufferItem->data(column, role);
+    else
+      return QVariant();
+  case NetworkModel::NetworkIdRole:
+    return qVariantFromValue(_networkId);
+  case NetworkModel::ItemTypeRole:
+    return NetworkModel::NetworkItemType;
+  case NetworkModel::ItemActiveRole:
+    return isActive();
+  default:
+    return PropertyMapItem::data(column, role);
+  }
+}
+
+BufferItem *NetworkItem::findBufferItem(BufferId bufferId) {
+  BufferItem *bufferItem = 0;
+
+  for(int i = 0; i < childCount(); i++) {
+    bufferItem = qobject_cast<BufferItem *>(child(i));
+    if(!bufferItem)
+      continue;
+    if(bufferItem->bufferId() == bufferId)
+      return bufferItem;
+  }
+  return 0;
+}
+
+
+BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) {
+  BufferItem *bufferItem = findBufferItem(bufferInfo);
+  if(bufferItem)
+    return bufferItem;
+
+  switch(bufferInfo.type()) {
+  case BufferInfo::StatusBuffer:
+    _statusBufferItem = new StatusBufferItem(bufferInfo, this);
+    bufferItem = _statusBufferItem;
+    disconnect(this, SIGNAL(networkDataChanged(int)), this, SIGNAL(dataChanged(int)));
+    connect(this, SIGNAL(networkDataChanged(int)), bufferItem, SIGNAL(dataChanged(int)));
+    connect(bufferItem, SIGNAL(dataChanged(int)), this, SIGNAL(dataChanged(int)));
+    break;
+  case BufferInfo::ChannelBuffer:
+    bufferItem = new ChannelBufferItem(bufferInfo, this);
+    break;
+  case BufferInfo::QueryBuffer:
+    bufferItem = new QueryBufferItem(bufferInfo, this);
+    break;
+  default:
+    bufferItem = new BufferItem(bufferInfo, this);
+  }
+
+  newChild(bufferItem);
+
+  // postprocess... this is necessary because Qt doesn't seem to like adding childs which already have childs on their own
+  switch(bufferInfo.type()) {
+  case BufferInfo::ChannelBuffer:
+    {
+      ChannelBufferItem *channelBufferItem = static_cast<ChannelBufferItem *>(bufferItem);
+      if(_network) {
+        IrcChannel *ircChannel = _network->ircChannel(bufferInfo.bufferName());
+        if(ircChannel)
+          channelBufferItem->attachIrcChannel(ircChannel);
+      }
+    }
+    break;
+  default:
+    break;
+  }
+
+  return bufferItem;
+}
+
+void NetworkItem::attachNetwork(Network *network) {
+  if(!network)
+    return;
+
+  _network = network;
+
+  connect(network, SIGNAL(networkNameSet(QString)),
+	  this, SLOT(setNetworkName(QString)));
+  connect(network, SIGNAL(currentServerSet(QString)),
+	  this, SLOT(setCurrentServer(QString)));
+  connect(network, SIGNAL(ircChannelAdded(IrcChannel *)),
+	  this, SLOT(attachIrcChannel(IrcChannel *)));
+  connect(network, SIGNAL(ircUserAdded(IrcUser *)),
+	  this, SLOT(attachIrcUser(IrcUser *)));
+  connect(network, SIGNAL(connectedSet(bool)),
+	  this, SIGNAL(networkDataChanged()));
+  connect(network, SIGNAL(destroyed()),
+	  this, SIGNAL(networkDataChanged()));
 
-  Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
-  if(bufferType() == QueryType)
-    flags |= Qt::ItemIsDropEnabled;
-  setFlags(flags);
+  emit networkDataChanged();
 }
 
+void NetworkItem::attachIrcChannel(IrcChannel *ircChannel) {
+  ChannelBufferItem *channelItem;
+  for(int i = 0; i < childCount(); i++) {
+    channelItem = qobject_cast<ChannelBufferItem *>(child(i));
+    if(!channelItem)
+      continue;
+
+    if(channelItem->bufferName().toLower() == ircChannel->name().toLower()) {
+      channelItem->attachIrcChannel(ircChannel);
+      return;
+    }
+  }
+}
 
-const BufferInfo &BufferItem::bufferInfo() const {
-  return _bufferInfo;
+void NetworkItem::attachIrcUser(IrcUser *ircUser) {
+  QueryBufferItem *queryItem = 0;
+  for(int i = 0; i < childCount(); i++) {
+    queryItem = qobject_cast<QueryBufferItem *>(child(i));
+    if(!queryItem)
+      continue;
+
+    if(queryItem->bufferName().toLower() == ircUser->nick().toLower()) {
+      queryItem->setIrcUser(ircUser);
+      break;
+    }
+  }
 }
 
-quint64 BufferItem::id() const {
-  return bufferInfo().bufferId().toInt();
+void NetworkItem::setNetworkName(const QString &networkName) {
+  Q_UNUSED(networkName);
+  emit networkDataChanged(0);
 }
 
-bool BufferItem::isStatusBuffer() const {
-   return bufferType() == StatusType;
+void NetworkItem::setCurrentServer(const QString &serverName) {
+  Q_UNUSED(serverName);
+  emit networkDataChanged(1);
 }
 
-BufferItem::Type BufferItem::bufferType() const {
-  return _type;
+
+QString NetworkItem::toolTip(int column) const {
+  Q_UNUSED(column);
+
+  QStringList toolTip(QString("<b>%1</b>").arg(networkName()));
+  toolTip.append(tr("Server: %1").arg(currentServer()));
+  toolTip.append(tr("Users: %1").arg(nickCount()));
+
+  if(_network) {
+    toolTip.append(tr("Lag: %1 msecs").arg(_network->latency()));
+  }
+
+  return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
 }
 
-bool BufferItem::isActive() const {
-  if(bufferType() == ChannelType)
-    return _ircChannel;
-  else
-    return qobject_cast<NetworkItem *>(parent())->isActive();
+void NetworkItem::onBeginRemoveChilds(int start, int end) {
+  for(int i = start; i <= end; i++) {
+    StatusBufferItem *statusBufferItem = qobject_cast<StatusBufferItem *>(child(i));
+    if(statusBufferItem) {
+      _statusBufferItem = 0;
+      break;
+    }
+  }
 }
 
-BufferItem::ActivityLevel BufferItem::activity() const {
-  return _activity;
+/*****************************************
+*  Fancy Buffer Items
+*****************************************/
+BufferItem::BufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent)
+  : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent),
+    _bufferInfo(bufferInfo),
+    _activity(BufferInfo::NoActivity)
+{
+  setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled);
 }
 
-void BufferItem::setActivity(const ActivityLevel &level) {
-  _activity = level;
-  emit dataChanged();
+void BufferItem::setActivityLevel(BufferInfo::ActivityLevel level) {
+  if(_activity != level) {
+    _activity = level;
+    emit dataChanged();
+  }
 }
 
-void BufferItem::updateActivity(const ActivityLevel &level) {
-  _activity |= level;
+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();
+}
+
 QVariant BufferItem::data(int column, int role) const {
   switch(role) {
   case NetworkModel::ItemTypeRole:
@@ -106,7 +275,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,259 +284,363 @@ 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());
+    setActivityLevel((BufferInfo::ActivityLevel)value.toInt());
+    return true;
   default:
     return PropertyMapItem::setData(column, value, role);
   }
   return true;
 }
 
+void BufferItem::setBufferName(const QString &name) {
+  _bufferInfo = BufferInfo(_bufferInfo.bufferId(), _bufferInfo.networkId(), _bufferInfo.type(), _bufferInfo.groupId(), name);
+  emit dataChanged(0);
+}
 
-void BufferItem::attachIrcChannel(IrcChannel *ircChannel) {
-  if(!ircChannel)
-    return;
-  
-  _ircChannel = ircChannel;
-
-  connect(ircChannel, SIGNAL(topicSet(QString)),
-	  this, SLOT(setTopic(QString)));
-  connect(ircChannel, SIGNAL(ircUserJoined(IrcUser *)),
-	  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);
-    }
+void BufferItem::setLastSeenMsgId(const MsgId &msgId) {
+  _lastSeenMsgId = msgId;
+  if(!isCurrentBuffer()) {
+    _lastSeenMarkerMsgId = msgId;
   }
-  
-  emit dataChanged();
+  setActivityLevel(BufferInfo::NoActivity);
 }
 
-void BufferItem::ircChannelDestroyed() {
-  emit dataChanged();
-  removeAllChilds();
+bool BufferItem::isCurrentBuffer() const {
+  return _bufferInfo.bufferId() == Client::bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>();
 }
 
-QString BufferItem::bufferName() const {
-  if(bufferType() == StatusType)
-    return tr("Status Buffer");
-  else
-    return bufferInfo().bufferName();
+QString BufferItem::toolTip(int column) const {
+  Q_UNUSED(column);
+  return tr("<p> %1 - %2 </p>").arg(bufferInfo().bufferId().toInt()).arg(bufferName());
 }
 
-QString BufferItem::topic() const {
-  if(_ircChannel)
-    return _ircChannel->topic();
-  else
-    return QString();
+/*****************************************
+*  StatusBufferItem
+*****************************************/
+StatusBufferItem::StatusBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent)
+  : BufferItem(bufferInfo, parent)
+{
 }
 
-int BufferItem::nickCount() const {
-  if(_ircChannel)
-    return _ircChannel->ircUsers().count();
+QString StatusBufferItem::toolTip(int column) const {
+  NetworkItem *networkItem = qobject_cast<NetworkItem *>(parent());
+  if(networkItem)
+    return networkItem->toolTip(column);
   else
-    return 0;
+    return QString();
 }
 
-void BufferItem::setTopic(const QString &topic) {
-  Q_UNUSED(topic);
-  emit dataChanged(1);
-}
+/*****************************************
+*  QueryBufferItem
+*****************************************/
+QueryBufferItem::QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent)
+  : BufferItem(bufferInfo, parent),
+    _ircUser(0)
+{
+  setFlags(flags() | Qt::ItemIsDropEnabled | Qt::ItemIsEditable);
 
-void BufferItem::join(IrcUser *ircUser) {
-  if(!ircUser)
+  const Network *net = Client::network(bufferInfo.networkId());
+  if(!net)
     return;
 
-  addUserToCategory(ircUser);
-  emit dataChanged(2);
+  IrcUser *ircUser = net->ircUser(bufferInfo.bufferName());
+  setIrcUser(ircUser);
 }
 
-void BufferItem::addUserToCategory(IrcUser *ircUser) {
-  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);
-  }
-  categoryItem->addUser(ircUser);
-
-  int totalusers = 0;
-  for(int i = 0; i < childCount(); i++) {
-    totalusers += child(i)->childCount();
+QVariant QueryBufferItem::data(int column, int role) const {
+  switch(role) {
+  case Qt::EditRole:
+    return BufferItem::data(column, Qt::DisplayRole);
+  case NetworkModel::IrcUserRole:
+    return QVariant::fromValue<QObject *>(_ircUser);
+  case NetworkModel::UserAwayRole:
+    return (bool)_ircUser ? _ircUser->isAway() : false;
+  default:
+    return BufferItem::data(column, role);
   }
 }
 
-void BufferItem::part(IrcUser *ircUser) {
-  if(!ircUser) {
-    qWarning() << bufferName() << "BufferItem::part(): unknown User" << ircUser;
-    return;
+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);
   }
+}
 
-  removeUserFromCategory(ircUser);
-  emit dataChanged(2);
+void QueryBufferItem::setBufferName(const QString &name) {
+  BufferItem::setBufferName(name);
+  NetworkId netId = data(0, NetworkModel::NetworkIdRole).value<NetworkId>();
+  const Network *net = Client::network(netId);
+  if(net)
+    setIrcUser(net->ircUser(name));
 }
 
-void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
-  Q_ASSERT(_ircChannel);
+QString QueryBufferItem::toolTip(int column) const {
+  // pretty much code duplication of IrcUserItem::toolTip() but inheritance won't solve this...
+  Q_UNUSED(column);
+  QStringList toolTip;
 
-  bool success = false;
-  UserCategoryItem *categoryItem = 0;
-  for(int i = 0; i < childCount(); i++) {
-    categoryItem = qobject_cast<UserCategoryItem *>(child(i));
-    if(success = categoryItem->removeUser(ircUser)) {
-      if(categoryItem->childCount() == 0)
-	removeChild(i);
-      break;
+  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->isAway()) {
+      toolTip[0].append(QString(" (away%1)").arg(!_ircUser->awayMessage().isEmpty() ? (QString(" ") + _ircUser->awayMessage()) : QString()));
+    }
+    if(!_ircUser->realName().isEmpty()) toolTip.append(_ircUser->realName());
+    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();
+      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()));
   }
 
-  if(!success) {
-    qDebug() << "didn't find User:" << ircUser << (quint64)ircUser;
-    qDebug() << "==== Childlist for Item:" << this << id() << bufferName() << "====";
-    for(int i = 0; i < childCount(); i++) {
-      categoryItem = qobject_cast<UserCategoryItem *>(child(i));
-      categoryItem->dumpChildList();
-    }
-    qDebug() << "==== End Of Childlist for Item:" << this << id() << bufferName() << "====";
+  return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
+}
+
+void QueryBufferItem::setIrcUser(IrcUser *ircUser) {
+  if(_ircUser == ircUser)
+    return;
+
+  if(_ircUser) {
+    disconnect(_ircUser, 0, this, 0);
   }
-  Q_ASSERT(success);
 
-  int totalusers = 0;
-  for(int i = 0; i < childCount(); i++) {
-    totalusers += child(i)->childCount();
+  if(ircUser) {
+    connect(ircUser, SIGNAL(quited()), this, SLOT(removeIrcUser()));
+    connect(ircUser, SIGNAL(awaySet(bool)), this, SIGNAL(dataChanged()));
   }
-}
 
-void BufferItem::userModeChanged(IrcUser *ircUser) {
-  Q_ASSERT(_ircChannel);
+  _ircUser = ircUser;
+  emit dataChanged();
+}
 
-  UserCategoryItem *categoryItem;
-  int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
-  if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))) && categoryItem->childById((quint64)(ircUser)))
-    return; // already in the right category;
-  
-  removeUserFromCategory(ircUser);
-  addUserToCategory(ircUser);
+void QueryBufferItem::removeIrcUser() {
+  _ircUser = 0;
+  emit dataChanged();
 }
 
 /*****************************************
-*  Network Items
+*  ChannelBufferItem
 *****************************************/
-NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent)
-  : PropertyMapItem(QList<QString>() << "networkName" << "currentServer" << "nickCount", parent),
-    _networkId(netid)
+ChannelBufferItem::ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent)
+  : BufferItem(bufferInfo, parent),
+    _ircChannel(0)
 {
-  setFlags(Qt::ItemIsEnabled);
 }
 
-QVariant NetworkItem::data(int column, int role) const {
+QVariant ChannelBufferItem::data(int column, int role) const {
   switch(role) {
-  case NetworkModel::NetworkIdRole:
-    return qVariantFromValue(_networkId);
-  case NetworkModel::ItemTypeRole:
-    return NetworkModel::NetworkItemType;
-  case NetworkModel::ItemActiveRole:
-    return isActive();
-  default:
-    return PropertyMapItem::data(column, 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
+    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));
+    }
+
+    BufferSettings s;
+    bool showTopic = s.value("DisplayTopicInTooltip", QVariant(false)).toBool();
+    if(showTopic) {
+      QString _topic = topic();
+      if(_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 />"));
 }
 
-quint64 NetworkItem::id() const {
-  return _networkId.toInt();
+void ChannelBufferItem::attachIrcChannel(IrcChannel *ircChannel) {
+  Q_ASSERT(!_ircChannel && ircChannel);
+
+  _ircChannel = ircChannel;
+
+  connect(ircChannel, SIGNAL(topicSet(QString)),
+	  this, SLOT(setTopic(QString)));
+  connect(ircChannel, SIGNAL(ircUsersJoined(QList<IrcUser *>)),
+	  this, SLOT(join(QList<IrcUser *>)));
+  connect(ircChannel, SIGNAL(ircUserParted(IrcUser *)),
+	  this, SLOT(part(IrcUser *)));
+  connect(ircChannel, SIGNAL(parted()),
+	  this, SLOT(ircChannelParted()));
+  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())
+    join(ircChannel->ircUsers());
+
+  emit dataChanged();
 }
 
-void NetworkItem::setActive(bool connected) {
-  Q_UNUSED(connected);
+void ChannelBufferItem::ircChannelParted() {
+  Q_CHECK_PTR(_ircChannel);
+  disconnect(_ircChannel, 0, this, 0);
+  _ircChannel = 0;
   emit dataChanged();
+  removeAllChilds();
 }
 
-bool NetworkItem::isActive() const {
-  if(_network)
-    return _network->isConnected();
-  else
-    return false;
+void ChannelBufferItem::join(const QList<IrcUser *> &ircUsers) {
+  addUsersToCategory(ircUsers);
+  emit dataChanged(2);
 }
 
-QString NetworkItem::networkName() const {
-  if(_network)
-    return _network->networkName();
-  else
-    return QString();
+UserCategoryItem *ChannelBufferItem::findCategoryItem(int categoryId) {
+  UserCategoryItem *categoryItem = 0;
+
+  for(int i = 0; i < childCount(); i++) {
+    categoryItem = qobject_cast<UserCategoryItem *>(child(i));
+    if(!categoryItem)
+      continue;
+    if(categoryItem->categoryId() == categoryId)
+      return categoryItem;
+  }
+  return 0;
 }
 
-QString NetworkItem::currentServer() const {
-  if(_network)
-    return _network->currentServer();
-  else
-    return QString();
+void ChannelBufferItem::addUserToCategory(IrcUser *ircUser) {
+  addUsersToCategory(QList<IrcUser *>() << ircUser);
 }
 
-int NetworkItem::nickCount() const {
-  if(_network)
-    return _network->ircUsers().count();
-  else
-    return 0;
+void ChannelBufferItem::addUsersToCategory(const QList<IrcUser *> &ircUsers) {
+  Q_ASSERT(_ircChannel);
+
+  QHash<UserCategoryItem *, QList<IrcUser *> > categories;
+
+  int categoryId = -1;
+  UserCategoryItem *categoryItem = 0;
+
+  foreach(IrcUser *ircUser, ircUsers) {
+    categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
+    categoryItem = findCategoryItem(categoryId);
+    if(!categoryItem) {
+      categoryItem = new UserCategoryItem(categoryId, this);
+      categories[categoryItem] = QList<IrcUser *>();
+      newChild(categoryItem);
+    }
+    categories[categoryItem] << ircUser;
+  }
+
+  QHash<UserCategoryItem *, QList<IrcUser *> >::const_iterator catIter = categories.constBegin();
+  while(catIter != categories.constEnd()) {
+    catIter.key()->addUsers(catIter.value());
+    catIter++;
+  }
 }
 
-void NetworkItem::attachNetwork(Network *network) {
-  if(!network)
+void ChannelBufferItem::part(IrcUser *ircUser) {
+  if(!ircUser) {
+    qWarning() << bufferName() << "ChannelBufferItem::part(): unknown User" << ircUser;
     return;
-  
-  _network = network;
-
-  connect(network, SIGNAL(networkNameSet(QString)),
-	  this, SLOT(setNetworkName(QString)));
-  connect(network, SIGNAL(currentServerSet(QString)),
-	  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();
+  disconnect(ircUser, 0, this, 0);
+  removeUserFromCategory(ircUser);
+  emit dataChanged(2);
 }
 
-void NetworkItem::attachIrcChannel(const QString &channelName) {
-  IrcChannel *ircChannel = _network->ircChannel(channelName);
-  if(!ircChannel) {
-    qWarning() << "NetworkItem::attachIrcChannel(): unkown Channel" << channelName;
+void ChannelBufferItem::removeUserFromCategory(IrcUser *ircUser) {
+  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;
   }
-  
-  BufferItem *bufferItem;
+
+  UserCategoryItem *categoryItem = 0;
   for(int i = 0; i < childCount(); i++) {
-    bufferItem = qobject_cast<BufferItem *>(child(i));
-    if(bufferItem->bufferName() == ircChannel->name()) {
-      bufferItem->attachIrcChannel(ircChannel);
+    categoryItem = qobject_cast<UserCategoryItem *>(child(i));
+    if(categoryItem->removeUser(ircUser)) {
+      if(categoryItem->childCount() == 0)
+	removeChild(i);
       break;
     }
   }
 }
 
-void NetworkItem::setNetworkName(const QString &networkName) {
-  Q_UNUSED(networkName);
-  emit dataChanged(0);
-}
+void ChannelBufferItem::userModeChanged(IrcUser *ircUser) {
+  Q_ASSERT(_ircChannel);
 
-void NetworkItem::setCurrentServer(const QString &serverName) {
-  Q_UNUSED(serverName);
-  emit dataChanged(1);
+  int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
+  UserCategoryItem *categoryItem = findCategoryItem(categoryId);
+
+  if(categoryItem) {
+    if(categoryItem->findIrcUser(ircUser)) {
+      return; // already in the right category;
+    }
+  } else {
+    categoryItem = new UserCategoryItem(categoryId, this);
+    newChild(categoryItem);
+  }
+
+  // find the item that needs reparenting
+  IrcUserItem *ircUserItem = 0;
+  for(int i = 0; i < childCount(); i++) {
+    UserCategoryItem *oldCategoryItem = qobject_cast<UserCategoryItem *>(child(i));
+    Q_ASSERT(oldCategoryItem);
+    IrcUserItem *userItem = oldCategoryItem->findIrcUser(ircUser);
+    if(userItem) {
+      ircUserItem = userItem;
+      break;
+    }
+  }
+
+  if(!ircUserItem) {
+    qWarning() << "ChannelBufferItem::userModeChanged(IrcUser *): unable to determine old category of" << ircUser;
+    return;
+  }
+  ircUserItem->reParent(categoryItem);
 }
 
 /*****************************************
@@ -375,42 +648,64 @@ void NetworkItem::setCurrentServer(const QString &serverName) {
 *****************************************/
 // 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::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");
+const QList<QChar> UserCategoryItem::categories = QList<QChar>() << 'q' << 'a' << 'o' << 'h' << 'v';
 
 UserCategoryItem::UserCategoryItem(int category, AbstractTreeItem *parent)
-  : PropertyMapItem(QStringList() << "categoryId", parent),
+  : PropertyMapItem(QStringList() << "categoryName", parent),
     _category(category)
 {
+  setFlags(Qt::ItemIsEnabled);
+  setTreeItemFlags(AbstractTreeItem::DeleteOnLastChildRemoved);
+  setObjectName(parent->data(0, Qt::DisplayRole).toString() + "/" + QString::number(category));
+}
+
+// caching this makes no sense, since we display the user number dynamically
+QString UserCategoryItem::categoryName() const {
+  int n = childCount();
+  switch(_category) {
+    case 0: return tr("%n Owner(s)", 0, n);
+    case 1: return tr("%n Admin(s)", 0, n);
+    case 2: return tr("%n Operator(s)", 0, n);
+    case 3: return tr("%n Half-Op(s)", 0, n);
+    case 4: return tr("%n Voiced", 0, n);
+    default: return tr("%n User(s)", 0, n);
+  }
 }
 
-QString UserCategoryItem::categoryId() {
-  if(_category < categories.count())
-    return categories[_category].displayString;
-  else
-    return QString("Users");
-}
+IrcUserItem *UserCategoryItem::findIrcUser(IrcUser *ircUser) {
+  IrcUserItem *userItem = 0;
 
-quint64 UserCategoryItem::id() const {
-  return qHash(_category);
+  for(int i = 0; i < childCount(); i++) {
+    userItem = qobject_cast<IrcUserItem *>(child(i));
+    if(!userItem)
+      continue;
+    if(userItem->ircUser() == ircUser)
+      return userItem;
+  }
+  return 0;
 }
 
-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);
+  emit dataChanged(0);
 }
 
 bool UserCategoryItem::removeUser(IrcUser *ircUser) {
-  return removeChildById((quint64)ircUser);
+  IrcUserItem *userItem = findIrcUser(ircUser);
+  bool success = (bool)userItem;
+  if(success) {
+    removeChild(userItem);
+    emit dataChanged(0);
+  }
+  return success;
 }
 
 int UserCategoryItem::categoryFromModes(const QString &modes) {
   for(int i = 0; i < categories.count(); i++) {
-    if(modes.contains(categories[i].mode))
+    if(modes.contains(categories[i]))
       return i;
   }
   return categories.count();
@@ -418,6 +713,8 @@ int UserCategoryItem::categoryFromModes(const QString &modes) {
 
 QVariant UserCategoryItem::data(int column, int role) const {
   switch(role) {
+  case TreeModel::SortRole:
+    return _category;
   case NetworkModel::ItemActiveRole:
     return true;
   case NetworkModel::ItemTypeRole:
@@ -433,7 +730,7 @@ QVariant UserCategoryItem::data(int column, int role) const {
   }
 }
 
-     
+
 /*****************************************
 *  Irc User Items
 *****************************************/
@@ -441,29 +738,16 @@ IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent)
   : PropertyMapItem(QStringList() << "nickName", parent),
     _ircUser(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)));
-}
-
-QString IrcUserItem::nickName() const {
-  return _ircUser->nick();
-}
-
-IrcUser *IrcUserItem::ircUser() {
-  return _ircUser;
-}
-
-quint64 IrcUserItem::id() const {
-  return (quint64)_ircUser;
+  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()));
 }
 
 QVariant IrcUserItem::data(int column, int role) const {
   switch(role) {
   case NetworkModel::ItemActiveRole:
-    return !_ircUser->isAway();
+    return isActive();
   case NetworkModel::ItemTypeRole:
     return NetworkModel::IrcUserItemType;
   case NetworkModel::BufferIdRole:
@@ -472,6 +756,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);
   }
@@ -480,51 +770,50 @@ QVariant IrcUserItem::data(int column, int role) const {
 QString IrcUserItem::toolTip(int column) const {
   Q_UNUSED(column);
   QStringList toolTip(QString("<b>%1</b>").arg(nickName()));
-  if(_ircUser->isAway()) toolTip[0].append(" is away");
-  if(!_ircUser->awayMessage().isEmpty()) toolTip[0].append(QString(" (%1)").arg(_ircUser->awayMessage()));
+  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());
+  if(!_ircUser->ircOperator().isEmpty()) toolTip.append(QString("%1 %2").arg(nickName()).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();
     int idleTime = idle.secsTo(now);
-
-    QList< QPair<int, QString> > 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));
+    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(QString("server: %1").arg(_ircUser->server()));
+  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) {
-  Q_UNUSED(newNick);
-  emit dataChanged(0);
-}
-
 /*****************************************
  * 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)));
+
+  BufferSettings defaultSettings;
+  defaultSettings.notify("UserNoticesTarget", this, SLOT(messageRedirectionSettingsChanged()));
+  defaultSettings.notify("ServerNoticesTarget", this, SLOT(messageRedirectionSettingsChanged()));
+  defaultSettings.notify("ErrorMsgsTarget", this, SLOT(messageRedirectionSettingsChanged()));
+  messageRedirectionSettingsChanged();
 }
 
 QList<QVariant >NetworkModel::defaultHeader() {
@@ -537,64 +826,71 @@ 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) const {
+  NetworkItem *netItem = 0;
+  for(int i = 0; i < rootItem->childCount(); i++) {
+    netItem = qobject_cast<NetworkItem *>(rootItem->child(i));
+    if(!netItem)
+      continue;
+    if(netItem->networkId() == networkId)
+      return i;
+  }
+  return -1;
 }
-*/
 
-
-// experimental stuff :)
 QModelIndex NetworkModel::networkIndex(NetworkId networkId) {
-  return indexById(networkId.toInt());
+  int netRow = networkRow(networkId);
+  if(netRow == -1)
+    return QModelIndex();
+  else
+    return indexByItem(qobject_cast<NetworkItem *>(rootItem->child(netRow)));
 }
 
-NetworkItem *NetworkModel::existsNetworkItem(NetworkId networkId) {
-  return qobject_cast<NetworkItem *>(rootItem->childById(networkId.toInt()));
+NetworkItem *NetworkModel::findNetworkItem(NetworkId networkId) const {
+  int netRow = networkRow(networkId);
+  if(netRow == -1)
+    return 0;
+  else
+    return qobject_cast<NetworkItem *>(rootItem->child(netRow));
 }
 
 NetworkItem *NetworkModel::networkItem(NetworkId networkId) {
-  NetworkItem *netItem = existsNetworkItem(networkId);
+  NetworkItem *netItem = findNetworkItem(networkId);
 
   if(netItem == 0) {
     netItem = new NetworkItem(networkId, rootItem);
     rootItem->newChild(netItem);
   }
-
-  Q_ASSERT(netItem);
   return netItem;
 }
 
-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()));
-    }
+void NetworkModel::networkRemoved(const NetworkId &networkId) {
+  int netRow = networkRow(networkId);
+  if(netRow != -1) {
+    rootItem->removeChild(netRow);
   }
-  return QModelIndex();
 }
 
-BufferItem *NetworkModel::existsBufferItem(const BufferInfo &bufferInfo) {
-  QModelIndex bufferIdx = bufferIndex(bufferInfo.bufferId());
-  if(bufferIdx.isValid())
-    return static_cast<BufferItem *>(bufferIdx.internalPointer());
+QModelIndex NetworkModel::bufferIndex(BufferId bufferId) {
+  if(!_bufferItemCache.contains(bufferId))
+    return QModelIndex();
+
+  return indexByItem(_bufferItemCache[bufferId]);
+}
+
+BufferItem *NetworkModel::findBufferItem(BufferId bufferId) const {
+  if(_bufferItemCache.contains(bufferId))
+    return _bufferItemCache[bufferId];
   else
     return 0;
 }
 
 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);
-  }
+  if(_bufferItemCache.contains(bufferInfo.bufferId()))
+    return _bufferItemCache[bufferInfo.bufferId()];
 
-  Q_ASSERT(bufItem);
-  return bufItem;
+  NetworkItem *netItem = networkItem(bufferInfo.networkId());
+  return netItem->bufferItem(bufferInfo);
 }
 
 QStringList NetworkModel::mimeTypes() const {
@@ -648,47 +944,6 @@ QMimeData *NetworkModel::mimeData(const QModelIndexList &indexes) const {
   return mimeData;
 }
 
-bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) {
-  Q_UNUSED(action)
-  Q_UNUSED(row)
-  Q_UNUSED(column)
-
-  if(!mimeContainsBufferList(data))
-    return false;
-
-  // target must be a query
-  BufferItem::Type targetType = (BufferItem::Type)parent.data(NetworkModel::BufferTypeRole).toInt();
-  if(targetType != BufferItem::QueryType)
-    return false;
-
-  QList< QPair<NetworkId, BufferId> > bufferList = mimeDataToBufferList(data);
-
-  // exactly one buffer has to be dropped
-  if(bufferList.count() != 1)
-    return false;
-
-  NetworkId netId = bufferList.first().first;
-  BufferId bufferId = bufferList.first().second;
-
-  // no self merges (would kill us)
-  if(bufferId == parent.data(BufferIdRole).value<BufferId>())
-    return false; 
-  
-  Q_ASSERT(rootItem->childById(netId.toInt()));
-  Q_ASSERT(rootItem->childById(netId.toInt())->childById(bufferId.toInt()));
-
-  // 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)
-    return false;
-    
-  // TODO: warn user about buffermerge!
-  qDebug() << "merging" << bufferId << parent.data(BufferIdRole).value<BufferId>();
-  removeRow(parent.row(), parent.parent());
-  
-  return true;
-}
-
 void NetworkModel::attachNetwork(Network *net) {
   NetworkItem *netItem = networkItem(net->networkId());
   netItem->attachNetwork(net);
@@ -700,16 +955,110 @@ void NetworkModel::bufferUpdated(BufferInfo bufferInfo) {
   emit dataChanged(itemindex, itemindex);
 }
 
-void NetworkModel::updateBufferActivity(const Message &msg) {
-  BufferItem::ActivityLevel level = BufferItem::OtherActivity;
-  if(msg.type() == Message::Plain || msg.type() == Message::Notice)
-    level |= BufferItem::NewMessage;
+void NetworkModel::removeBuffer(BufferId bufferId) {
+  BufferItem *buffItem = findBufferItem(bufferId);
+  if(!buffItem)
+    return;
+
+  buffItem->parent()->removeChild(buffItem);
+}
+
+MsgId NetworkModel::lastSeenMsgId(BufferId bufferId) const {
+  if(!_bufferItemCache.contains(bufferId))
+    return MsgId();
+
+  return _bufferItemCache[bufferId]->lastSeenMsgId();
+}
+
+MsgId NetworkModel::lastSeenMarkerMsgId(BufferId bufferId) const {
+  if(!_bufferItemCache.contains(bufferId))
+    return MsgId();
+
+  return _bufferItemCache[bufferId]->lastSeenMarkerMsgId();
+}
+
+MsgId NetworkModel::lastSeenMsgId(const BufferId &bufferId) {
+  BufferItem *bufferItem = findBufferItem(bufferId);
+  if(!bufferItem) {
+    qDebug() << "NetworkModel::lastSeenMsgId(): buffer is unknown:" << bufferId;
+    Client::purgeKnownBufferIds();
+    return MsgId();
+  }
+  return bufferItem->lastSeenMsgId();
+}
+
+void NetworkModel::setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId) {
+  BufferItem *bufferItem = findBufferItem(bufferId);
+  if(!bufferItem) {
+    qDebug() << "NetworkModel::setLastSeenMsgId(): buffer is unknown:" << bufferId;
+    Client::purgeKnownBufferIds();
+    return;
+  }
+  bufferItem->setLastSeenMsgId(msgId);
+}
+
+void NetworkModel::updateBufferActivity(Message &msg) {
+  int redirectionTarget = 0;
+  switch(msg.type()) {
+  case Message::Notice:
+    if(bufferType(msg.bufferId()) != BufferInfo::ChannelBuffer) {
+      msg.setFlags(msg.flags() | Message::Redirected);
+      if(msg.flags() & Message::ServerMsg) {
+	// server notice
+	redirectionTarget = _serverNoticesTarget;
+      } else {
+	redirectionTarget = _userNoticesTarget;
+      }
+    }
+    break;
+  case Message::Error:
+    msg.setFlags(msg.flags() | Message::Redirected);
+    redirectionTarget = _errorMsgsTarget;
+    break;
+  default:
+    break;
+  }
+
+  if(msg.flags() & Message::Redirected) {
+    if(redirectionTarget & BufferSettings::DefaultBuffer)
+      updateBufferActivity(bufferItem(msg.bufferInfo()), msg);
+
+    if(redirectionTarget & BufferSettings::StatusBuffer) {
+      const NetworkItem *netItem = findNetworkItem(msg.bufferInfo().networkId());
+      if(netItem) {
+	updateBufferActivity(netItem->statusBufferItem(), msg);
+      }
+    }
+  } else {
+    updateBufferActivity(bufferItem(msg.bufferInfo()), msg);
+  }
+}
+
+void NetworkModel::updateBufferActivity(BufferItem *bufferItem, const Message &msg) {
+  if(!bufferItem)
+    return;
+
+  bufferItem->updateActivityLevel(msg);
+  if(bufferItem->isCurrentBuffer())
+    emit setLastSeenMsg(bufferItem->bufferId(), msg.msgId());
+}
+
+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);
+}
 
-  const Network *net = Client::network(msg.bufferInfo().networkId());
-  if(net && msg.text().contains(net->myNick()))
-    level |= BufferItem::Highlight;
-  
-  bufferItem(msg.bufferInfo())->updateActivity(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 {
@@ -720,3 +1069,117 @@ const Network *NetworkModel::networkByIndex(const QModelIndex &index) const {
   NetworkId networkId = netVariant.value<NetworkId>();
   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();
+}
+
+void NetworkModel::sortBufferIds(QList<BufferId> &bufferIds) const {
+  QList<BufferItem *> bufferItems;
+  foreach(BufferId bufferId, bufferIds) {
+    if(_bufferItemCache.contains(bufferId))
+      bufferItems << _bufferItemCache[bufferId];
+  }
+
+  qSort(bufferItems.begin(), bufferItems.end(), bufferItemLessThan);
+
+  bufferIds.clear();
+  foreach(BufferItem *bufferItem, bufferItems) {
+    bufferIds << bufferItem->bufferId();
+  }
+}
+
+QList<BufferId> NetworkModel::allBufferIdsSorted() const {
+  QList<BufferId> bufferIds = allBufferIds();
+  sortBufferIds(bufferIds);
+  return bufferIds;
+}
+
+bool NetworkModel::bufferItemLessThan(const BufferItem *left, const BufferItem *right) {
+  int leftType = left->bufferType();
+  int rightType = right->bufferType();
+
+  if(leftType != rightType)
+    return leftType < rightType;
+  else
+    return QString::compare(left->bufferName(), right->bufferName(), Qt::CaseInsensitive) < 0;
+}
+
+void NetworkModel::messageRedirectionSettingsChanged() {
+  BufferSettings bufferSettings;
+
+  _userNoticesTarget = bufferSettings.userNoticesTarget();
+  _serverNoticesTarget = bufferSettings.serverNoticesTarget();
+  _errorMsgsTarget = bufferSettings.errorMsgsTarget();
+}