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

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 7cfc5f61..00604471 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -39,39 +39,32 @@ BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent)
     _bufferInfo(bufferInfo),
     _activity(NoActivity)
 {
-  // determine BufferType
-  if(bufferInfo.buffer().isEmpty())
-    _type = StatusType;
-  else if(isChannelName(bufferInfo.buffer()))
-    _type = ChannelType;
-  else
-    _type = QueryType;
-
   Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
-  if(bufferType() == QueryType)
+  if(bufferType() == BufferInfo::QueryBuffer)
     flags |= Qt::ItemIsDropEnabled;
   setFlags(flags);
-}
 
+  _lastSeen = BufferSettings(bufferInfo.bufferId()).lastSeen();
+}
 
 const BufferInfo &BufferItem::bufferInfo() const {
   return _bufferInfo;
 }
 
 quint64 BufferItem::id() const {
-  return bufferInfo().uid().toInt();
+  return qHash(bufferInfo().bufferId());
 }
 
 bool BufferItem::isStatusBuffer() const {
-   return bufferType() == StatusType;
+  return bufferType() == BufferInfo::StatusBuffer;
 }
 
-BufferItem::Type BufferItem::bufferType() const {
-  return _type;
+BufferInfo::Type BufferItem::bufferType() const {
+  return bufferInfo().type();
 }
 
 bool BufferItem::isActive() const {
-  if(bufferType() == ChannelType)
+  if(bufferType() == BufferInfo::ChannelBuffer)
     return _ircChannel;
   else
     return qobject_cast<NetworkItem *>(parent())->isActive();
@@ -81,14 +74,17 @@ BufferItem::ActivityLevel BufferItem::activity() const {
   return _activity;
 }
 
-void BufferItem::setActivity(const ActivityLevel &level) {
+bool BufferItem::setActivity(const ActivityLevel &level) {
   _activity = level;
   emit dataChanged();
+  return true;
 }
 
 void BufferItem::updateActivity(const ActivityLevel &level) {
+  ActivityLevel oldActivity = _activity;
   _activity |= level;
-  emit dataChanged();
+  if(oldActivity != _activity)
+    emit dataChanged();
 }
 
 QVariant BufferItem::data(int column, int role) const {
@@ -96,7 +92,7 @@ QVariant BufferItem::data(int column, int role) const {
   case NetworkModel::ItemTypeRole:
     return NetworkModel::BufferItemType;
   case NetworkModel::BufferIdRole:
-    return qVariantFromValue(bufferInfo().uid());
+    return qVariantFromValue(bufferInfo().bufferId());
   case NetworkModel::NetworkIdRole:
     return qVariantFromValue(bufferInfo().networkId());
   case NetworkModel::BufferInfoRole:
@@ -115,7 +111,9 @@ 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());
+    return setActivity((ActivityLevel)value.toInt());
+  case NetworkModel::LastSeenRole:
+    return setLastSeen();
   default:
     return PropertyMapItem::setData(column, value, role);
   }
@@ -160,10 +158,10 @@ void BufferItem::ircChannelDestroyed() {
 }
 
 QString BufferItem::bufferName() const {
-  if(bufferType() == StatusType)
+  if(bufferType() == BufferInfo::StatusBuffer)
     return tr("Status Buffer");
   else
-    return bufferInfo().buffer();
+    return bufferInfo().bufferName();
 }
 
 QString BufferItem::topic() const {
@@ -173,6 +171,13 @@ QString BufferItem::topic() const {
     return QString();
 }
 
+void BufferItem::ircUserDestroyed() {
+  // PRIVATE
+  IrcUser *ircUser = static_cast<IrcUser *>(sender());
+  removeUserFromCategory(ircUser);
+  emit dataChanged(2);
+}
+
 int BufferItem::nickCount() const {
   if(_ircChannel)
     return _ircChannel->ircUsers().count();
@@ -190,6 +195,8 @@ void BufferItem::join(IrcUser *ircUser) {
     return;
 
   addUserToCategory(ircUser);
+  connect(ircUser, SIGNAL(destroyed()),
+	  this, SLOT(ircUserDestroyed()));
   emit dataChanged(2);
 }
 
@@ -216,6 +223,7 @@ void BufferItem::part(IrcUser *ircUser) {
     return;
   }
 
+  disconnect(ircUser, 0, this, 0);
   removeUserFromCategory(ircUser);
   emit dataChanged(2);
 }
@@ -227,16 +235,15 @@ 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() << "didn't find User:" << ircUser << qHash(ircUser);
     qDebug() << "==== Childlist for Item:" << this << id() << bufferName() << "====";
     for(int i = 0; i < childCount(); i++) {
       categoryItem = qobject_cast<UserCategoryItem *>(child(i));
@@ -257,13 +264,31 @@ void BufferItem::userModeChanged(IrcUser *ircUser) {
 
   UserCategoryItem *categoryItem;
   int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
-  if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))) && categoryItem->childById((quint64)(ircUser)))
+  if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))) && categoryItem->childById(qHash(ircUser)))
     return; // already in the right category;
   
   removeUserFromCategory(ircUser);
   addUserToCategory(ircUser);
 }
 
