X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=5fae6bd40a4b75c06347bbcb1eadf0d0c78b3006;hp=3f806b5c6afd15f801778af20e831576a56a3ad1;hb=ea372dac8dda146255c7232922904e9f90a0d7f9;hpb=9d22ec1fd8e8652744e6ea6c91de4a6ec5b2146c

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 3f806b5c..5fae6bd4 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -22,7 +22,6 @@
 
 #include <QAbstractItemView>
 
-#include "bufferinfo.h"
 #include "buffermodel.h"
 #include "client.h"
 #include "signalproxy.h"
@@ -158,11 +157,11 @@ QString NetworkItem::toolTip(int column) const {
   Q_UNUSED(column);
 
   QStringList toolTip(QString("<b>%1</b>").arg(networkName()));
-  toolTip.append(QString("Server: %1").arg(currentServer()));
-  toolTip.append(QString("Users: %1").arg(nickCount()));
+  toolTip.append(tr("Server: %1").arg(currentServer()));
+  toolTip.append(tr("Users: %1").arg(nickCount()));
 
   if(_network) {
-    toolTip.append(QString("Lag: %1 msecs").arg(_network->latency()));
+    toolTip.append(tr("Lag: %1 msecs").arg(_network->latency()));
   }
 
   return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
@@ -174,19 +173,18 @@ QString NetworkItem::toolTip(int column) const {
 BufferItem::BufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent)
   : PropertyMapItem(QStringList() << "bufferName" << "topic" << "nickCount", parent),
     _bufferInfo(bufferInfo),
-    _activity(Buffer::NoActivity)
+    _activity(BufferInfo::NoActivity)
 {
   setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled);
 }
 
-void BufferItem::setActivityLevel(Buffer::ActivityLevel level) {
+void BufferItem::setActivityLevel(BufferInfo::ActivityLevel level) {
   if(_activity != level) {
     _activity = level;
     emit dataChanged();
   }
 }
 
-//void BufferItem::updateActivityLevel(Buffer::ActivityLevel level) {
 void BufferItem::updateActivityLevel(const Message &msg) {
   if(isCurrentBuffer())
     return;
@@ -197,14 +195,14 @@ void BufferItem::updateActivityLevel(const Message &msg) {
   if(lastSeenMsgId() >= msg.msgId())
     return;
 
-  Buffer::ActivityLevel oldLevel = activityLevel();
+  BufferInfo::ActivityLevel oldLevel = activityLevel();
 
-  _activity |= Buffer::OtherActivity;
+  _activity |= BufferInfo::OtherActivity;
   if(msg.type() & (Message::Plain | Message::Notice | Message::Action))
-    _activity |= Buffer::NewMessage;
+    _activity |= BufferInfo::NewMessage;
 
   if(msg.flags() & Message::Highlight)
-    _activity |= Buffer::Highlight;
+    _activity |= BufferInfo::Highlight;
 
   if(oldLevel != _activity)
     emit dataChanged();
@@ -235,7 +233,7 @@ bool BufferItem::setData(int column, const QVariant &value, int role) {
   qDebug() << "BufferItem::setData(int column, const QVariant &value, int role):" << this << column << value << role;
   switch(role) {
   case NetworkModel::BufferActivityRole:
-    setActivityLevel((Buffer::ActivityLevel)value.toInt());
+    setActivityLevel((BufferInfo::ActivityLevel)value.toInt());
     return true;
   default:
     return PropertyMapItem::setData(column, value, role);
@@ -248,6 +246,11 @@ void BufferItem::setBufferName(const QString &name) {
   emit dataChanged(0);
 }
 
+void BufferItem::setLastSeenMsgId(const MsgId &msgId) {
+  _lastSeenMsgId = msgId;
+  setActivityLevel(BufferInfo::NoActivity); 
+}
+
 bool BufferItem::isCurrentBuffer() const {
   return _bufferInfo.bufferId() == Client::bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>();
 }
@@ -918,15 +921,10 @@ void NetworkModel::setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId
 }
 
 void NetworkModel::updateBufferActivity(const Message &msg) {
-  BufferItem *bufferItem = findBufferItem(msg.bufferInfo());
-  if(!bufferItem) {
-    qDebug() << "NetworkModel::updateBufferActivity(): buffer is unknown:" << msg.bufferInfo();
-    return;
-  }
-  bufferItem->updateActivityLevel(msg);
+  bufferItem(msg.bufferInfo())->updateActivityLevel(msg);
 }
 
-void NetworkModel::setBufferActivity(const BufferId &bufferId, Buffer::ActivityLevel level) {
+void NetworkModel::setBufferActivity(const BufferId &bufferId, BufferInfo::ActivityLevel level) {
   BufferItem *bufferItem = findBufferItem(bufferId);
   if(!bufferItem) {
     qDebug() << "NetworkModel::setBufferActivity(): buffer is unknown:" << bufferId;
@@ -970,6 +968,20 @@ QString NetworkModel::bufferName(BufferId bufferId) {
   return _bufferItemCache[bufferId]->bufferName();
 }
 
+BufferInfo::Type NetworkModel::bufferType(BufferId bufferId) {
+  if(!_bufferItemCache.contains(bufferId))
+    return BufferInfo::InvalidBuffer;
+
+  return _bufferItemCache[bufferId]->bufferType();
+}
+
+BufferInfo NetworkModel::bufferInfo(BufferId bufferId) {
+  if(!_bufferItemCache.contains(bufferId))
+    return BufferInfo();
+
+  return _bufferItemCache[bufferId]->bufferInfo();
+}
+
 NetworkId NetworkModel::networkId(BufferId bufferId) {
   if(!_bufferItemCache.contains(bufferId))
     return NetworkId();
@@ -991,10 +1003,3 @@ QString NetworkModel::networkName(BufferId bufferId) {
   else
     return QString();
 }
-
-BufferInfo::Type NetworkModel::bufferType(BufferId bufferId) {
-  if(!_bufferItemCache.contains(bufferId))
-    return BufferInfo::InvalidBuffer;
-
-  return _bufferItemCache[bufferId]->bufferType();
-}