the network item now shows the activity of the status buffer

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 97deb99..4b6ce3c 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -39,7 +39,11 @@ NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent)
   : PropertyMapItem(QList<QString>() << "networkName" << "currentServer" << "nickCount", parent),
     _networkId(netid)
 {
   : PropertyMapItem(QList<QString>() << "networkName" << "currentServer" << "nickCount", parent),
     _networkId(netid)
 {

+  // 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);
   setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);

+  connect(this, SIGNAL(networkDataChanged(int)), this, SIGNAL(dataChanged(int)));

 }
 
 QVariant NetworkItem::data(int column, int role) const {
 }
 
 QVariant NetworkItem::data(int column, int role) const {


@@ -47,6 +51,7 @@ QVariant NetworkItem::data(int column, int role) const {
   case NetworkModel::BufferIdRole:
   case NetworkModel::BufferInfoRole:
   case NetworkModel::BufferTypeRole:
   case NetworkModel::BufferIdRole:
   case NetworkModel::BufferInfoRole:
   case NetworkModel::BufferTypeRole:

+  case NetworkModel::BufferActivityRole:

     if(childCount())
       return child(0)->data(column, role);
     else
     if(childCount())
       return child(0)->data(column, role);
     else


@@ -84,6 +89,9 @@ BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) {
   switch(bufferInfo.type()) {
   case BufferInfo::StatusBuffer:
     bufferItem = new StatusBufferItem(bufferInfo, this);
   switch(bufferInfo.type()) {
   case BufferInfo::StatusBuffer:
     bufferItem = new StatusBufferItem(bufferInfo, this);

+    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::ChannelBuffer:
     bufferItem = new ChannelBufferItem(bufferInfo, this);


@@ -114,11 +122,11 @@ void NetworkItem::attachNetwork(Network *network) {
   connect(network, SIGNAL(ircUserAdded(IrcUser *)),
          this, SLOT(attachIrcUser(IrcUser *)));
   connect(network, SIGNAL(connectedSet(bool)),
   connect(network, SIGNAL(ircUserAdded(IrcUser *)),
          this, SLOT(attachIrcUser(IrcUser *)));
   connect(network, SIGNAL(connectedSet(bool)),

-         this, SIGNAL(dataChanged()));
+         this, SIGNAL(networkDataChanged()));

   connect(network, SIGNAL(destroyed()),
   connect(network, SIGNAL(destroyed()),

-         this, SIGNAL(dataChanged()));
+         this, SIGNAL(networkDataChanged()));

 
 

-  emit dataChanged();
+  emit networkDataChanged();

 }
 
 void NetworkItem::attachIrcChannel(IrcChannel *ircChannel) {
 }
 
 void NetworkItem::attachIrcChannel(IrcChannel *ircChannel) {


@@ -151,12 +159,12 @@ void NetworkItem::attachIrcUser(IrcUser *ircUser) {
 
 void NetworkItem::setNetworkName(const QString &networkName) {
   Q_UNUSED(networkName);
 
 void NetworkItem::setNetworkName(const QString &networkName) {
   Q_UNUSED(networkName);

-  emit dataChanged(0);
+  emit networkDataChanged(0);

 }
 
 void NetworkItem::setCurrentServer(const QString &serverName) {
   Q_UNUSED(serverName);
 }
 
 void NetworkItem::setCurrentServer(const QString &serverName) {
   Q_UNUSED(serverName);

-  emit dataChanged(1);
+  emit networkDataChanged(1);

 }
 
 
 }
 
 


@@ -282,8 +290,6 @@ QString BufferItem::toolTip(int column) const {
 StatusBufferItem::StatusBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent)
   : BufferItem(bufferInfo, parent)
 {
 StatusBufferItem::StatusBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent)
   : BufferItem(bufferInfo, parent)
 {

-  Q_ASSERT(parent);
-  connect(parent, SIGNAL(dataChanged()), this, SIGNAL(dataChanged()));

 }
 
 QString StatusBufferItem::toolTip(int column) const {
 }
 
 QString StatusBufferItem::toolTip(int column) const {

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index c678bae..251ba77 100644 (file)
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -64,6 +64,9 @@ public slots:
   void attachIrcChannel(IrcChannel *channel);
   void attachIrcUser(IrcUser *ircUser);
 
   void attachIrcChannel(IrcChannel *channel);
   void attachIrcUser(IrcUser *ircUser);
 

+signals:
+  void networkDataChanged(int column = -1);
+

 private:
   NetworkId _networkId;
 
 private:
   NetworkId _networkId;