merging branches/0.2/0.2@r44 with trunk

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

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 8c36233..1a5e4c4 100644 (file)
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -45,14 +45,14 @@ 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)
 
 public:
   BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent = 0);
 
-  const BufferInfo &bufferInfo() const;
+  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);
@@ -60,52 +60,49 @@ public:
   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;
-  BufferInfo::Type bufferType() const;
+
+  // bool isStatusBuffer() const;
 
   bool isActive() const;
-  
-  enum Activity {
-    NoActivity = 0x00,
-    OtherActivity = 0x01,
-    NewMessage = 0x02,
-    Highlight = 0x40
-  };
-  Q_DECLARE_FLAGS(ActivityLevel, Activity)
 
-  ActivityLevel activity() const;
-  bool setActivity(const ActivityLevel &level);
-  void updateActivity(const ActivityLevel &level);
+  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);
 
   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;
-  ActivityLevel _activity;
-  QDateTime _lastMsgInsert;
-  QDateTime _lastSeen;
+  QString _bufferName;
+  Buffer::ActivityLevel _activity;
 
-  QPointer<IrcChannel> _ircChannel;
+  IrcChannel *_ircChannel;
 };
-Q_DECLARE_OPERATORS_FOR_FLAGS(BufferItem::ActivityLevel)
+
 
 /*****************************************
  *  Network Items
@@ -123,11 +120,14 @@ public:
   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);
@@ -135,8 +135,6 @@ public slots:
   void attachNetwork(Network *network);
   void attachIrcChannel(const QString &channelName);
 
-  void setActive(bool connected);
-  
 private:
   NetworkId _networkId;
 
@@ -148,16 +146,16 @@ private:
 *****************************************/
 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();
+  QString categoryName() const;
   virtual quint64 id() const;
   virtual QVariant data(int column, int role) const;
   
-  void addUser(IrcUser *ircUser);
+  void addUsers(const QList<IrcUser *> &ircUser);
   bool removeUser(IrcUser *ircUser);
 
   static int categoryFromModes(const QString &modes);
@@ -165,13 +163,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;
 };
 
 /*****************************************
@@ -191,9 +183,10 @@ public:
   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 setAway(bool);
 
 private:
   QPointer<IrcUser> _ircUser;
@@ -209,23 +202,23 @@ class NetworkModel : public TreeModel {
 
 public:
   enum myRoles {
-    BufferTypeRole = Qt::UserRole,
+    BufferTypeRole = TreeModel::UserRole,
     ItemActiveRole,
     BufferActivityRole,
     BufferIdRole,
     NetworkIdRole,
     BufferInfoRole,
-    ItemTypeRole,
-    LastSeenRole
+    ItemTypeRole
   };
 
-  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();
 
@@ -244,9 +237,12 @@ public:
 
   const Network *networkByIndex(const QModelIndex &index) const;
 
+  Buffer::ActivityLevel bufferActivity(const BufferInfo &buffer) const;
+
 public slots:
   void bufferUpdated(BufferInfo bufferInfo);
-  void updateBufferActivity(const Message &msg);
+  void removeBuffer(BufferId bufferId);
+  void setBufferActivity(const BufferInfo &buffer, Buffer::ActivityLevel activity);
   void networkRemoved(const NetworkId &networkId);
   
 private:
@@ -257,5 +253,6 @@ private:
   BufferItem *existsBufferItem(const BufferInfo &bufferInfo);
 
 };
+Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::itemTypes);
 
 #endif // NETWORKMODEL_H