+void BufferItem::setLastMsgInsert(QDateTime msgDate) {
+  if(msgDate.isValid() && msgDate > _lastMsgInsert)
+    _lastMsgInsert = msgDate;
+}
+
+bool BufferItem::setLastSeen() {
+  if(_lastSeen > _lastMsgInsert)
+    return false;
+  
+  _lastSeen = _lastMsgInsert;
+  BufferSettings(bufferInfo().bufferId()).setLastSeen(_lastSeen);
+  return true;
+}
+
+QDateTime BufferItem::lastSeen() {
+  return _lastSeen;
+}
+
 /*****************************************
 *  Network Items
 *****************************************/
@@ -288,7 +313,7 @@ QVariant NetworkItem::data(int column, int role) const {
 }
 
 quint64 NetworkItem::id() const {
-  return _networkId.toInt();
+  return qHash(_networkId);
 }
 
 void NetworkItem::setActive(bool connected) {
@@ -354,7 +379,7 @@ void NetworkItem::attachIrcChannel(const QString &channelName) {
   BufferItem *bufferItem;
   for(int i = 0; i < childCount(); i++) {
     bufferItem = qobject_cast<BufferItem *>(child(i));
-    if(bufferItem->bufferName() == ircChannel->name()) {
+    if(bufferItem->bufferName().toLower() == ircChannel->name().toLower()) {
       bufferItem->attachIrcChannel(ircChannel);
       break;
     }
@@ -376,13 +401,15 @@ 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.
+// TODO make this translateable depending on the number of users in a category
+//      -> we can't set the real string here, because tr() needs to get the actual number as second param
+//      -> tr("%n User(s)", n) needs to be used somewhere where we do know the user number n
 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");
+  << UserCategoryItem::Category('q', tr("Owners"))
+  << UserCategoryItem::Category('a', tr("Admins"))
+  << UserCategoryItem::Category('o', tr("Operators"))
+  << UserCategoryItem::Category('h', tr("Half-Ops"))
+  << UserCategoryItem::Category('v', tr("Voiced"));
 
 UserCategoryItem::UserCategoryItem(int category, AbstractTreeItem *parent)
   : PropertyMapItem(QStringList() << "categoryId", parent),
@@ -394,7 +421,7 @@ QString UserCategoryItem::categoryId() {
   if(_category < categories.count())
     return categories[_category].displayString;
   else
-    return QString("Users");
+    return tr("Users");
 }
 
 quint64 UserCategoryItem::id() const {
@@ -405,6 +432,10 @@ void UserCategoryItem::addUser(IrcUser *ircUser) {
   newChild(new IrcUserItem(ircUser, this));
 }
 
+bool UserCategoryItem::removeUser(IrcUser *ircUser) {
+  return removeChildById(qHash(ircUser));
+}
+
 int UserCategoryItem::categoryFromModes(const QString &modes) {
   for(int i = 0; i < categories.count(); i++) {
     if(modes.contains(categories[i].mode))
@@ -436,7 +467,8 @@ QVariant UserCategoryItem::data(int column, int role) const {
 *****************************************/
 IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent)
   : PropertyMapItem(QStringList() << "nickName", parent),
-    _ircUser(ircUser)
+    _ircUser(ircUser),
+    _id(qHash(ircUser))
 {
   // we don't need to handle the ircUser's destroyed signal since it's automatically removed
   // by the IrcChannel::ircUserParted();
@@ -446,7 +478,17 @@ IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent)
 }
 
 QString IrcUserItem::nickName() const {
-  return _ircUser->nick();
+  if(_ircUser)
+    return _ircUser->nick();
+  else
+    return QString();
+}
+
+bool IrcUserItem::isActive() const {
+  if(_ircUser)
+    return !_ircUser->isAway();
+  else
+    return false;
 }
 
 IrcUser *IrcUserItem::ircUser() {
@@ -454,13 +496,13 @@ IrcUser *IrcUserItem::ircUser() {
 }
 
 quint64 IrcUserItem::id() const {
-  return (quint64)_ircUser;
+  return _id;
 }
 
 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:
@@ -476,14 +518,39 @@ QVariant IrcUserItem::data(int column, int role) const {
 
 QString IrcUserItem::toolTip(int column) const {
   Q_UNUSED(column);
-  QString toolTip = "<b>" + nickName() + "</b><br />" + _ircUser->hostmask();
-  if(_ircUser->isAway()) {
-    toolTip += "<br /> away";
-    if(!_ircUser->awayMessage().isEmpty()) { 
-      toolTip += " (" + _ircUser->awayMessage() + ")"; 
+  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(tr("idling since %1").arg(idleString));
   }
-  return "<p>" + toolTip + "</p>";
+
+  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) {
@@ -519,7 +586,7 @@ Buffer *NetworkModel::getBufferByIndex(const QModelIndex &index) const {
 
 // experimental stuff :)
 QModelIndex NetworkModel::networkIndex(NetworkId networkId) {
-  return indexById(networkId.toInt());
+  return indexById(qHash(networkId));
 }
 
 NetworkItem *NetworkModel::existsNetworkItem(NetworkId networkId) {
@@ -538,19 +605,23 @@ NetworkItem *NetworkModel::networkItem(NetworkId networkId) {
   return netItem;
 }
 
+void NetworkModel::networkRemoved(const NetworkId &networkId) {
+  rootItem->removeChildById(qHash(networkId));
+}
+
 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()));
+    if((bufferItem = netItem->childById(qHash(bufferId)))) {
+      return indexByItem(bufferItem);
     }
   }
   return QModelIndex();
 }
 
 BufferItem *NetworkModel::existsBufferItem(const BufferInfo &bufferInfo) {
-  QModelIndex bufferIdx = bufferIndex(bufferInfo.uid());
+  QModelIndex bufferIdx = bufferIndex(bufferInfo.bufferId());
   if(bufferIdx.isValid())
     return static_cast<BufferItem *>(bufferIdx.internalPointer());
   else
@@ -629,8 +700,8 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in
     return false;
 
   // target must be a query
-  BufferItem::Type targetType = (BufferItem::Type)parent.data(NetworkModel::BufferTypeRole).toInt();
-  if(targetType != BufferItem::QueryType)
+  BufferInfo::Type targetType = (BufferInfo::Type)parent.data(NetworkModel::BufferTypeRole).toInt();
+  if(targetType != BufferInfo::QueryBuffer)
     return false;
 
   QList< QPair<NetworkId, BufferId> > bufferList = mimeDataToBufferList(data);
@@ -646,12 +717,12 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in
   if(bufferId == parent.data(BufferIdRole).value<BufferId>())
     return false; 
   
-  Q_ASSERT(rootItem->childById(netId.toInt()));
-  Q_ASSERT(rootItem->childById(netId.toInt())->childById(bufferId.toInt()));
+  Q_ASSERT(rootItem->childById(qHash(netId)));
+  Q_ASSERT(rootItem->childById(qHash(netId))->childById(qHash(bufferId)));
 
   // 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)
+  BufferInfo::Type sourceType = (BufferInfo::Type)rootItem->childById(qHash(netId))->childById(qHash(bufferId))->data(0, BufferTypeRole).toInt();
+  if(sourceType != BufferInfo::QueryBuffer)
     return false;
     
   // TODO: warn user about buffermerge!
@@ -673,13 +744,30 @@ void NetworkModel::bufferUpdated(BufferInfo bufferInfo) {
 }
 
 void NetworkModel::updateBufferActivity(const Message &msg) {
+  BufferItem *buff = bufferItem(msg.bufferInfo());
+  Q_ASSERT(buff);
+
+  buff->setLastMsgInsert(msg.timestamp());
+
+  if(buff->lastSeen() >= msg.timestamp())
+    return;
+
   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);
+  if(msg.flags() & Message::Highlight) 
+      level |= BufferItem::Highlight;
+
+  bufferItem(msg.bufferInfo())->updateActivity(level);
+}
+
+const Network *NetworkModel::networkByIndex(const QModelIndex &index) const {
+  QVariant netVariant = index.data(NetworkIdRole);
+  if(!netVariant.isValid())
+    return 0;
+
+  NetworkId networkId = netVariant.value<NetworkId>();
+  return Client::network(networkId);
 }