X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=1fd5767ff906ac0833d1e189488e8de2a13b4e11;hb=c7a5ea8c0e5807fd0079bcb10cb88e4356526bad;hp=821364846619815094a2ca2b897bed0b1cf1b2b5;hpb=bf9530ddf0b227b6737e9cc672d40a703516c7ea;p=quassel.git

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 82136484..1fd5767f 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -32,6 +32,8 @@ class BufferInfo;
 
 #include "selectionmodelsynchronizer.h"
 #include "modelpropertymapper.h"
+#include "clientsettings.h"
+
 class MappedSelectionModel;
 class QAbstractItemView;
 class Network;
@@ -53,6 +55,7 @@ public:
   const BufferInfo &bufferInfo() const;
   virtual quint64 id() const;
   virtual QVariant data(int column, int role) const;
+  virtual bool setData(int column, const QVariant &value, int role);
 
   void attachIrcChannel(IrcChannel *ircChannel);
 
@@ -60,28 +63,18 @@ public:
   QString topic() const;
   int nickCount() const;
 
-  enum Type {
-    StatusType,
-    ChannelType,
-    QueryType
-  };
-  
   bool isStatusBuffer() const;
-  Type bufferType() const;
+  BufferInfo::Type bufferType() const;
 
   bool isActive() const;
-  
-  enum Activity {
-    NoActivity = 0x00,
-    OtherActivity = 0x01,
-    NewMessage = 0x02,
-    Highlight = 0x40
-  };
-  Q_DECLARE_FLAGS(ActivityLevel, Activity)
 
-  ActivityLevel activity() const;
-  void setActivity(const ActivityLevel &level);
-  void addActivity(const ActivityLevel &level);
+  inline Buffer::ActivityLevel activityLevel() const { return _activity; }
+  bool setActivityLevel(Buffer::ActivityLevel level);
+  void updateActivityLevel(Buffer::ActivityLevel level);
+
+  void setLastMsgInsert(QDateTime msgDate);
+  bool setLastSeen();
+  QDateTime lastSeen();
 
 public slots:
   void setTopic(const QString &topic);
@@ -91,18 +84,18 @@ public slots:
   void addUserToCategory(IrcUser *ircUser);
   void removeUserFromCategory(IrcUser *ircUser);
   void userModeChanged(IrcUser *ircUser);
-					 
+
 private slots:
   void ircChannelDestroyed();
-  
+  void ircUserDestroyed();
+
 private:
   BufferInfo _bufferInfo;
-  ActivityLevel _activity;
-  Type _type;
+  Buffer::ActivityLevel _activity;
 
   QPointer<IrcChannel> _ircChannel;
 };
-Q_DECLARE_OPERATORS_FOR_FLAGS(BufferItem::ActivityLevel)
+
 
 /*****************************************
  *  Network Items
@@ -117,6 +110,7 @@ public:
   NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
 
   virtual quint64 id() const;
+  inline const NetworkId &networkId() const { return _networkId; }
   virtual QVariant data(int column, int row) const;
 
   bool isActive() const;
@@ -153,6 +147,7 @@ public:
   virtual QVariant data(int column, int role) const;
   
   void addUser(IrcUser *ircUser);
+  bool removeUser(IrcUser *ircUser);
 
   static int categoryFromModes(const QString &modes);
 
@@ -179,6 +174,8 @@ public:
   IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent);
 
   QString nickName() const;
+  bool isActive() const;
+
   IrcUser *ircUser();
   virtual quint64 id() const;
   virtual QVariant data(int column, int role) const;
@@ -188,7 +185,8 @@ private slots:
   void setNick(QString newNick);
 
 private:
-  IrcUser *_ircUser;
+  QPointer<IrcUser> _ircUser;
+  quint64 _id;
 };
 
 
@@ -202,6 +200,7 @@ public:
   enum myRoles {
     BufferTypeRole = Qt::UserRole,
     ItemActiveRole,
+    BufferActivityRole,
     BufferIdRole,
     NetworkIdRole,
     BufferInfoRole,
@@ -214,7 +213,7 @@ public:
     UserCategoryItemType,
     IrcUserItemType
   };
-    
+
   NetworkModel(QObject *parent = 0);
   static QList<QVariant> defaultHeader();
 
@@ -231,10 +230,16 @@ public:
   //Buffer *getBufferByIndex(const QModelIndex &) const;
   QModelIndex bufferIndex(BufferId bufferId);
 
+  const Network *networkByIndex(const QModelIndex &index) const;
+
+  Buffer::ActivityLevel bufferActivity(const BufferInfo &buffer) const;
+
 public slots:
   void bufferUpdated(BufferInfo bufferInfo);
-  void bufferActivity(BufferItem::ActivityLevel, BufferInfo bufferInfo);
-
+  void removeBuffer(BufferId bufferId);
+  void setBufferActivity(const BufferInfo &buffer, Buffer::ActivityLevel activity);
+  void networkRemoved(const NetworkId &networkId);
+  
 private:
   QModelIndex networkIndex(NetworkId networkId);
   NetworkItem *networkItem(NetworkId networkId);