X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=09f9ece3a0f27f4fcd80b6b7d151845ffdeac557;hb=9b394f92cb61b759d18f9acc6a1125e2396b8cb7;hp=f763a21c74d0b814e9cf3b553f8827612e78cb77;hpb=453ccab6ade4a21c7aa3c331af893c91468250a4;p=quassel.git

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index f763a21c..09f9ece3 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -56,6 +56,7 @@ public:
   BufferItem *findBufferItem(BufferId bufferId);
   inline BufferItem *findBufferItem(const BufferInfo &bufferInfo) { return findBufferItem(bufferInfo.bufferId()); }
   BufferItem *bufferItem(const BufferInfo &bufferInfo);
+  inline StatusBufferItem *statusBufferItem() const { return _statusBufferItem; }
 
 public slots:
   void setNetworkName(const QString &networkName);
@@ -70,7 +71,7 @@ signals:
 
 private slots:
   void onBeginRemoveChilds(int start, int end);
-  
+
 private:
   NetworkId _networkId;
   StatusBufferItem *_statusBufferItem;
@@ -112,6 +113,8 @@ public:
   void clearActivityLevel();
   void updateActivityLevel(const Message &msg);
 
+  inline const MsgId &firstUnreadMsgId() const { return _firstUnreadMsgId; }
+
   bool isCurrentBuffer() const;
   virtual QString toolTip(int column) const;
 
@@ -123,6 +126,7 @@ private:
   BufferInfo::ActivityLevel _activity;
   MsgId _lastSeenMsgId;
   MsgId _lastSeenMarkerMsgId;
+  MsgId _firstUnreadMsgId;
 };
 
 /*****************************************
@@ -269,7 +273,8 @@ public:
     ItemTypeRole,
     UserAwayRole,
     IrcUserRole,
-    IrcChannelRole
+    IrcChannelRole,
+    BufferFirstUnreadMsgIdRole,
   };
 
   enum ItemType {
@@ -327,7 +332,7 @@ public slots:
   void setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId);
   void setBufferActivity(const BufferId &bufferId, BufferInfo::ActivityLevel activity);
   void clearBufferActivity(const BufferId &bufferId);
-  void updateBufferActivity(const Message &msg);
+  void updateBufferActivity(Message &msg);
   void networkRemoved(const NetworkId &networkId);
 
 signals:
@@ -336,6 +341,7 @@ signals:
 private slots:
   void checkForRemovedBuffers(const QModelIndex &parent, int start, int end);
   void checkForNewBuffers(const QModelIndex &parent, int start, int end);
+  void messageRedirectionSettingsChanged();
 
 private:
   int networkRow(NetworkId networkId) const;
@@ -345,9 +351,15 @@ private:
   BufferItem *findBufferItem(BufferId bufferId) const;
   BufferItem *bufferItem(const BufferInfo &bufferInfo);
 
+  void updateBufferActivity(BufferItem *bufferItem, const Message &msg);
+
   static bool bufferItemLessThan(const BufferItem *left, const BufferItem *right);
 
   QHash<BufferId, BufferItem *> _bufferItemCache;
+
+  int _userNoticesTarget;
+  int _serverNoticesTarget;
+  int _errorMsgsTarget;
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::ItemTypes)