X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=07b219024ff1fc79efff9763849fc2c1408889df;hp=961c1ca3698fa536597fd7d4279402b15c0e903f;hb=761a147545864782a79570dbaf8f4cc25de7423d;hpb=8010224cf5bfe5685dc2cf535e8dc1ec19c4c364

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 961c1ca3..07b21902 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -33,121 +33,186 @@ class BufferInfo;
 #include "selectionmodelsynchronizer.h"
 #include "modelpropertymapper.h"
 #include "clientsettings.h"
+#include "ircchannel.h"
+#include "ircuser.h"
+#include "network.h"
 
 class MappedSelectionModel;
 class QAbstractItemView;
-class Network;
-class IrcChannel;
-class IrcUser;
+class BufferItem;
+
+/*****************************************
+ *  Network Items
+ *****************************************/
+class NetworkItem : public PropertyMapItem {
+  Q_OBJECT
+  Q_PROPERTY(QString networkName READ networkName)
+  Q_PROPERTY(QString currentServer READ currentServer)
+  Q_PROPERTY(int nickCount READ nickCount)
+    
+public:
+  NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
+
+  virtual QVariant data(int column, int row) const;
+
+  inline bool isActive() const { return (bool)_network ? _network->isConnected() : false; }
+
+  inline const NetworkId &networkId() const { return _networkId; }
+  inline QString networkName() const { return (bool)_network ? _network->networkName() : QString(); }
+  inline QString currentServer() const { return (bool)_network ? _network->currentServer() : QString(); }
+  inline int nickCount() const { return (bool)_network ? _network->ircUsers().count() : 0; }
+
+  virtual QString toolTip(int column) const;
+
+  BufferItem *findBufferItem(BufferId bufferId);
+  inline BufferItem *findBufferItem(const BufferInfo &bufferInfo) { return findBufferItem(bufferInfo.bufferId()); }
+  BufferItem *bufferItem(const BufferInfo &bufferInfo);
+
+public slots:
+  void setNetworkName(const QString &networkName);
+  void setCurrentServer(const QString &serverName);
+
+  void attachNetwork(Network *network);
+  void attachIrcChannel(IrcChannel *channel);
+  void attachIrcUser(IrcUser *ircUser);
+
+private:
+  NetworkId _networkId;
+
+  QPointer<Network> _network;
+};
 
 /*****************************************
  *  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(BufferInfo bufferInfo, AbstractTreeItem *parent = 0);
+  BufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent = 0);
 
-  const BufferInfo &bufferInfo() const;
-  virtual quint64 id() const;
+  inline const BufferInfo &bufferInfo() const { return _bufferInfo; }
   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;
-  QString topic() const;
-  int nickCount() const;
+  inline BufferId bufferId() const { return _bufferInfo.bufferId(); }
+  inline BufferInfo::Type bufferType() const { return _bufferInfo.type(); }
 
-  bool isStatusBuffer() const;
-  BufferInfo::Type bufferType() const;
+  void setBufferName(const QString &name);
+  virtual inline QString bufferName() const { return _bufferInfo.bufferName(); }
+  virtual inline QString topic() const { return QString(); }
+  virtual inline int nickCount() const { return 0; }
 
-  bool isActive() const;
+  virtual inline bool isActive() const { return qobject_cast<NetworkItem *>(parent())->isActive(); }
 
   inline Buffer::ActivityLevel activityLevel() const { return _activity; }
-  bool setActivityLevel(Buffer::ActivityLevel level);
+  void setActivityLevel(Buffer::ActivityLevel level);
   void updateActivityLevel(Buffer::ActivityLevel level);
 
   void setLastMsgInsert(QDateTime msgDate);
   bool setLastSeen();
   QDateTime lastSeen();
 
-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);
+  virtual QString toolTip(int column) const;
 
-private slots:
-  void ircChannelDestroyed();
-  void ircUserDestroyed();
+public slots:
+  virtual inline void setTopic(const QString &) { emit dataChanged(1); }
 
 private:
   BufferInfo _bufferInfo;
   Buffer::ActivityLevel _activity;
+};
 
-  QPointer<IrcChannel> _ircChannel;
+/*****************************************
+*  StatusBufferItem
+*****************************************/
+class StatusBufferItem : public BufferItem {
+  Q_OBJECT
+
+public:
+  StatusBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent);
+
+  virtual QString toolTip(int column) const;
+  virtual inline QString bufferName() const { return tr("Status Buffer"); }
 };
 
