Fixed inconsitency bug in the NetworkModel. (thanks int for the trace).

[quassel.git] / src / client / networkmodel.h

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index e15cdd8..d891dd0 100644 (file)
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -48,8 +48,9 @@ class BufferItem : public PropertyMapItem {
   Q_PROPERTY(int nickCount READ nickCount)
 
 public:
-  BufferItem(Buffer *, AbstractTreeItem *parent = 0);
+  BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent = 0);
 
+  const BufferInfo &bufferInfo() const;
   virtual quint64 id() const;
   virtual QVariant data(int column, int role) const;
 
@@ -59,23 +60,49 @@ public:
   QString topic() const;
   int nickCount() const;
 
+  enum Type {
+    StatusType,
+    ChannelType,
+    QueryType
+  };
+  
+  bool isStatusBuffer() const;
+  Type bufferType() const;
+
+  bool isActive() const;
   
-  Buffer *buffer() const { return buf; }
-  void setActivity(const Buffer::ActivityLevel &);
+  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);
 
 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();
   
 private:
-  QColor foreground(int column) const;
-
-  Buffer *buf;
-  Buffer::ActivityLevel activity;
+  BufferInfo _bufferInfo;
+  ActivityLevel _activity;
+  Type _type;
 
   QPointer<IrcChannel> _ircChannel;
 };
+Q_DECLARE_OPERATORS_FOR_FLAGS(BufferItem::ActivityLevel)
 
 /*****************************************
  *  Network Items
@@ -87,11 +114,13 @@ 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;
 
+  bool isActive() const;
+  
   QString networkName() const;
   QString currentServer() const;
   int nickCount() const;
@@ -104,12 +133,40 @@ public slots:
   void attachIrcChannel(const QString &channelName);
   
 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;
+
+  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
 *****************************************/
@@ -120,11 +177,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;
 
 private slots:
   void setNick(QString newNick);
-  void ircUserDestroyed();
 
 private:
   IrcUser *_ircUser;
@@ -140,8 +200,8 @@ class NetworkModel : public TreeModel {
 public:
   enum myRoles {
     BufferTypeRole = Qt::UserRole,
-    BufferActiveRole,
-    BufferUidRole,
+    ItemActiveRole,
+    BufferIdRole,
     NetworkIdRole,
     ItemTypeRole
   };
@@ -158,7 +218,7 @@ public:
   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;
@@ -167,20 +227,19 @@ public:
   void attachNetwork(Network *network);
 
   bool isBufferIndex(const QModelIndex &) const;
-  Buffer *getBufferByIndex(const QModelIndex &) const;
-  QModelIndex bufferIndex(BufferInfo bufferInfo);
+  //Buffer *getBufferByIndex(const QModelIndex &) const;
+  QModelIndex bufferIndex(BufferId bufferId);
 
 public slots:
-  void bufferUpdated(Buffer *);
-  void bufferActivity(Buffer::ActivityLevel, Buffer *buffer);
+  void bufferUpdated(BufferInfo bufferInfo);
+  void bufferActivity(BufferItem::ActivityLevel, BufferInfo bufferInfo);
 
 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);
 
 };