X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=018d6e7f450fa0dba388de59d883531be20edc0a;hp=31e4dcaab07c55cd330d96e2d97c829651729755;hb=e3ad107e9783ac5ca4064fd7ce3cac7ff092e316;hpb=197cf9c0d5e227dd475124515f6e6005cf87ac8e

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 31e4dcaa..018d6e7f 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -24,7 +24,7 @@
 #include <QtCore>
 
 #include "treemodel.h"
-#include "buffer.h"
+#include "bufferinfo.h"
 
 #include <QPointer>
 
@@ -35,6 +35,7 @@ class BufferInfo;
 #include "clientsettings.h"
 #include "ircchannel.h"
 #include "ircuser.h"
+#include "message.h"
 #include "network.h"
 
 class MappedSelectionModel;
@@ -49,7 +50,7 @@ class NetworkItem : public PropertyMapItem {
   Q_PROPERTY(QString networkName READ networkName)
   Q_PROPERTY(QString currentServer READ currentServer)
   Q_PROPERTY(int nickCount READ nickCount)
-    
+
 public:
   NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
 
@@ -108,14 +109,15 @@ public:
 
   virtual inline bool isActive() const { return qobject_cast<NetworkItem *>(parent())->isActive(); }
 
-  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();
+  inline const MsgId &lastSeenMsgId() const { return _lastSeenMsgId; }
+  inline const MsgId &lastSeenMarkerMsgId() const { return _lastSeenMarkerMsgId; }
+  void setLastSeenMsgId(const MsgId &msgId);
+  inline BufferInfo::ActivityLevel activityLevel() const { return _activity; }
+  void setActivityLevel(BufferInfo::ActivityLevel level);
+  void clearActivityLevel();
+  void updateActivityLevel(const Message &msg);
 
+  bool isCurrentBuffer() const;
   virtual QString toolTip(int column) const;
 
 public slots:
@@ -123,7 +125,9 @@ public slots:
 
 private:
   BufferInfo _bufferInfo;
-  Buffer::ActivityLevel _activity;
+  BufferInfo::ActivityLevel _activity;
+  MsgId _lastSeenMsgId;
+  MsgId _lastSeenMarkerMsgId;
 };
 
 /*****************************************
@@ -148,7 +152,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:
@@ -170,12 +175,13 @@ class ChannelBufferItem : public BufferItem {
 public:
   ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent);
 
+  virtual QVariant data(int column, int role) const;
   virtual inline bool isActive() const { return (bool)_ircChannel; }
   virtual QString toolTip(int column) const;
 
   virtual inline QString topic() const { return (bool)_ircChannel ? _ircChannel->topic() : QString(); }
   virtual inline int nickCount() const { return (bool)_ircChannel ? _ircChannel->ircUsers().count() : 0; }
-  
+
   void attachIrcChannel(IrcChannel *ircChannel);
 
 public slots:
@@ -202,7 +208,7 @@ class IrcUserItem;
 class UserCategoryItem : public PropertyMapItem {
   Q_OBJECT
   Q_PROPERTY(QString categoryName READ categoryName)
-    
+
 public:
   UserCategoryItem(int category, AbstractTreeItem *parent);
 
@@ -228,7 +234,7 @@ private:
 class IrcUserItem : public PropertyMapItem {
   Q_OBJECT
   Q_PROPERTY(QString nickName READ nickName)
-    
+
 public:
   IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent);
 
@@ -254,23 +260,26 @@ class NetworkModel : public TreeModel {
   Q_OBJECT
 
 public:
-  enum myRoles {
+  enum Role {
     BufferTypeRole = TreeModel::UserRole,
     ItemActiveRole,
     BufferActivityRole,
     BufferIdRole,
     NetworkIdRole,
     BufferInfoRole,
-    ItemTypeRole
+    ItemTypeRole,
+    UserAwayRole,
+    IrcUserRole,
+    IrcChannelRole
   };
 
-  enum itemType {
+  enum ItemType {
     NetworkItemType = 0x01,
     BufferItemType = 0x02,
     UserCategoryItemType = 0x04,
     IrcUserItemType = 0x08
   };
-  Q_DECLARE_FLAGS(itemTypes, itemType);
+  Q_DECLARE_FLAGS(ItemTypes, ItemType)
 
   NetworkModel(QObject *parent = 0);
   static QList<QVariant> defaultHeader();
@@ -291,23 +300,52 @@ public:
 
   const Network *networkByIndex(const QModelIndex &index) const;
 
-  Buffer::ActivityLevel bufferActivity(const BufferInfo &buffer) const;
+  BufferInfo::ActivityLevel bufferActivity(const BufferInfo &buffer) const;
+
+  //! Finds a buffer with a given name in a given network
+  /** This performs a linear search through all BufferItems, hence it is expensive.
+   *  @param networkId  The network which we search in
+   *  @param bufferName The bufferName we look for
+   *  @return The id of the buffer if found, an invalid one else
+   */
+  BufferId bufferId(NetworkId networkId, const QString &bufferName, Qt::CaseSensitivity cs = Qt::CaseInsensitive) const;
+
+  QString bufferName(BufferId bufferId) const;
+  BufferInfo::Type bufferType(BufferId bufferId) const;
+  BufferInfo bufferInfo(BufferId bufferId) const;
+  MsgId lastSeenMsgId(BufferId bufferId) const;
+  MsgId lastSeenMarkerMsgId(BufferId bufferId) const;
+  NetworkId networkId(BufferId bufferId) const;
+  QString networkName(BufferId bufferId) const;
+
+  inline QList<BufferId> allBufferIds() const { return _bufferItemCache.keys(); }
 
 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, BufferInfo::ActivityLevel activity);
+  void clearBufferActivity(const BufferId &bufferId);
+  void updateBufferActivity(const Message &msg);
   void networkRemoved(const NetworkId &networkId);
-  
+
+signals:
+  void setLastSeenMsg(BufferId bufferId, MsgId msgId);
+
+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);
+  int networkRow(NetworkId networkId) const;
+  NetworkItem *findNetworkItem(NetworkId networkId) const;
   NetworkItem *networkItem(NetworkId networkId);
-  BufferItem *findBufferItem(const BufferInfo &bufferInfo);
-  BufferItem *findBufferItem(BufferId bufferId);
+  inline BufferItem *findBufferItem(const BufferInfo &bufferInfo) const { return findBufferItem(bufferInfo.bufferId()); }
+  BufferItem *findBufferItem(BufferId bufferId) const;
   BufferItem *bufferItem(const BufferInfo &bufferInfo);
 
+  QHash<BufferId, BufferItem *> _bufferItemCache;
 };
-Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::itemTypes);
+Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::ItemTypes)
 
 #endif // NETWORKMODEL_H