X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=1a9ace389554e50ace96bbd4b9e55c3373a11dbe;hp=4dcb65cc518c4fab70fc118e59b6f3a9ca4f3a9f;hb=9d22ec1fd8e8652744e6ea6c91de4a6ec5b2146c;hpb=fe9ec46e2b6394b7735a73da5c438b10ba7e5e82

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 4dcb65cc..1a9ace38 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -108,14 +108,14 @@ public:
 
   virtual inline bool isActive() const { return qobject_cast<NetworkItem *>(parent())->isActive(); }
 
+  inline const MsgId &lastSeenMsgId() const { return _lastSeenMsgId; }
+  inline void setLastSeenMsgId(const MsgId &msgId) { _lastSeenMsgId = msgId; }
   inline Buffer::ActivityLevel activityLevel() const { return _activity; }
   void setActivityLevel(Buffer::ActivityLevel level);
-  void updateActivityLevel(Buffer::ActivityLevel level);
-
-  void setLastMsgInsert(QDateTime msgDate);
-  bool setLastSeen();
-  QDateTime lastSeen();
+  //void updateActivityLevel(Buffer::ActivityLevel level);
+  void updateActivityLevel(const Message &msg);
 
+  bool isCurrentBuffer() const;
   virtual QString toolTip(int column) const;
 
 public slots:
@@ -124,6 +124,7 @@ public slots:
 private:
   BufferInfo _bufferInfo;
   Buffer::ActivityLevel _activity;
+  MsgId _lastSeenMsgId;
 };
 
 /*****************************************
@@ -148,7 +149,8 @@ class QueryBufferItem : public BufferItem {
 public:
   QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent);
 
-  virtual bool isActive() const;
+  virtual QVariant data(int column, int role) const;
+  virtual inline bool isActive() const { return (bool)_ircUser; }
   virtual QString toolTip(int column) const;
 
 public slots:
@@ -190,7 +192,6 @@ public slots:
 
 private slots:
   void ircChannelDestroyed();
-  void ircUserDestroyed();
 
 private:
   IrcChannel *_ircChannel;
@@ -233,13 +234,16 @@ class IrcUserItem : public PropertyMapItem {
 public:
   IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent);
 
-  QString nickName() const;
-  bool isActive() const;
+  inline QString nickName() const { return _ircUser ? _ircUser->nick() : QString(); }
+  inline bool isActive() const { return _ircUser ? !_ircUser->isAway() : false; }
 
   inline IrcUser *ircUser() { return _ircUser; }
   virtual QVariant data(int column, int role) const;
   virtual QString toolTip(int column) const;
 
+private slots:
+  inline void ircUserDestroyed() { parent()->removeChild(this); }
+
 private:
   QPointer<IrcUser> _ircUser;
 };
@@ -259,7 +263,8 @@ public:
     BufferIdRole,
     NetworkIdRole,
     BufferInfoRole,
-    ItemTypeRole
+    ItemTypeRole,
+    UserAwayRole
   };
 
   enum itemType {
@@ -291,20 +296,33 @@ public:
 
   Buffer::ActivityLevel bufferActivity(const BufferInfo &buffer) const;
 
+  QString bufferName(BufferId bufferId);
+  MsgId lastSeenMsgId(BufferId bufferId);
+  NetworkId networkId(BufferId bufferId);
+  QString networkName(BufferId bufferId);
+  BufferInfo::Type bufferType(BufferId bufferId);
+
 public slots:
   void bufferUpdated(BufferInfo bufferInfo);
   void removeBuffer(BufferId bufferId);
-  void setBufferActivity(const BufferInfo &buffer, Buffer::ActivityLevel activity);
+  void setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId);
+  void setBufferActivity(const BufferId &bufferId, Buffer::ActivityLevel activity);
+  void updateBufferActivity(const Message &msg);
   void networkRemoved(const NetworkId &networkId);
-  
+
+private slots:
+  void checkForRemovedBuffers(const QModelIndex &parent, int start, int end);
+  void checkForNewBuffers(const QModelIndex &parent, int start, int end);
+
 private:
   int networkRow(NetworkId networkId);
   NetworkItem *findNetworkItem(NetworkId networkId);
   NetworkItem *networkItem(NetworkId networkId);
-  BufferItem *findBufferItem(const BufferInfo &bufferInfo);
+  inline BufferItem *findBufferItem(const BufferInfo &bufferInfo) { return findBufferItem(bufferInfo.bufferId()); }
   BufferItem *findBufferItem(BufferId bufferId);
   BufferItem *bufferItem(const BufferInfo &bufferInfo);
 
+  QHash<BufferId, BufferItem *> _bufferItemCache;
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::itemTypes);