X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=08ae4af0aa8c96926c9743fc34ab35fd3fd8a91f;hp=1a5e4c4bc732ed169ab32f24b0e172e7aaee3020;hb=ef97dad874c30d7e0586b3dcb98eed15d8987382;hpb=4fdf00a414eba03fb95cade3aca3ba53705c7b97

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 1a5e4c4b..08ae4af0 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -33,12 +33,54 @@ 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
@@ -50,26 +92,21 @@ class BufferItem : public PropertyMapItem {
   Q_PROPERTY(int nickCount READ nickCount)
 
 public:
-  BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent = 0);
+  BufferItem(const 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;
-
-  // bool isStatusBuffer() const;
+  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; }
   void setActivityLevel(Buffer::ActivityLevel level);
@@ -82,68 +119,86 @@ public:
   virtual QString toolTip(int column) const;
 
 public slots:
-  void setTopic(const QString &topic);
-  void join(const QList<IrcUser *> &ircUsers);
-  void part(IrcUser *ircUser);
-
-  void addUserToCategory(IrcUser *ircUser);
-  void addUsersToCategory(const QList<IrcUser *> &ircUser);
-  void removeUserFromCategory(IrcUser *ircUser);
-  void userModeChanged(IrcUser *ircUser);
-
-private slots:
-  void ircChannelDestroyed();
-  void ircUserDestroyed();
+  virtual inline void setTopic(const QString &) { emit dataChanged(1); }
 
 private:
   BufferInfo _bufferInfo;
-  QString _bufferName;
   Buffer::ActivityLevel _activity;
-
-  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"); }
+};
 
 /*****************************************
- *  Network Items
- *****************************************/
-class NetworkItem : public PropertyMapItem {
+*  QueryBufferItem
+*****************************************/
+class QueryBufferItem : 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);
+  QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent);
 
-  virtual quint64 id() const;
-  virtual QVariant data(int column, int row) const;
+  virtual bool isActive() const;
+  virtual QString toolTip(int column) const;
 
-  bool isActive() const;
+public slots:
+  void attachIrcUser(IrcUser *ircUser);
+  void ircUserDestroyed();
 
-  inline const NetworkId &networkId() const { return _networkId; }
-  QString networkName() const;
-  QString currentServer() const;
-  int nickCount() const;
+private:
+  IrcUser *_ircUser;
+};
+
+/*****************************************
+*  ChannelBufferItem
+*****************************************/
+class UserCategoryItem;
+
+class ChannelBufferItem : public BufferItem {
+  Q_OBJECT
+
+public:
+  ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent);
 
+  virtual inline bool isActive() const { return (bool)_ircChannel; }
   virtual QString toolTip(int column) 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);
 
-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 categoryName READ categoryName)
@@ -152,9 +207,10 @@ public:
   UserCategoryItem(int category, AbstractTreeItem *parent);
 
   QString categoryName() const;
-  virtual quint64 id() const;
+  inline int categoryId() const { return _category; }
   virtual QVariant data(int column, int role) const;
-  
+
+  IrcUserItem *findIrcUser(IrcUser *ircUser);
   void addUsers(const QList<IrcUser *> &ircUser);
   bool removeUser(IrcUser *ircUser);
 
@@ -176,21 +232,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);
-  void setAway(bool);
+  void ircUserDestroyed() { parent()->removeChild(this); }
 
 private:
   QPointer<IrcUser> _ircUser;
-  quint64 _id;
 };
 
 
@@ -233,6 +286,7 @@ 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;
@@ -246,11 +300,12 @@ public slots:
   void networkRemoved(const NetworkId &networkId);
   
 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);
 
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::itemTypes);