+/*****************************************
+*  QueryBufferItem
+*****************************************/
+class QueryBufferItem : public BufferItem {
+  Q_OBJECT
+
+public:
+  QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent);
+
+  virtual QVariant data(int column, int role) const;
+  virtual inline bool isActive() const { return (bool)_ircUser; }
+  virtual QString toolTip(int column) const;
+
+public slots:
+  void attachIrcUser(IrcUser *ircUser);
+  void ircUserDestroyed();
+
+private:
+  IrcUser *_ircUser;
+};
 
 /*****************************************
- *  Network Items
- *****************************************/
-class NetworkItem : public PropertyMapItem {
+*  ChannelBufferItem
+*****************************************/
+class UserCategoryItem;
+
+class ChannelBufferItem : public BufferItem {
   Q_OBJECT
-  Q_PROPERTY(QString networkName READ networkName)
-  Q_PROPERTY(QString currentServer READ currentServer)
-  Q_PROPERTY(int nickCount READ nickCount)
-    
+
 public:
-  NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
+  ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent);
 
-  virtual quint64 id() const;
-  virtual QVariant data(int column, int row) const;
+  virtual inline bool isActive() const { return (bool)_ircChannel; }
+  virtual QString toolTip(int column) const;
 
-  bool isActive() const;
-  
-  QString networkName() const;
-  QString currentServer() const;
-  int nickCount() const;
+  virtual inline QString topic() const { return (bool)_ircChannel ? _ircChannel->topic() : QString(); }
+  virtual inline int nickCount() const { return (bool)_ircChannel ? _ircChannel->ircUsers().count() : 0; }
   
+  void attachIrcChannel(IrcChannel *ircChannel);
+
 public slots:
-  void setNetworkName(const QString &networkName);
-  void setCurrentServer(const QString &serverName);
+  void join(const QList<IrcUser *> &ircUsers);
+  void part(IrcUser *ircUser);
 
-  void attachNetwork(Network *network);
-  void attachIrcChannel(const QString &channelName);
+  UserCategoryItem *findCategoryItem(int categoryId);
+  void addUserToCategory(IrcUser *ircUser);
+  void addUsersToCategory(const QList<IrcUser *> &ircUser);
+  void removeUserFromCategory(IrcUser *ircUser);
+  void userModeChanged(IrcUser *ircUser);
 
-  void setActive(bool connected);
-  
-private:
-  NetworkId _networkId;
+private slots:
+  void ircChannelDestroyed();
 
-  QPointer<Network> _network;
+private:
+  IrcChannel *_ircChannel;
 };
 
 /*****************************************
 *  User Category Items (like @vh etc.)
 *****************************************/
