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

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 4f4603dd..076e7047 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;
@@ -128,6 +143,13 @@ void BufferItem::attachIrcChannel(IrcChannel *ircChannel) {
 	  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);
+    }
+  }
   
   emit dataChanged();
 }
@@ -205,12 +227,22 @@ void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
   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() << "==== 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() << "====";
+  }
   Q_ASSERT(success);
 
   int totalusers = 0;
@@ -258,8 +290,16 @@ quint64 NetworkItem::id() const {
   return _networkId.toInt();
 }
 
+void NetworkItem::setActive(bool connected) {
+  Q_UNUSED(connected);
+  emit dataChanged();
+}
+
 bool NetworkItem::isActive() const {
-  return _network;
+  if(_network)
+    return _network->isConnected();
+  else
+    return false;
 }
 
 QString NetworkItem::networkName() const {
@@ -295,6 +335,9 @@ void NetworkItem::attachNetwork(Network *network) {
 	  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();
@@ -361,6 +404,10 @@ void UserCategoryItem::addUser(IrcUser *ircUser) {
   newChild(new IrcUserItem(ircUser, this));
 }
 
+bool UserCategoryItem::removeUser(IrcUser *ircUser) {
+  return removeChildById((quint64)ircUser);
+}
+
 int UserCategoryItem::categoryFromModes(const QString &modes) {
   for(int i = 0; i < categories.count(); i++) {
     if(modes.contains(categories[i].mode))
@@ -368,6 +415,24 @@ int UserCategoryItem::categoryFromModes(const QString &modes) {
   }
   return categories.count();
 }
+
+QVariant UserCategoryItem::data(int column, int role) const {
+  switch(role) {
+  case NetworkModel::ItemActiveRole:
+    return true;
+  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,10 +461,57 @@ quint64 IrcUserItem::id() const {
 }
 
 QVariant IrcUserItem::data(int column, int role) const {
-  if(role != Qt::ToolTipRole)
+  switch(role) {
+  case NetworkModel::ItemActiveRole:
+    return !_ircUser->isAway();
+  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);
+  }
+}
 
-  return "<p><b>" + nickName() + "</b><br />" + _ircUser->hostmask() + "</p>";
+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->realName().isEmpty()) toolTip.append(_ircUser->realName());
+  if(!_ircUser->ircOperator().isEmpty()) toolTip.append(_ircUser->ircOperator());
+  toolTip.append(_ircUser->hostmask());
+
+  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));
+  }
+
+  if(!_ircUser->server().isEmpty()) toolTip.append(QString("server: %1").arg(_ircUser->server()));
+
+  return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
 }
 
 void IrcUserItem::setNick(QString newNick) {
@@ -588,13 +700,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);
 }