X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffertreemodel.cpp;h=568f7e6c3b9fecaee47f8456e3794131edbf7a33;hp=e1b52668c78b370ac05b2c80a4d4639c3f53904e;hb=6609a6b6f50274e90ecca1aca2c0e2e9ad2e6327;hpb=012df68ce8a743a71bfe3beda529a21c02daddb6

diff --git a/src/client/buffertreemodel.cpp b/src/client/buffertreemodel.cpp
index e1b52668..568f7e6c 100644
--- a/src/client/buffertreemodel.cpp
+++ b/src/client/buffertreemodel.cpp
@@ -20,9 +20,12 @@
 
 #include <QColor>  // FIXME Dependency on QtGui!
 
-#include "clientproxy.h"
 #include "buffertreemodel.h"
 
+#include "bufferinfo.h"
+#include "client.h"
+#include "signalproxy.h"
+
 /*****************************************
 *  Fancy Buffer Items
 *****************************************/
@@ -32,7 +35,7 @@ BufferTreeItem::BufferTreeItem(Buffer *buffer, TreeItem *parent) : TreeItem(pare
 }
 
 uint BufferTreeItem::id() const {
-  return buf->bufferId().uid();
+  return buf->bufferInfo().uid();
 }
 
 void BufferTreeItem::setActivity(const Buffer::ActivityLevel &level) {
@@ -79,13 +82,21 @@ QVariant BufferTreeItem::data(int column, int role) const {
       return buf->bufferType();
     case BufferTreeModel::BufferActiveRole:
       return buf->isActive();
-    case BufferTreeModel::BufferIdRole:
-      return buf->bufferId().uid();
+    case BufferTreeModel::BufferInfoRole:
+      return buf->bufferInfo().uid();
     default:
       return QVariant();
   }
 }
 
+Qt::ItemFlags BufferTreeItem::flags() const {
+  Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
+  if(buf->bufferType() == Buffer::QueryBuffer)
+    flags |= Qt::ItemIsDropEnabled;
+
+  return flags;
+}
+
 /*****************************************
 *  Network Items
 *****************************************/
@@ -98,14 +109,17 @@ uint NetworkTreeItem::id() const {
   return qHash(net);
 }
 
-
+Qt::ItemFlags NetworkTreeItem::flags() const {
+  return Qt::ItemIsEnabled | Qt::ItemIsDropEnabled;
+}
 
 /*****************************************
  * BufferTreeModel
  *****************************************/
