X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=daf824351d4972aabc9fa637c4d49d8c6933f6b0;hb=d54b44bc5b6e1ff4308f9d143babf29028ae47cd;hp=8be6b854e3b3c037acc0cabab5b04530090b9913;hpb=7e20c659f88e26ccdfdc65f4894ed6ecf61ca8a9;p=quassel.git

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 8be6b854..daf82435 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -105,14 +105,18 @@ public:
 
   virtual inline bool isActive() const { return qobject_cast<NetworkItem *>(parent())->isActive(); }
 
-  inline const MsgId &lastSeenMsgId() const { return _lastSeenMsgId; }
-  inline const MsgId &lastSeenMarkerMsgId() const { return _lastSeenMarkerMsgId; }
-  void setLastSeenMsgId(const MsgId &msgId);
+  inline MsgId lastSeenMsgId() const { return _lastSeenMsgId; }
+  inline MsgId markerLineMsgId() const { return _markerLineMsgId; }
+  void setLastSeenMsgId(MsgId msgId);
+  void setMarkerLineMsgId(MsgId msgId);
+
   inline BufferInfo::ActivityLevel activityLevel() const { return _activity; }
   void setActivityLevel(BufferInfo::ActivityLevel level);
   void clearActivityLevel();
   void updateActivityLevel(const Message &msg);
 
+  inline const MsgId &firstUnreadMsgId() const { return _firstUnreadMsgId; }
+
   bool isCurrentBuffer() const;
   virtual QString toolTip(int column) const;
 
@@ -123,7 +127,8 @@ private:
   BufferInfo _bufferInfo;
   BufferInfo::ActivityLevel _activity;
   MsgId _lastSeenMsgId;
-  MsgId _lastSeenMarkerMsgId;
+  MsgId _markerLineMsgId;
+  MsgId _firstUnreadMsgId;
 };
 
 /*****************************************
@@ -270,7 +275,9 @@ public:
     ItemTypeRole,
     UserAwayRole,
     IrcUserRole,
-    IrcChannelRole
+    IrcChannelRole,
+    BufferFirstUnreadMsgIdRole,
+    MarkerLineMsgIdRole,
   };
 
   enum ItemType {
@@ -313,7 +320,7 @@ public:
   BufferInfo::Type bufferType(BufferId bufferId) const;
   BufferInfo bufferInfo(BufferId bufferId) const;
   MsgId lastSeenMsgId(BufferId bufferId) const;
-  MsgId lastSeenMarkerMsgId(BufferId bufferId) const;
+  MsgId markerLineMsgId(BufferId bufferId) const;
   NetworkId networkId(BufferId bufferId) const;
   QString networkName(BufferId bufferId) const;
 
@@ -326,13 +333,16 @@ public slots:
   void removeBuffer(BufferId bufferId);
   MsgId lastSeenMsgId(const BufferId &bufferId);
   void setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId);
+  void setMarkerLineMsgId(const BufferId &bufferId, const MsgId &msgId);
   void setBufferActivity(const BufferId &bufferId, BufferInfo::ActivityLevel activity);
   void clearBufferActivity(const BufferId &bufferId);
   void updateBufferActivity(Message &msg);
   void networkRemoved(const NetworkId &networkId);
 
 signals:
-  void setLastSeenMsg(BufferId bufferId, MsgId msgId);
+  void requestSetLastSeenMsg(BufferId buffer, MsgId msg);
+  void lastSeenMsgSet(BufferId buffer, MsgId msg);
+  void markerLineSet(BufferId buffer, MsgId msg);
 
 private slots:
   void checkForRemovedBuffers(const QModelIndex &parent, int start, int end);