X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fbuffertreemodel.h;h=e194c27b56186a9582ba432226ab047024f8644a;hb=97d674034551438238c568e8b42efb08e1ba7354;hp=56981fca154773ad8db848a2da67c89cc494958a;hpb=0555b01cbb4789122de7bc0a5325c664fbed87cd;p=quassel.git

diff --git a/src/client/buffertreemodel.h b/src/client/buffertreemodel.h
index 56981fca..e194c27b 100644
--- a/src/client/buffertreemodel.h
+++ b/src/client/buffertreemodel.h
@@ -1,4 +1,4 @@
-	/***************************************************************************
+/***************************************************************************
  *   Copyright (C) 2005-07 by The Quassel Team                             *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
@@ -26,6 +26,17 @@
 #include "treemodel.h"
 #include "buffer.h"
 
+#include <QPointer>
+
+#include <QItemSelectionModel>
+
+class BufferInfo;
+
+#include "selectionmodelsynchronizer.h"
+#include "modelpropertymapper.h"
+class MappedSelectionModel;
+class QAbstractItemView;
+
 /*****************************************
  *  Fancy Buffer Items
  *****************************************/
@@ -37,7 +48,6 @@ public:
 
   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 &);
@@ -57,14 +67,14 @@ class NetworkTreeItem : public TreeItem {
   Q_OBJECT
   
 public:
-  NetworkTreeItem(const QString &, TreeItem *parent = 0);
+  NetworkTreeItem(const uint &netid, const QString &, TreeItem *parent = 0);
 
+  virtual QVariant data(int column, int row) const;
   virtual uint id() const;
-  virtual Qt::ItemFlags flags() const;
   
 private:
+  uint _networkId;
   QString net;
-  
 };
 
 /*****************************************
@@ -74,27 +84,40 @@ class BufferTreeModel : public TreeModel {
   Q_OBJECT
   
 public:
-  enum  myRoles {
+  enum myRoles {
     BufferTypeRole = Qt::UserRole,
     BufferActiveRole,
-    BufferNameRole,
-    BufferIdRole
+    BufferUidRole,
+    NetworkIdRole
   };
   
   BufferTreeModel(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);
   
+  virtual QStringList mimeTypes() const;
+  virtual QMimeData *mimeData(const QModelIndexList &) const;
+  virtual bool dropMimeData(const QMimeData *, Qt::DropAction, int, int, const QModelIndex &);
+
+
 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:
@@ -103,10 +126,8 @@ private:
   QModelIndex getOrCreateNetworkItemIndex(Buffer *buffer);
   QModelIndex getOrCreateBufferItemIndex(Buffer *buffer);
 
-  QStringList mimeTypes() const;
-  QMimeData *mimeData(const QModelIndexList &) const;
-  bool dropMimeData(const QMimeData *, Qt::DropAction, int, int, const QModelIndex &);
-  
+  QPointer<SelectionModelSynchronizer> _selectionModelSynchronizer;
+  QPointer<ModelPropertyMapper> _propertyMapper;
   Buffer *currentBuffer;
 };