X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=7bd7219c8f08a1fa6e9421a456877ff3c6469d7c;hp=b1cc15f0511c1af29a4f5fe75b367629d8b27647;hb=5d9e6f82037c37c560827bfd9d71bc9467fa7ccc;hpb=d1b6499b0b848d4287efae89107576548533502c

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index b1cc15f0..7bd7219c 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,14 +153,13 @@ 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);
 
-private slots:
-  void checkNoChilds();
-
 private:
   int _category;
 
@@ -180,13 +182,14 @@ class IrcUserItem : public PropertyMapItem {
 public:
   IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent);
 
-  QString nickName();
+  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);
@@ -234,7 +238,7 @@ public:
 
 public slots:
   void bufferUpdated(BufferInfo bufferInfo);
-  void bufferActivity(BufferItem::ActivityLevel, BufferInfo bufferInfo);
+  void updateBufferActivity(const Message &msg);
 
 private:
   QModelIndex networkIndex(NetworkId networkId);