X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=543e5e725c019e5ceb4dd2471fa38d2fa2378980;hp=56fcc9189169b2d3db418dee8e0ee41e0c49dfdf;hb=7df7429c009d2bea4c516e87f1ec4c956c722e09;hpb=f6f6f3e368543f0a4dce1dae772f161d7e357064

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 56fcc918..543e5e72 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -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
@@ -89,11 +114,13 @@ 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;
 
+  bool isActive() const;
+  
   QString networkName() const;
   QString currentServer() const;
   int nickCount() const;
@@ -102,14 +129,42 @@ 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;
+  NetworkId _networkId;
+
+  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:
+  int _category;
+
+  struct Category {
+    QChar mode;
+    QString displayString;
+    inline Category(QChar mode_, QString displayString_) : mode(mode_), displayString(displayString_) {};
+  };
 
-  QPointer<NetworkInfo> _networkInfo;
+  static const QList<Category> categories;
 };
 
 /*****************************************
@@ -123,6 +178,8 @@ public:
   IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent);
 
   QString nickName();
+  IrcUser *ircUser();
+  virtual quint64 id() const;
 
 private slots:
   void setNick(QString newNick);
@@ -142,8 +199,8 @@ class NetworkModel : public TreeModel {
 public:
   enum myRoles {
     BufferTypeRole = Qt::UserRole,
-    BufferActiveRole,
-    BufferUidRole,
+    ItemActiveRole,
+    BufferIdRole,
     NetworkIdRole,
     ItemTypeRole
   };
@@ -159,47 +216,30 @@ 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);
+  static QList< QPair<NetworkId, BufferId> > mimeDataToBufferList(const QMimeData *mimeData);
 
   virtual QStringList mimeTypes() const;
   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);
+  void attachNetwork(Network *network);
 
-signals:
-  void bufferSelected(Buffer *);
-  void selectionChanged(const QModelIndex &);
-
-private:
   bool isBufferIndex(const QModelIndex &) const;
-  Buffer *getBufferByIndex(const QModelIndex &) const;
+  //Buffer *getBufferByIndex(const QModelIndex &) const;
+  QModelIndex bufferIndex(BufferId bufferId);
 
-  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);
+public slots:
+  void bufferUpdated(BufferInfo bufferInfo);
+  void bufferActivity(BufferItem::ActivityLevel, 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);
 
-  QPointer<SelectionModelSynchronizer> _selectionModelSynchronizer;
-  QPointer<ModelPropertyMapper> _propertyMapper;
-  Buffer *currentBuffer;
 };
 
 #endif // NETWORKMODEL_H