X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=e96e367885ea5a0fc1b25e7fc0c2f0a69b9aa213;hp=83d5709489147d80034de08cfba6bb018f65836d;hb=c0bbc724cda7acf652d9d2ce80605ebb53c4a2ff;hpb=5b560ec1a01349562ac58051ca7e7fa899d4b994

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 83d57094..e96e3678 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -37,14 +37,18 @@
 BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent)
   : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent),
     _bufferInfo(bufferInfo),
-    _activity(NoActivity)
+    _bufferName(bufferInfo.bufferName()),
+    _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 +74,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 +102,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 +111,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);
   }
@@ -161,7 +159,15 @@ QString BufferItem::bufferName() const {
   if(bufferType() == BufferInfo::StatusBuffer)
     return tr("Status Buffer");
   else
-    return bufferInfo().bufferName();
+    return _bufferName;
+}
+
+void BufferItem::setBufferName(const QString &name) {
+  _bufferName = name;
+  // as long as we need those bufferInfos, we have to update that one aswell.
+  // pretty ugly though :/
+  _bufferInfo = BufferInfo(_bufferInfo.bufferId(), _bufferInfo.networkId(), _bufferInfo.type(), _bufferInfo.groupId(), _bufferInfo.bufferName());
+  emit dataChanged(0);
 }
 
 QString BufferItem::topic() const {
@@ -229,7 +235,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 +282,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 +302,7 @@ bool BufferItem::setLastSeen() {
 QDateTime BufferItem::lastSeen() {
   return _lastSeen;
 }
-
+*/
 /*****************************************
 *  Network Items
 *****************************************/
@@ -316,11 +330,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 +371,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...
 
@@ -401,6 +410,9 @@ 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', tr("Owners"))
   << UserCategoryItem::Category('a', tr("Admins"))
@@ -472,6 +484,8 @@ IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent)
   
   connect(ircUser, SIGNAL(nickSet(QString)),
 	  this, SLOT(setNick(QString)));
+  connect(ircUser, SIGNAL(awaySet(bool)),
+          this, SLOT(setAway(bool)));
 }
 
 QString IrcUserItem::nickName() const {
@@ -555,6 +569,11 @@ void IrcUserItem::setNick(QString newNick) {
   emit dataChanged(0);
 }
 
+void IrcUserItem::setAway(bool away) {
+  Q_UNUSED(away);
+  emit dataChanged(0);
+}
+
 /*****************************************
  * NetworkModel
  *****************************************/
@@ -740,6 +759,18 @@ void NetworkModel::bufferUpdated(BufferInfo bufferInfo) {
   emit dataChanged(itemindex, itemindex);
 }
 
+void NetworkModel::removeBuffer(BufferId bufferId) {
+  const int numNetworks = rootItem->childCount();
+  if(numNetworks == 0)
+    return;
+
+  for(int i = 0; i < numNetworks; i++) {
+    if(rootItem->child(i)->removeChildById(qHash(bufferId)))
+      break;
+  }
+}
+
+/*
 void NetworkModel::updateBufferActivity(const Message &msg) {
   BufferItem *buff = bufferItem(msg.bufferInfo());
   Q_ASSERT(buff);
@@ -758,6 +789,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);