-BufferTreeModel::BufferTreeModel(QObject *parent) : TreeModel(BufferTreeModel::defaultHeader(), parent) {
-  connect(this, SIGNAL(fakeUserInput(BufferId, QString)),
-          ClientProxy::instance(), SLOT(gsUserInput(BufferId, QString)));
+BufferTreeModel::BufferTreeModel(QObject *parent)
+  : TreeModel(BufferTreeModel::defaultHeader(), parent)
+{
+  Client::signalProxy()->attachSignal(this, SIGNAL(fakeUserInput(BufferInfo, QString)), SIGNAL(sendInput(BufferInfo, QString)));
 }
 
 QList<QVariant >BufferTreeModel::defaultHeader() {
@@ -114,24 +128,6 @@ QList<QVariant >BufferTreeModel::defaultHeader() {
   return data;
 }
 
-
-Qt::ItemFlags BufferTreeModel::flags(const QModelIndex &index) const {
-  if(!index.isValid())
-    return Qt::ItemIsDropEnabled;
-    //return 0;
-
-  // I think this is pretty ugly..
-  if(isBufferIndex(index)) {
-    Buffer *buffer = getBufferByIndex(index);
-    if(buffer->bufferType() == Buffer::QueryBuffer)
-      return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
-    else
-      return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
-  } else {
-    return Qt::ItemIsEnabled | Qt::ItemIsDropEnabled; 
-  }
-}
-
 bool BufferTreeModel::isBufferIndex(const QModelIndex &index) const {
   // not so purdy...
   return parent(index) != QModelIndex();
@@ -145,8 +141,8 @@ Buffer *BufferTreeModel::getBufferByIndex(const QModelIndex &index) const {
 QModelIndex BufferTreeModel::getOrCreateNetworkItemIndex(Buffer *buffer) {
   QString net = buffer->networkName();
   TreeItem *networkItem;
-  
-  if(not(networkItem = rootItem->childById(qHash(net)))) {
+
+  if(!(networkItem = rootItem->childById(qHash(net)))) {
     int nextRow = rootItem->childCount();
     networkItem = new NetworkTreeItem(net, rootItem);
     
@@ -164,7 +160,7 @@ QModelIndex BufferTreeModel::getOrCreateBufferItemIndex(Buffer *buffer) {
   NetworkTreeItem *networkItem = static_cast<NetworkTreeItem*>(networkItemIndex.internalPointer());
   TreeItem *bufferItem;
   
-  if(not(bufferItem = networkItem->childById(buffer->bufferId().uid()))) {
+  if(!(bufferItem = networkItem->childById(buffer->bufferInfo().uid()))) {
     int nextRow = networkItem->childCount();
     bufferItem = new BufferTreeItem(buffer, networkItem);
     
@@ -181,7 +177,7 @@ QStringList BufferTreeModel::mimeTypes() const {
   QStringList types;
   types << "application/Quassel/BufferItem/row"
     << "application/Quassel/BufferItem/network"
-    << "application/Quassel/BufferItem/bufferId";
+    << "application/Quassel/BufferItem/bufferInfo";
   return types;
 }
 
@@ -192,16 +188,16 @@ QMimeData *BufferTreeModel::mimeData(const QModelIndexList &indexes) const {
   
   mimeData->setData("application/Quassel/BufferItem/row", QByteArray::number(index.row()));
   mimeData->setData("application/Quassel/BufferItem/network", getBufferByIndex(index)->networkName().toUtf8());
-  mimeData->setData("application/Quassel/BufferItem/bufferId", QByteArray::number(getBufferByIndex(index)->bufferId().uid()));
+  mimeData->setData("application/Quassel/BufferItem/bufferInfo", QByteArray::number(getBufferByIndex(index)->bufferInfo().uid()));
   return mimeData;
 }
 
 bool BufferTreeModel::dropMimeData(const QMimeData *data, Qt::DropAction /*action*/, int /*row*/, int /*column*/, const QModelIndex &parent) {
-  if(!(data->hasFormat("application/Quassel/BufferItem/row")
-       && data->hasFormat("application/Quassel/BufferItem/network")
-       && data->hasFormat("application/Quassel/BufferItem/bufferId")))
-    return false; // whatever the drop is... it's not a buffer...
-       
+  foreach(QString mimeType, mimeTypes()) {
+    if(!(data->hasFormat(mimeType)))
+      return false; // whatever the drop is... it's not a buffer...
+  }
+  
   int sourcerow = data->data("application/Quassel/BufferItem/row").toInt();
   QString network = QString::fromUtf8(data->data("application/Quassel/BufferItem/network"));
   
@@ -219,14 +215,7 @@ bool BufferTreeModel::dropMimeData(const QMimeData *data, Qt::DropAction /*actio
   if(sourceBuffer == targetBuffer) // we won't merge with ourself :)
     return false;
     
-  /*
-  if(QMessageBox::warning(static_cast<QWidget *>(QObject::parent()),
-                          tr("Merge Buffers?"),
-                          tr("Do you really want to merge the following Buffers?<br />%1.%2<br />%3.%4").arg(sourceBuffer->networkName()).arg(sourceBuffer->bufferName()).arg(targetBuffer->networkName()).arg(targetBuffer->bufferName()),
-                          QMessageBox::Yes|QMessageBox::No) == QMessageBox::No)
-    return false;
-
-  */
+  // TODO: warn user about buffermerge!
   qDebug() << "merging" << sourceBuffer->bufferName() << "with" << targetBuffer->bufferName();
   removeRow(parent.row(), BufferTreeModel::parent(parent));
   
@@ -254,7 +243,7 @@ void BufferTreeModel::doubleClickReceived(const QModelIndex &clicked) {
   if(isBufferIndex(clicked)) {
     Buffer *buffer = getBufferByIndex(clicked);
     if(!buffer->isStatusBuffer()) 
-      emit fakeUserInput(buffer->bufferId(), QString("/join " + buffer->bufferName()));
+      emit fakeUserInput(buffer->bufferInfo(), QString("/join " + buffer->bufferName()));
   }
 }
 
@@ -269,7 +258,6 @@ void BufferTreeModel::bufferActivity(Buffer::ActivityLevel level, Buffer *buffer
 
 void BufferTreeModel::selectBuffer(Buffer *buffer) {
   QModelIndex index = getOrCreateBufferItemIndex(buffer);
-  emit selectionChanged(index);
+  //emit selectionChanged(index);
+  changeCurrent(index, QModelIndex());
 }
-
-