X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=8dceb5a485b0cbb5b1681e99bb327dfc2efc1e20;hp=e15cdd8e8bc477ddb77fe4eaa3fce54a31ba2fdf;hb=52a7b4d0f289f075aa386445a47d876743bcb6d0;hpb=fd7c2c4a41b5bb9cffcfe7a8f86a28ab7f38ac27

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index e15cdd8e..8dceb5a4 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -32,51 +32,78 @@ class BufferInfo;
 
 #include "selectionmodelsynchronizer.h"
 #include "modelpropertymapper.h"
+#include "clientsettings.h"
+#include "ircuser.h"
+
 class MappedSelectionModel;
 class QAbstractItemView;
 class Network;
 class IrcChannel;
-class IrcUser;
 
 /*****************************************
  *  Fancy Buffer Items
  *****************************************/
 class BufferItem : public PropertyMapItem {
   Q_OBJECT
-  Q_PROPERTY(QString bufferName READ bufferName)
+  Q_PROPERTY(QString bufferName READ bufferName WRITE setBufferName)
   Q_PROPERTY(QString topic READ topic)
   Q_PROPERTY(int nickCount READ nickCount)
 
 public:
-  BufferItem(Buffer *, AbstractTreeItem *parent = 0);
+  BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent = 0);
 
+  inline const BufferInfo &bufferInfo() const { return _bufferInfo; }
   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);
 
   QString bufferName() const;
+  inline BufferId bufferId() const { return _bufferInfo.bufferId(); }
+  inline BufferInfo::Type bufferType() const { return _bufferInfo.type(); }
+
+  void setBufferName(const QString &name);
   QString topic() const;
   int nickCount() const;
 
-  
-  Buffer *buffer() const { return buf; }
-  void setActivity(const Buffer::ActivityLevel &);
+  // bool isStatusBuffer() const;
+
+  bool isActive() const;
+
+  inline Buffer::ActivityLevel activityLevel() const { return _activity; }
+  void setActivityLevel(Buffer::ActivityLevel level);
+  void updateActivityLevel(Buffer::ActivityLevel level);
+
+  void setLastMsgInsert(QDateTime msgDate);
+  bool setLastSeen();
+  QDateTime lastSeen();
+
+  virtual QString toolTip(int column) const;
 
 public slots:
   void setTopic(const QString &topic);
-  void join(IrcUser *ircUser);
+  void join(const QList<IrcUser *> &ircUsers);
   void part(IrcUser *ircUser);
-  
-private:
-  QColor foreground(int column) const;
 
-  Buffer *buf;
-  Buffer::ActivityLevel activity;
+  void addUserToCategory(IrcUser *ircUser);
+  void addUsersToCategory(const QList<IrcUser *> &ircUser);
+  void removeUserFromCategory(IrcUser *ircUser);
+  void userModeChanged(IrcUser *ircUser);
+
+private slots:
+  void ircChannelDestroyed();
+  void ircUserDestroyed();
+
+private:
+  BufferInfo _bufferInfo;
+  QString _bufferName;
+  Buffer::ActivityLevel _activity;
 
-  QPointer<IrcChannel> _ircChannel;
+  IrcChannel *_ircChannel;
 };
 
+
 /*****************************************
  *  Network Items
  *****************************************/
@@ -87,29 +114,58 @@ 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;
 
+  inline const NetworkId &networkId() const { return _networkId; }
   QString networkName() const;
   QString currentServer() const;
   int nickCount() const;
-  
+
+  virtual QString toolTip(int column) const;
+
 public slots:
   void setNetworkName(const QString &networkName);
   void setCurrentServer(const QString &serverName);
 
   void attachNetwork(Network *network);
   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 categoryName READ categoryName)
+    
+public:
+  UserCategoryItem(int category, AbstractTreeItem *parent);
+
+  QString categoryName() const;
+  virtual quint64 id() const;
+  virtual QVariant data(int column, int role) const;
+  
+  void addUsers(const QList<IrcUser *> &ircUser);
+  bool removeUser(IrcUser *ircUser);
+
+  static int categoryFromModes(const QString &modes);
+
+private:
+  int _category;
+
+  static const QList<QChar> categories;
+};
+
 /*****************************************
 *  Irc User Items
 *****************************************/
@@ -120,14 +176,21 @@ class IrcUserItem : public PropertyMapItem {
 public:
   IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent);
 
-  QString nickName();
+  QString nickName() const;
+  bool isActive() const;
+
+  inline IrcUser *ircUser() { return _ircUser; }
+  inline virtual quint64 id() const { return _id; }
+  virtual QVariant data(int column, int role) const;
+  virtual QString toolTip(int column) const;
 
 private slots:
   void setNick(QString newNick);
-  void ircUserDestroyed();
+  void setAway(bool);
 
 private:
-  IrcUser *_ircUser;
+  QPointer<IrcUser> _ircUser;
+  quint64 _id;
 };
 
 
@@ -139,26 +202,28 @@ class NetworkModel : public TreeModel {
 
 public:
   enum myRoles {
-    BufferTypeRole = Qt::UserRole,
-    BufferActiveRole,
-    BufferUidRole,
+    BufferTypeRole = TreeModel::UserRole,
+    ItemActiveRole,
+    BufferActivityRole,
+    BufferIdRole,
     NetworkIdRole,
+    BufferInfoRole,
     ItemTypeRole
   };
 
-  enum itemTypes {
-    AbstractItemType,
-    SimpleItemType,
-    NetworkItemType,
-    BufferItemType,
-    NickItemType
+  enum itemType {
+    NetworkItemType = 0x01,
+    BufferItemType = 0x02,
+    UserCategoryItemType = 0x04,
+    IrcUserItemType = 0x08
   };
-    
+  Q_DECLARE_FLAGS(itemTypes, itemType);
+
   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;
@@ -167,21 +232,27 @@ 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 networkIndex(NetworkId networkId);
+  QModelIndex bufferIndex(BufferId bufferId);
 
-public slots:
-  void bufferUpdated(Buffer *);
-  void bufferActivity(Buffer::ActivityLevel, Buffer *buffer);
+  const Network *networkByIndex(const QModelIndex &index) const;
 
-private:
-  QModelIndex networkIndex(uint networkId);
-  NetworkItem *network(uint networkId);
-  NetworkItem *newNetwork(uint networkId, const QString &networkName);
+  Buffer::ActivityLevel bufferActivity(const BufferInfo &buffer) const;
+
+public slots:
+  void bufferUpdated(BufferInfo bufferInfo);
+  void removeBuffer(BufferId bufferId);
+  void setBufferActivity(const BufferInfo &buffer, Buffer::ActivityLevel activity);
+  void networkRemoved(const NetworkId &networkId);
   
-  BufferItem *buffer(BufferInfo bufferInfo);
-  BufferItem *newBuffer(BufferInfo bufferInfo);
+private:
+  NetworkItem *networkItem(NetworkId networkId);
+  NetworkItem *existsNetworkItem(NetworkId networkId);
+  BufferItem *bufferItem(const BufferInfo &bufferInfo);
+  BufferItem *existsBufferItem(const BufferInfo &bufferInfo);
 
 };
+Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::itemTypes);
 
 #endif // NETWORKMODEL_H