Bring back activity levels. I think Buffer has to go soon, since this is all that...

diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp
index 0cb9fac..de3bfcf 100644 (file)
--- a/src/client/buffer.cpp
+++ b/src/client/buffer.cpp
@@ -65,7 +65,7 @@ void Buffer::prependMsg(const Message &msg) {
 bool Buffer::layoutMsg() {
   if(layoutQueue.isEmpty())
     return false;
 bool Buffer::layoutMsg() {
   if(layoutQueue.isEmpty())
     return false;

-  
+

   AbstractUiMsg *m = Client::layoutMsg(layoutQueue.takeFirst());
   layoutedMsgs.prepend(m);
   emit msgPrepended(m);
   AbstractUiMsg *m = Client::layoutMsg(layoutQueue.takeFirst());
   layoutedMsgs.prepend(m);
   emit msgPrepended(m);


@@ -114,7 +114,7 @@ void Buffer::updateActivityLevel(const Message &msg) {
   ActivityLevel level = activityLevel() | OtherActivity;
   if(msg.type() & (Message::Plain | Message::Notice | Message::Action))
     level |= NewMessage;
   ActivityLevel level = activityLevel() | OtherActivity;
   if(msg.type() & (Message::Plain | Message::Notice | Message::Action))
     level |= NewMessage;

-  
+

   if(msg.flags() & Message::Highlight)
     level |= Highlight;
 
   if(msg.flags() & Message::Highlight)
     level |= Highlight;
 

diff --git a/src/client/buffer.h b/src/client/buffer.h
index 44e6efd..8a20f52 100644 (file)
--- a/src/client/buffer.h
+++ b/src/client/buffer.h
@@ -67,6 +67,7 @@ public slots:
   void setVisible(bool visible);
   void setLastSeenMsg(const MsgId &msgId);
   void setActivityLevel(ActivityLevel level);
   void setVisible(bool visible);
   void setLastSeenMsg(const MsgId &msgId);
   void setActivityLevel(ActivityLevel level);

+  void updateActivityLevel(const Message &msg);

 
 private:
   BufferInfo _bufferInfo;
 
 private:
   BufferInfo _bufferInfo;


@@ -77,7 +78,6 @@ private:
   QLinkedList<Message> layoutQueue;
   QList<AbstractUiMsg *> layoutedMsgs;
 
   QLinkedList<Message> layoutQueue;
   QList<AbstractUiMsg *> layoutedMsgs;
 

-  void updateActivityLevel(const Message &msg);

 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(Buffer::ActivityLevel)
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(Buffer::ActivityLevel)

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 110c8ff..e39435e 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -77,7 +77,7 @@ Client::Client(QObject *parent)
 {
   _monitorBuffer = new Buffer(BufferInfo(), this);
   _signalProxy->synchronize(_ircListHelper);
 {
   _monitorBuffer = new Buffer(BufferInfo(), this);
   _signalProxy->synchronize(_ircListHelper);

-  
+

   connect(_backlogManager, SIGNAL(backlog(BufferId, const QVariantList &)),
          this, SLOT(receiveBacklog(BufferId, const QVariantList &)));
 }
   connect(_backlogManager, SIGNAL(backlog(BufferId, const QVariantList &)),
          this, SLOT(receiveBacklog(BufferId, const QVariantList &)));
 }


@@ -441,6 +441,7 @@ void Client::recvMessage(const Message &msg_) {
   Message msg = msg_;
   checkForHighlight(msg);
   _messageModel->insertMessage(msg);
   Message msg = msg_;
   checkForHighlight(msg);
   _messageModel->insertMessage(msg);

+  buffer(msg.bufferInfo())->updateActivityLevel(msg);

 }
 
 void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) {
 }
 
 void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) {


@@ -453,6 +454,7 @@ void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
     Message msg = v.value<Message>();
     checkForHighlight(msg);
     _messageModel->insertMessage(msg);
     Message msg = v.value<Message>();
     checkForHighlight(msg);
     _messageModel->insertMessage(msg);

+    buffer(msg.bufferInfo())->updateActivityLevel(msg);

   }
   //qDebug() << "processed" << msgs.count() << "backlog lines in" << start.msecsTo(QTime::currentTime());
 }
   }
   //qDebug() << "processed" << msgs.count() << "backlog lines in" << start.msecsTo(QTime::currentTime());
 }