X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffertreemodel.h;h=70a961932c775a8eabe865a8dd0f33c0056ff0e2;hp=9916edd4de683500a465dd42f1166f39665e4d9e;hb=a634acadbcf6017474f68a3eaf7cb632660e9e49;hpb=a5c0b0735d9a448be2556dfe5dc8e89bb4176cd7

diff --git a/src/client/buffertreemodel.h b/src/client/buffertreemodel.h
index 9916edd4..70a96193 100644
--- a/src/client/buffertreemodel.h
+++ b/src/client/buffertreemodel.h
@@ -25,21 +25,35 @@
 
 #include "treemodel.h"
 #include "buffer.h"
-#include "clientproxy.h"
+
+#include <QPointer>
+
+#include <QItemSelectionModel>
+
+class BufferInfo;
+
+#include "selectionmodelsynchronizer.h"
+#include "modelpropertymapper.h"
+class MappedSelectionModel;
+class QAbstractItemView;
 
 /*****************************************
  *  Fancy Buffer Items
  *****************************************/
-class BufferTreeItem : public TreeItem{
+class BufferTreeItem : public TreeItem {
   Q_OBJECT
   
 public:
   BufferTreeItem(Buffer *, TreeItem *parent = 0);
+
+  virtual uint id() const;
   QVariant data(int column, int role) const;
+  virtual Qt::ItemFlags flags() const;
+  
   Buffer *buffer() const { return buf; }
   void setActivity(const Buffer::ActivityLevel &);
   
-protected:
+private:
   QString text(int column) const;
   QColor foreground(int column) const;
   
@@ -47,6 +61,22 @@ protected:
   Buffer::ActivityLevel activity;
 };
 
+/*****************************************
+ *  Network Items
+ *****************************************/
+class NetworkTreeItem : public TreeItem {
+  Q_OBJECT
+  
+public:
+  NetworkTreeItem(const QString &, TreeItem *parent = 0);
+
+  virtual uint id() const;
+  virtual Qt::ItemFlags flags() const;
+  
+private:
+  QString net;
+  
+};
 
 /*****************************************
  * BufferTreeModel
@@ -55,31 +85,32 @@ class BufferTreeModel : public TreeModel {
   Q_OBJECT
   
 public:
-  enum  myRoles {
+  enum myRoles {
     BufferTypeRole = Qt::UserRole,
     BufferActiveRole,
     BufferNameRole,
-    BufferIdRole
+    BufferUidRole
   };
   
   BufferTreeModel(QObject *parent = 0);
   static QList<QVariant> defaultHeader();
 
-  virtual Qt::ItemFlags flags(const QModelIndex &index) const;
-  
-//  void clearActivity(Buffer *buffer);
-  
+  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);
+
 public slots:
-  void bufferUpdated(Buffer *);    
-  void changeCurrent(const QModelIndex &, const QModelIndex &);
+  void bufferUpdated(Buffer *);
+  void setCurrentIndex(const QModelIndex &index, QItemSelectionModel::SelectionFlags command);
   void selectBuffer(Buffer *buffer);
-  void doubleClickReceived(const QModelIndex &);
   void bufferActivity(Buffer::ActivityLevel, Buffer *buffer);
   
 signals:
   void bufferSelected(Buffer *);
   void invalidateFilter();
-  void fakeUserInput(BufferId, QString);
   void selectionChanged(const QModelIndex &);
     
 private:
@@ -91,9 +122,9 @@ private:
   QStringList mimeTypes() const;
   QMimeData *mimeData(const QModelIndexList &) const;
   bool dropMimeData(const QMimeData *, Qt::DropAction, int, int, const QModelIndex &);
-  
-  QHash<QString, TreeItem*> networkItem;
-  QHash<Buffer *, BufferTreeItem*> bufferItem;
+
+  QPointer<SelectionModelSynchronizer> _selectionModelSynchronizer;
+  QPointer<ModelPropertyMapper> _propertyMapper;
   Buffer *currentBuffer;
 };