+class IrcUserItem;
 class UserCategoryItem : public PropertyMapItem {
   Q_OBJECT
-  Q_PROPERTY(QString categoryId READ categoryId)
+  Q_PROPERTY(QString categoryName READ categoryName)
     
 public:
   UserCategoryItem(int category, AbstractTreeItem *parent);
 
-  QString categoryId();
-  virtual quint64 id() const;
+  QString categoryName() const;
+  inline int categoryId() const { return _category; }
   virtual QVariant data(int column, int role) const;
-  
-  void addUser(IrcUser *ircUser);
+
+  IrcUserItem *findIrcUser(IrcUser *ircUser);
+  void addUsers(const QList<IrcUser *> &ircUser);
   bool removeUser(IrcUser *ircUser);
 
   static int categoryFromModes(const QString &modes);
@@ -155,13 +220,7 @@ public:
 private:
   int _category;
 
-  struct Category {
-    QChar mode;
-    QString displayString;
-    inline Category(QChar mode_, QString displayString_) : mode(mode_), displayString(displayString_) {};
-  };
-
-  static const QList<Category> categories;
+  static const QList<QChar> categories;
 };
 
 /*****************************************
@@ -174,20 +233,18 @@ class IrcUserItem : public PropertyMapItem {
 public:
   IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent);
 
-  QString nickName() const;
-  bool isActive() const;
+  inline QString nickName() const { return _ircUser ? _ircUser->nick() : QString(); }
+  inline bool isActive() const { return _ircUser ? !_ircUser->isAway() : false; }
 
-  IrcUser *ircUser();
-  virtual quint64 id() const;
+  inline IrcUser *ircUser() { return _ircUser; }
   virtual QVariant data(int column, int role) const;
   virtual QString toolTip(int column) const;
-				   
+
 private slots:
-  void setNick(QString newNick);
+  inline void ircUserDestroyed() { parent()->removeChild(this); }
 
 private:
   QPointer<IrcUser> _ircUser;
-  quint64 _id;
 };
 
 
@@ -199,21 +256,23 @@ class NetworkModel : public TreeModel {
 
 public:
   enum myRoles {
-    BufferTypeRole = Qt::UserRole,
+    BufferTypeRole = TreeModel::UserRole,
     ItemActiveRole,
     BufferActivityRole,
     BufferIdRole,
     NetworkIdRole,
     BufferInfoRole,
-    ItemTypeRole
+    ItemTypeRole,
+    UserAwayRole
   };
 
-  enum itemTypes {
-    NetworkItemType,
-    BufferItemType,
-    UserCategoryItemType,
-    IrcUserItemType
+  enum itemType {
+    NetworkItemType = 0x01,
+    BufferItemType = 0x02,
+    UserCategoryItemType = 0x04,
+    IrcUserItemType = 0x08
   };
+  Q_DECLARE_FLAGS(itemTypes, itemType);
 
   NetworkModel(QObject *parent = 0);
   static QList<QVariant> defaultHeader();
@@ -229,24 +288,38 @@ public:
 
   bool isBufferIndex(const QModelIndex &) const;
   //Buffer *getBufferByIndex(const QModelIndex &) const;
+  QModelIndex networkIndex(NetworkId networkId);
   QModelIndex bufferIndex(BufferId bufferId);
 
   const Network *networkByIndex(const QModelIndex &index) const;
 
   Buffer::ActivityLevel bufferActivity(const BufferInfo &buffer) const;
 
+  QString bufferName(BufferId bufferId);
+  NetworkId networkId(BufferId bufferId);
+  QString networkName(BufferId bufferId);
+  BufferInfo::Type bufferType(BufferId bufferId);
+
 public slots:
   void bufferUpdated(BufferInfo bufferInfo);
+  void removeBuffer(BufferId bufferId);
   void setBufferActivity(const BufferInfo &buffer, Buffer::ActivityLevel activity);
   void networkRemoved(const NetworkId &networkId);
-  
+
+private slots:
+  void checkForRemovedBuffers(const QModelIndex &parent, int start, int end);
+  void checkForNewBuffers(const QModelIndex &parent, int start, int end);
+
 private:
-  QModelIndex networkIndex(NetworkId networkId);
+  int networkRow(NetworkId networkId);
+  NetworkItem *findNetworkItem(NetworkId networkId);
   NetworkItem *networkItem(NetworkId networkId);
-  NetworkItem *existsNetworkItem(NetworkId networkId);
+  BufferItem *findBufferItem(const BufferInfo &bufferInfo);
+  BufferItem *findBufferItem(BufferId bufferId);
   BufferItem *bufferItem(const BufferInfo &bufferInfo);
-  BufferItem *existsBufferItem(const BufferInfo &bufferInfo);
 
+  QHash<BufferId, BufferItem *> _bufferItemCache;
 };
+Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::itemTypes);
 
 #endif // NETWORKMODEL_H