X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=3e380d41a96047f0a53d39186b364b66175e8828;hb=25263b22ae90c5ac101decf62105884bc18eaeb1;hp=00604471bc999e17176e196f8b187aa4fe92965e;hpb=dd2b40bf10da0309a72a9b2e8f49af752646fd92;p=quassel.git

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 00604471..3e380d41 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -37,14 +37,17 @@
 BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent)
   : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent),
     _bufferInfo(bufferInfo),
-    _activity(NoActivity)
+    _activity(Buffer::NoActivity)
 {
   Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
   if(bufferType() == BufferInfo::QueryBuffer)
     flags |= Qt::ItemIsDropEnabled;
-  setFlags(flags);
 
-  _lastSeen = BufferSettings(bufferInfo.bufferId()).lastSeen();
+  if(bufferType() == BufferInfo::StatusBuffer) {
+    NetworkItem *networkItem = qobject_cast<NetworkItem *>(parent);
+    connect(networkItem, SIGNAL(dataChanged()), this, SIGNAL(dataChanged()));
+  }
+  setFlags(flags);
 }
 
 const BufferInfo &BufferItem::bufferInfo() const {
@@ -70,18 +73,14 @@ bool BufferItem::isActive() const {
     return qobject_cast<NetworkItem *>(parent())->isActive();
 }
 
-BufferItem::ActivityLevel BufferItem::activity() const {
-  return _activity;
-}
-
-bool BufferItem::setActivity(const ActivityLevel &level) {
+bool BufferItem::setActivityLevel(Buffer::ActivityLevel level) {
   _activity = level;
   emit dataChanged();
   return true;
 }
 
-void BufferItem::updateActivity(const ActivityLevel &level) {
-  ActivityLevel oldActivity = _activity;
+void BufferItem::updateActivityLevel(Buffer::ActivityLevel level) {
+  Buffer::ActivityLevel oldActivity = _activity;
   _activity |= level;
   if(oldActivity != _activity)
     emit dataChanged();
@@ -102,7 +101,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);
   }
@@ -111,9 +110,7 @@ QVariant BufferItem::data(int column, int role) const {
 bool BufferItem::setData(int column, const QVariant &value, int role) {
   switch(role) {
   case NetworkModel::BufferActivityRole:
-    return setActivity((ActivityLevel)value.toInt());
-  case NetworkModel::LastSeenRole:
-    return setLastSeen();
+    return setActivityLevel((Buffer::ActivityLevel)value.toInt());
   default:
     return PropertyMapItem::setData(column, value, role);
   }
@@ -229,7 +226,12 @@ void BufferItem::part(IrcUser *ircUser) {
 }
 
 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;
@@ -271,11 +273,14 @@ void BufferItem::userModeChanged(IrcUser *ircUser) {
   addUserToCategory(ircUser);
 }
 
+/*
 void BufferItem::setLastMsgInsert(QDateTime msgDate) {
   if(msgDate.isValid() && msgDate > _lastMsgInsert)
     _lastMsgInsert = msgDate;
 }
-
+*/
+/*
+// FIXME emit dataChanged()
 bool BufferItem::setLastSeen() {
   if(_lastSeen > _lastMsgInsert)
     return false;
@@ -288,7 +293,7 @@ bool BufferItem::setLastSeen() {
 QDateTime BufferItem::lastSeen() {
   return _lastSeen;
 }
-
+*/
 /*****************************************
 *  Network Items
 *****************************************/
@@ -316,11 +321,6 @@ quint64 NetworkItem::id() const {
   return qHash(_networkId);
 }
 
-void NetworkItem::setActive(bool connected) {
-  Q_UNUSED(connected);
-  emit dataChanged();
-}
-
 bool NetworkItem::isActive() const {
   if(_network)
     return _network->isConnected();
@@ -362,7 +362,7 @@ void NetworkItem::attachNetwork(Network *network) {
   connect(network, SIGNAL(ircChannelAdded(QString)),
 	  this, SLOT(attachIrcChannel(QString)));
   connect(network, SIGNAL(connectedSet(bool)),
-	  this, SLOT(setActive(bool)));
+	  this, SIGNAL(dataChanged()));
   
   // FIXME: connect this and that...
 
@@ -743,6 +743,7 @@ void NetworkModel::bufferUpdated(BufferInfo bufferInfo) {
   emit dataChanged(itemindex, itemindex);
 }
 
+/*
 void NetworkModel::updateBufferActivity(const Message &msg) {
   BufferItem *buff = bufferItem(msg.bufferInfo());
   Q_ASSERT(buff);
@@ -761,6 +762,14 @@ void NetworkModel::updateBufferActivity(const Message &msg) {
 
   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);