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

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 0ed74877..a9a108d2 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -28,15 +28,13 @@
 
 #include <QPointer>
 
-#include <QItemSelectionModel>
-
 class BufferInfo;
 
 #include "selectionmodelsynchronizer.h"
 #include "modelpropertymapper.h"
 class MappedSelectionModel;
 class QAbstractItemView;
-class NetworkInfo;
+class Network;
 class IrcChannel;
 class IrcUser;
 
@@ -50,8 +48,9 @@ class BufferItem : public PropertyMapItem {
   Q_PROPERTY(int nickCount READ nickCount)
 
 public:
-  BufferItem(Buffer *, AbstractTreeItem *parent = 0);
+  BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent = 0);
 
+  const BufferInfo &bufferInfo() const;
   virtual quint64 id() const;
   virtual QVariant data(int column, int role) const;
 
@@ -61,23 +60,49 @@ public:
   QString topic() const;
   int nickCount() const;
 
+  enum Type {
+    StatusType,
+    ChannelType,
+    QueryType
+  };
   
-  Buffer *buffer() const { return buf; }
-  void setActivity(const Buffer::ActivityLevel &);
+  bool isStatusBuffer() const;
+  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);
 
 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);
+					 
+private slots:
+  void ircChannelDestroyed();
   
 private:
-  QColor foreground(int column) const;
-
-  Buffer *buf;
-  Buffer::ActivityLevel activity;
+  BufferInfo _bufferInfo;
+  ActivityLevel _activity;
+  Type _type;
 
   QPointer<IrcChannel> _ircChannel;
 };
+Q_DECLARE_OPERATORS_FOR_FLAGS(BufferItem::ActivityLevel)
 
 /*****************************************
  *  Network Items
@@ -94,6 +119,8 @@ public:
   virtual QVariant data(int column, int row) const;
   virtual quint64 id() const;
 
+  bool isActive() const;
+  
   QString networkName() const;
   QString currentServer() const;
   int nickCount() const;
@@ -102,14 +129,46 @@ public slots:
   void setNetworkName(const QString &networkName);
   void setCurrentServer(const QString &serverName);
 
-  void attachNetworkInfo(NetworkInfo *networkInfo);
+  void attachNetwork(Network *network);
   void attachIrcChannel(const QString &channelName);
   
 private:
   uint _networkId;
   QString _networkName;
 
-  QPointer<NetworkInfo> _networkInfo;
+  QPointer<Network> _network;
+};
+
+/*****************************************
+*  User Category Items (like @vh etc.)
+*****************************************/
+class UserCategoryItem : public PropertyMapItem {
+  Q_OBJECT
+  Q_PROPERTY(QString categoryId READ categoryId)
+    
+public:
+  UserCategoryItem(int category, AbstractTreeItem *parent);
+
+  QString categoryId();
+  virtual quint64 id() const;
+
+  void addUser(IrcUser *ircUser);
+
+  static int categoryFromModes(const QString &modes);
+
+private slots:
+  void checkNoChilds();
+
+private:
+  int _category;
+
+  struct Category {
+    QChar mode;
+    QString displayString;
+    inline Category(QChar mode_, QString displayString_) : mode(mode_), displayString(displayString_) {};
+  };
+
+  static const QList<Category> categories;
 };
 
 /*****************************************
@@ -123,6 +182,8 @@ public:
   IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent);
 
   QString nickName();
+  IrcUser *ircUser();
+  virtual quint64 id() const;
 
 private slots:
   void setNick(QString newNick);
@@ -142,8 +203,8 @@ class NetworkModel : public TreeModel {
 public:
   enum myRoles {
     BufferTypeRole = Qt::UserRole,
-    BufferActiveRole,
-    BufferUidRole,
+    ItemActiveRole,
+    BufferIdRole,
     NetworkIdRole,
     ItemTypeRole
   };
@@ -159,13 +220,6 @@ public:
   NetworkModel(QObject *parent = 0);
   static QList<QVariant> defaultHeader();
 
-  inline SelectionModelSynchronizer *selectionModelSynchronizer() { return _selectionModelSynchronizer; }
-  inline ModelPropertyMapper *propertyMapper() { return _propertyMapper; }
-
-  void synchronizeSelectionModel(MappedSelectionModel *selectionModel);
-  void synchronizeView(QAbstractItemView *view);
-  void mapProperty(int column, int role, QObject *target, const QByteArray &property);
-
   static bool mimeContainsBufferList(const QMimeData *mimeData);
   static QList< QPair<uint, uint> > mimeDataToBufferList(const QMimeData *mimeData);
 
@@ -173,33 +227,24 @@ public:
   virtual QMimeData *mimeData(const QModelIndexList &) const;
   virtual bool dropMimeData(const QMimeData *, Qt::DropAction, int, int, const QModelIndex &);
 
-  void attachNetworkInfo(NetworkInfo *networkInfo);
-						  
-public slots:
-  void bufferUpdated(Buffer *);
-  void setCurrentIndex(const QModelIndex &index, QItemSelectionModel::SelectionFlags command);
-  void selectBuffer(Buffer *buffer);
-  void bufferActivity(Buffer::ActivityLevel, Buffer *buffer);
-
-signals:
-  void bufferSelected(Buffer *);
-  void selectionChanged(const QModelIndex &);
+  void attachNetwork(Network *network);
 
-private:
   bool isBufferIndex(const QModelIndex &) const;
   Buffer *getBufferByIndex(const QModelIndex &) const;
+  QModelIndex bufferIndex(BufferId bufferId);
+
+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);
   
-  QModelIndex bufferIndex(BufferInfo bufferInfo);
   BufferItem *buffer(BufferInfo bufferInfo);
   BufferItem *newBuffer(BufferInfo bufferInfo);
 
-  QPointer<SelectionModelSynchronizer> _selectionModelSynchronizer;
-  QPointer<ModelPropertyMapper> _propertyMapper;
-  Buffer *currentBuffer;
 };
 
 #endif // NETWORKMODEL_H