X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=6ac06f8e832023049e8d9e1871e3e80058b558a4;hp=a9a108d215604c008edb7ff306f647641dc9cb65;hb=c0bbc724cda7acf652d9d2ce80605ebb53c4a2ff;hpb=f37791b92e3bf6e78b93036c0669926eeba3347b

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index a9a108d2..6ac06f8e 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -32,6 +32,8 @@ class BufferInfo;
 
 #include "selectionmodelsynchronizer.h"
 #include "modelpropertymapper.h"
+#include "clientsettings.h"
+
 class MappedSelectionModel;
 class QAbstractItemView;
 class Network;
@@ -43,7 +45,7 @@ class IrcUser;
  *****************************************/
 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)
 
@@ -53,35 +55,27 @@ 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);
 
   QString bufferName() const;
+  void setBufferName(const QString &name);
   QString topic() const;
   int nickCount() const;
 
-  enum Type {
-    StatusType,
-    ChannelType,
-    QueryType
-  };
-  
   bool isStatusBuffer() const;
-  Type bufferType() const;
+  BufferInfo::Type bufferType() const;
 
   bool isActive() const;
-  
-  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);
+  inline Buffer::ActivityLevel activityLevel() const { return _activity; }
+  bool setActivityLevel(Buffer::ActivityLevel level);
+  void updateActivityLevel(Buffer::ActivityLevel level);
+
+  void setLastMsgInsert(QDateTime msgDate);
+  bool setLastSeen();
+  QDateTime lastSeen();
 
 public slots:
   void setTopic(const QString &topic);
@@ -91,18 +85,19 @@ public slots:
   void addUserToCategory(IrcUser *ircUser);
   void removeUserFromCategory(IrcUser *ircUser);
   void userModeChanged(IrcUser *ircUser);
-					 
+
 private slots:
   void ircChannelDestroyed();
-  
+  void ircUserDestroyed();
+
 private:
   BufferInfo _bufferInfo;
-  ActivityLevel _activity;
-  Type _type;
+  QString _bufferName;
+  Buffer::ActivityLevel _activity;
 
   QPointer<IrcChannel> _ircChannel;
 };
-Q_DECLARE_OPERATORS_FOR_FLAGS(BufferItem::ActivityLevel)
+
 
 /*****************************************
  *  Network Items
@@ -114,10 +109,11 @@ 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;
+  inline const NetworkId &networkId() const { return _networkId; }
+  virtual QVariant data(int column, int row) const;
 
   bool isActive() const;
   
@@ -133,8 +129,7 @@ public slots:
   void attachIrcChannel(const QString &channelName);
   
 private:
-  uint _networkId;
-  QString _networkName;
+  NetworkId _networkId;
 
   QPointer<Network> _network;
 };
@@ -151,14 +146,13 @@ public:
 
   QString categoryId();
   virtual quint64 id() const;
-
+  virtual QVariant data(int column, int role) const;
+  
   void addUser(IrcUser *ircUser);
+  bool removeUser(IrcUser *ircUser);
 
   static int categoryFromModes(const QString &modes);
 
-private slots:
-  void checkNoChilds();
-
 private:
   int _category;
 
@@ -181,16 +175,21 @@ class IrcUserItem : public PropertyMapItem {
 public:
   IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent);
 
-  QString nickName();
+  QString nickName() const;
+  bool isActive() 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();
+  void setAway(bool);
 
 private:
-  IrcUser *_ircUser;
+  QPointer<IrcUser> _ircUser;
+  quint64 _id;
 };
 
 
@@ -204,24 +203,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;
@@ -230,20 +230,25 @@ public:
   void attachNetwork(Network *network);
 
   bool isBufferIndex(const QModelIndex &) const;
-  Buffer *getBufferByIndex(const QModelIndex &) const;
+  //Buffer *getBufferByIndex(const QModelIndex &) const;
   QModelIndex bufferIndex(BufferId bufferId);
 
+  const Network *networkByIndex(const QModelIndex &index) const;
+
+  Buffer::ActivityLevel bufferActivity(const BufferInfo &buffer) const;
+
 public slots:
   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);
+  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:
+  QModelIndex networkIndex(NetworkId networkId);
+  NetworkItem *networkItem(NetworkId networkId);
+  NetworkItem *existsNetworkItem(NetworkId networkId);
+  BufferItem *bufferItem(const BufferInfo &bufferInfo);
+  BufferItem *existsBufferItem(const BufferInfo &bufferInfo);
 
 };