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

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 014cab14..1a9ace38 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -53,7 +53,6 @@ class NetworkItem : public PropertyMapItem {
 public:
   NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
 
-  virtual quint64 id() const { return qHash(_networkId); }
   virtual QVariant data(int column, int row) const;
 
   inline bool isActive() const { return (bool)_network ? _network->isConnected() : false; }
@@ -65,6 +64,8 @@ public:
 
   virtual QString toolTip(int column) const;
 
+  BufferItem *findBufferItem(BufferId bufferId);
+  inline BufferItem *findBufferItem(const BufferInfo &bufferInfo) { return findBufferItem(bufferInfo.bufferId()); }
   BufferItem *bufferItem(const BufferInfo &bufferInfo);
 
 public slots:
@@ -73,6 +74,7 @@ public slots:
 
   void attachNetwork(Network *network);
   void attachIrcChannel(IrcChannel *channel);
+  void attachIrcUser(IrcUser *ircUser);
 
 private:
   NetworkId _networkId;
@@ -93,7 +95,6 @@ public:
   BufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent = 0);
 
   inline const BufferInfo &bufferInfo() const { return _bufferInfo; }
-  virtual inline quint64 id() const { return qHash(_bufferInfo.bufferId()); }
   virtual QVariant data(int column, int role) const;
   virtual bool setData(int column, const QVariant &value, int role);
 
@@ -107,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:
@@ -123,6 +124,7 @@ public slots:
 private:
   BufferInfo _bufferInfo;
   Buffer::ActivityLevel _activity;
+  MsgId _lastSeenMsgId;
 };
 
 /*****************************************
@@ -147,12 +149,23 @@ class QueryBufferItem : public BufferItem {
 public:
   QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent);
 
+  virtual QVariant data(int column, int role) const;
+  virtual inline bool isActive() const { return (bool)_ircUser; }
   virtual QString toolTip(int column) const;
+
+public slots:
+  void attachIrcUser(IrcUser *ircUser);
+  void ircUserDestroyed();
+
+private:
+  IrcUser *_ircUser;
 };
 
 /*****************************************
 *  ChannelBufferItem
 *****************************************/
+class UserCategoryItem;
+
 class ChannelBufferItem : public BufferItem {
   Q_OBJECT
 
@@ -171,6 +184,7 @@ public slots:
   void join(const QList<IrcUser *> &ircUsers);
   void part(IrcUser *ircUser);
 
+  UserCategoryItem *findCategoryItem(int categoryId);
   void addUserToCategory(IrcUser *ircUser);
   void addUsersToCategory(const QList<IrcUser *> &ircUser);
   void removeUserFromCategory(IrcUser *ircUser);
@@ -178,7 +192,6 @@ public slots:
 
 private slots:
   void ircChannelDestroyed();
-  void ircUserDestroyed();
 
 private:
   IrcChannel *_ircChannel;
@@ -187,6 +200,7 @@ private:
 /*****************************************
 *  User Category Items (like @vh etc.)
 *****************************************/
+class IrcUserItem;
 class UserCategoryItem : public PropertyMapItem {
   Q_OBJECT
   Q_PROPERTY(QString categoryName READ categoryName)
@@ -195,9 +209,10 @@ public:
   UserCategoryItem(int category, AbstractTreeItem *parent);
 
   QString categoryName() const;
-  virtual quint64 id() const;
+  inline int categoryId() const { return _category; }
   virtual QVariant data(int column, int role) const;
-  
+
+  IrcUserItem *findIrcUser(IrcUser *ircUser);
   void addUsers(const QList<IrcUser *> &ircUser);
   bool removeUser(IrcUser *ircUser);
 
@@ -219,21 +234,18 @@ 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; }
-  inline virtual quint64 id() const { return _id; }
   virtual QVariant data(int column, int role) const;
   virtual QString toolTip(int column) const;
 
 private slots:
-  void setNick(QString newNick);
-  void setAway(bool);
+  inline void ircUserDestroyed() { parent()->removeChild(this); }
 
 private:
   QPointer<IrcUser> _ircUser;
-  quint64 _id;
 };
 
 
@@ -251,7 +263,8 @@ public:
     BufferIdRole,
     NetworkIdRole,
     BufferInfoRole,
-    ItemTypeRole
+    ItemTypeRole,
+    UserAwayRole
   };
 
   enum itemType {
@@ -283,18 +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);
-  NetworkItem *existsNetworkItem(NetworkId networkId);
+  inline BufferItem *findBufferItem(const BufferInfo &bufferInfo) { return findBufferItem(bufferInfo.bufferId()); }
+  BufferItem *findBufferItem(BufferId bufferId);
   BufferItem *bufferItem(const BufferInfo &bufferInfo);
-  BufferItem *existsBufferItem(const BufferInfo &bufferInfo);
 
+  QHash<BufferId, BufferItem *> _bufferItemCache;
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::itemTypes);