X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=b038f9d2e7f9b6269a198e23b05d2172e3afb8d7;hp=29468727976c0112fa871aecd4ecbc49c740d68d;hb=8c38d6c5248c1b364bf56e25be0069f32c4f0408;hpb=2f11200e02c352180b1e7546ae1c88b08566275c

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 29468727..b038f9d2 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -53,6 +53,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);
 
@@ -81,7 +82,7 @@ public:
 
   ActivityLevel activity() const;
   void setActivity(const ActivityLevel &level);
-  void addActivity(const ActivityLevel &level);
+  void updateActivity(const ActivityLevel &level);
 
 public slots:
   void setTopic(const QString &topic);
@@ -116,8 +117,8 @@ class NetworkItem : public PropertyMapItem {
 public:
   NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
 
-  virtual QVariant data(int column, int row) const;
   virtual quint64 id() const;
+  virtual QVariant data(int column, int row) const;
 
   bool isActive() const;
   
@@ -131,6 +132,8 @@ public slots:
 
   void attachNetwork(Network *network);
   void attachIrcChannel(const QString &channelName);
+
+  void setActive(bool connected);
   
 private:
   NetworkId _networkId;
@@ -150,8 +153,10 @@ public:
 
   QString categoryId();
   virtual quint64 id() const;
-
+  virtual QVariant data(int column, int role) const;
+  
   void addUser(IrcUser *ircUser);
+  bool removeUser(IrcUser *ircUser);
 
   static int categoryFromModes(const QString &modes);
 
@@ -180,13 +185,11 @@ public:
   QString nickName() const;
   IrcUser *ircUser();
   virtual quint64 id() const;
-
   virtual QVariant data(int column, int role) const;
-			    
-
+  virtual QString toolTip(int column) const;
+				   
 private slots:
   void setNick(QString newNick);
-  void ircUserDestroyed();
 
 private:
   IrcUser *_ircUser;
@@ -203,17 +206,18 @@ public:
   enum myRoles {
     BufferTypeRole = Qt::UserRole,
     ItemActiveRole,
+    BufferActivityRole,
     BufferIdRole,
     NetworkIdRole,
+    BufferInfoRole,
     ItemTypeRole
   };
 
   enum itemTypes {
-    AbstractItemType,
-    SimpleItemType,
     NetworkItemType,
     BufferItemType,
-    NickItemType
+    UserCategoryItemType,
+    IrcUserItemType
   };
     
   NetworkModel(QObject *parent = 0);
@@ -232,9 +236,11 @@ public:
   //Buffer *getBufferByIndex(const QModelIndex &) const;
   QModelIndex bufferIndex(BufferId bufferId);
 
+  const Network *networkByIndex(const QModelIndex &index) const;
+
 public slots:
   void bufferUpdated(BufferInfo bufferInfo);
-  void bufferActivity(BufferItem::ActivityLevel, BufferInfo bufferInfo);
+  void updateBufferActivity(const Message &msg);
 
 private:
   QModelIndex networkIndex(NetworkId networkId);