X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=bc4a17bc9bcf90c7f826ff0865ee3e8d3168a2b3;hp=09e1bd29c63b15bd8976ef613d765d514e303bcf;hb=c48313654848b755982179d1252cc27a8c621b91;hpb=50706d89d4d60e258ebb6873d3778383621898e4

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 09e1bd29..bc4a17bc 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,13 +82,17 @@ 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);
   void join(IrcUser *ircUser);
   void part(IrcUser *ircUser);
 
+  void addUserToCategory(IrcUser *ircUser);
+  void removeUserFromCategory(IrcUser *ircUser);
+  void userModeChanged(IrcUser *ircUser);
+					 
 private slots:
   void ircChannelDestroyed();
   
@@ -110,10 +115,10 @@ class NetworkItem : public PropertyMapItem {
   Q_PROPERTY(int nickCount READ nickCount)
     
 public:
-  NetworkItem(const uint &netid, const QString &, AbstractTreeItem *parent = 0);
+  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;
   
@@ -127,14 +132,45 @@ public slots:
 
   void attachNetwork(Network *network);
   void attachIrcChannel(const QString &channelName);
+
+  void setActive(bool connected);
   
 private:
-  uint _networkId;
-  QString _networkName;
+  NetworkId _networkId;
 
   QPointer<Network> _network;
 };
 
+/*****************************************
+*  User Category Items (like @vh etc.)
+*****************************************/
+class UserCategoryItem : public PropertyMapItem {
+  Q_OBJECT
+  Q_PROPERTY(QString categoryId READ categoryId)
+    
+public:
+  UserCategoryItem(int category, AbstractTreeItem *parent);
+
+  QString categoryId();
+  virtual quint64 id() const;
+  virtual QVariant data(int column, int role) const;
+  
+  void addUser(IrcUser *ircUser);
+
+  static int categoryFromModes(const QString &modes);
+
+private:
+  int _category;
+
+  struct Category {
+    QChar mode;
+    QString displayString;
+    inline Category(QChar mode_, QString displayString_) : mode(mode_), displayString(displayString_) {};
+  };
+
+  static const QList<Category> categories;
+};
+
 /*****************************************
 *  Irc User Items
 *****************************************/
@@ -145,11 +181,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;
@@ -166,24 +205,25 @@ 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);
   static QList<QVariant> defaultHeader();
 
   static bool mimeContainsBufferList(const QMimeData *mimeData);
-  static QList< QPair<uint, uint> > mimeDataToBufferList(const QMimeData *mimeData);
+  static QList< QPair<NetworkId, BufferId> > mimeDataToBufferList(const QMimeData *mimeData);
 
   virtual QStringList mimeTypes() const;
   virtual QMimeData *mimeData(const QModelIndexList &) const;
@@ -192,20 +232,19 @@ public:
   void attachNetwork(Network *network);
 
   bool isBufferIndex(const QModelIndex &) const;
-  Buffer *getBufferByIndex(const QModelIndex &) const;
+  //Buffer *getBufferByIndex(const QModelIndex &) const;
   QModelIndex bufferIndex(BufferId bufferId);
 
 public slots:
   void bufferUpdated(BufferInfo bufferInfo);
-  void bufferActivity(BufferItem::ActivityLevel, BufferInfo bufferInfo);
+  void updateBufferActivity(const Message &msg);
 
 private:
-  QModelIndex networkIndex(uint networkId);
-  NetworkItem *network(uint networkId);
-  NetworkItem *newNetwork(uint networkId, const QString &networkName);
-  
-  BufferItem *buffer(BufferInfo bufferInfo);
-  BufferItem *newBuffer(BufferInfo bufferInfo);
+  QModelIndex networkIndex(NetworkId networkId);
+  NetworkItem *networkItem(NetworkId networkId);
+  NetworkItem *existsNetworkItem(NetworkId networkId);
+  BufferItem *bufferItem(const BufferInfo &bufferInfo);
+  BufferItem *existsBufferItem(const BufferInfo &bufferInfo);
 
 };