X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=4ccb5b5dd9fc7ea451b8e0d317044a220ab5ff07;hp=4f4603dd9c3c5df61f868a859afe632c7f3cef8b;hb=770b7ef54b03f3ebd1e29a58b4757505e1809b2d;hpb=9d4fbba1e7390f7cbc60aed962bf9d36ac111263

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 4f4603dd..4ccb5b5d 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -83,10 +83,12 @@ BufferItem::ActivityLevel BufferItem::activity() const {
 
 void BufferItem::setActivity(const ActivityLevel &level) {
   _activity = level;
+  emit dataChanged();
 }
 
-void BufferItem::addActivity(const ActivityLevel &level) {
+void BufferItem::updateActivity(const ActivityLevel &level) {
   _activity |= level;
+  emit dataChanged();
 }
 
 QVariant BufferItem::data(int column, int role) const {
@@ -103,11 +105,24 @@ QVariant BufferItem::data(int column, int role) const {
     return int(bufferType());
   case NetworkModel::ItemActiveRole:
     return isActive();
+  case NetworkModel::BufferActivityRole:
+    return qVariantFromValue((int)activity());
   default:
     return PropertyMapItem::data(column, role);
   }
 }
 
+bool BufferItem::setData(int column, const QVariant &value, int role) {
+  switch(role) {
+  case NetworkModel::BufferActivityRole:
+    setActivity((ActivityLevel)value.toInt());
+  default:
+    return PropertyMapItem::setData(column, value, role);
+  }
+  return true;
+}
+
+
 void BufferItem::attachIrcChannel(IrcChannel *ircChannel) {
   if(!ircChannel)
     return;
@@ -368,6 +383,22 @@ int UserCategoryItem::categoryFromModes(const QString &modes) {
   }
   return categories.count();
 }
+
+QVariant UserCategoryItem::data(int column, int role) const {
+  switch(role) {
+  case NetworkModel::ItemTypeRole:
+    return NetworkModel::UserCategoryItemType;
+  case NetworkModel::BufferIdRole:
+    return parent()->data(column, role);
+  case NetworkModel::NetworkIdRole:
+    return parent()->data(column, role);
+  case NetworkModel::BufferInfoRole:
+    return parent()->data(column, role);
+  default:
+    return PropertyMapItem::data(column, role);
+  }
+}
+
      
 /*****************************************
 *  Irc User Items
@@ -396,9 +427,22 @@ quint64 IrcUserItem::id() const {
 }
 
 QVariant IrcUserItem::data(int column, int role) const {
-  if(role != Qt::ToolTipRole)
+  switch(role) {
+  case NetworkModel::ItemTypeRole:
+    return NetworkModel::IrcUserItemType;
+  case NetworkModel::BufferIdRole:
+    return parent()->data(column, role);
+  case NetworkModel::NetworkIdRole:
+    return parent()->data(column, role);
+  case NetworkModel::BufferInfoRole:
+    return parent()->data(column, role);
+  default:
     return PropertyMapItem::data(column, role);
+  }
+}
 
+QString IrcUserItem::toolTip(int column) const {
+  Q_UNUSED(column);
   return "<p><b>" + nickName() + "</b><br />" + _ircUser->hostmask() + "</p>";
 }
 
@@ -588,13 +632,14 @@ void NetworkModel::bufferUpdated(BufferInfo bufferInfo) {
   emit dataChanged(itemindex, itemindex);
 }
 
-void NetworkModel::bufferActivity(BufferItem::ActivityLevel level, BufferInfo bufferInfo) {
-//   BufferItem *bufferItem = buffer(buf->bufferInfo());
-//   if(!bufferItem) {
-//     qWarning() << "NetworkModel::bufferActivity(): received Activity Info for uknown Buffer";
-//     return;
-//   }
-//   bufferItem->setActivity(level);
-//   bufferUpdated(buf);
+void NetworkModel::updateBufferActivity(const Message &msg) {
+  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);
 }