Some small stuff, like adding semicolons to Qt macro defs in order to not
[quassel.git] / src / client / buffertreemodel.cpp
index 741215f..b93f858 100644 (file)
@@ -20,8 +20,9 @@
 
 #include <QColor>  // FIXME Dependency on QtGui!
 
-#include "global.h"
+#include "client.h"
 #include "buffertreemodel.h"
+#include "signalproxy.h"
 
 /*****************************************
 *  Fancy Buffer Items
@@ -31,6 +32,10 @@ BufferTreeItem::BufferTreeItem(Buffer *buffer, TreeItem *parent) : TreeItem(pare
   activity = Buffer::NoActivity;
 }
 
+uint BufferTreeItem::id() const {
+  return buf->bufferId().uid();
+}
+
 void BufferTreeItem::setActivity(const Buffer::ActivityLevel &level) {
   activity = level;
 }
@@ -82,12 +87,37 @@ QVariant BufferTreeItem::data(int column, int role) const {
   }
 }
 
+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
+*****************************************/
+NetworkTreeItem::NetworkTreeItem(const QString &network, TreeItem *parent) : TreeItem(parent) {
+  net = network;
+  itemData << net << "";
+}
+
+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(BufferId, QString)), SIGNAL(sendInput(BufferId, QString)));
 }
 
 QList<QVariant >BufferTreeModel::defaultHeader() {
@@ -96,25 +126,8 @@ 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();
 }
 
@@ -125,42 +138,37 @@ Buffer *BufferTreeModel::getBufferByIndex(const QModelIndex &index) const {
 
 QModelIndex BufferTreeModel::getOrCreateNetworkItemIndex(Buffer *buffer) {
   QString net = buffer->networkName();
-  
-  if(networkItem.contains(net)) {
-    return index(networkItem[net]->row(), 0);
-  } else {
-    QList<QVariant> data;
-    data << net << "";
-    
+  TreeItem *networkItem;
+
+  if(not(networkItem = rootItem->childById(qHash(net)))) {
     int nextRow = rootItem->childCount();
+    networkItem = new NetworkTreeItem(net, rootItem);
     
     beginInsertRows(QModelIndex(), nextRow, nextRow);
-    rootItem->appendChild(new TreeItem(data, rootItem));
+    rootItem->appendChild(networkItem);
     endInsertRows();
-    
-    networkItem[net] = rootItem->child(nextRow);
-    return index(nextRow, 0);
   }
+
+  Q_ASSERT(networkItem);
+  return index(networkItem->row(), 0);
 }
 
 QModelIndex BufferTreeModel::getOrCreateBufferItemIndex(Buffer *buffer) {
   QModelIndex networkItemIndex = getOrCreateNetworkItemIndex(buffer);
+  NetworkTreeItem *networkItem = static_cast<NetworkTreeItem*>(networkItemIndex.internalPointer());
+  TreeItem *bufferItem;
   
-  if(bufferItem.contains(buffer)) {
-    return index(bufferItem[buffer]->row(), 0, networkItemIndex);
-  } else {
-    // first we determine the parent of the new Item
-    TreeItem *networkItem = static_cast<TreeItem*>(networkItemIndex.internalPointer());
-
+  if(not(bufferItem = networkItem->childById(buffer->bufferId().uid()))) {
     int nextRow = networkItem->childCount();
-
+    bufferItem = new BufferTreeItem(buffer, networkItem);
+    
     beginInsertRows(networkItemIndex, nextRow, nextRow);
-    networkItem->appendChild(new BufferTreeItem(buffer, networkItem));
+    networkItem->appendChild(bufferItem);
     endInsertRows();
-
-    bufferItem[buffer] = static_cast<BufferTreeItem *>(networkItem->child(nextRow));
-    return index(nextRow, 0, networkItemIndex);
   }
+
+  Q_ASSERT(bufferItem);
+  return index(bufferItem->row(), 0, networkItemIndex);
 }
 
 QStringList BufferTreeModel::mimeTypes() const {
@@ -183,20 +191,20 @@ QMimeData *BufferTreeModel::mimeData(const QModelIndexList &indexes) const {
 }
 
 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"));
   
-  Q_ASSERT(networkItem.contains(network));
+  Q_ASSERT(rootItem->childById(qHash(network)));
 
   if(parent == QModelIndex()) // can't be a query...
     return false;
   
-  Buffer *sourceBuffer = static_cast<BufferTreeItem *>(networkItem[network]->child(sourcerow))->buffer();
+  Buffer *sourceBuffer = static_cast<BufferTreeItem *>(rootItem->childById(qHash(network))->child(sourcerow))->buffer();
   Buffer *targetBuffer = getBufferByIndex(parent);
 
   if(!(sourceBuffer->bufferType() & targetBuffer->bufferType() & Buffer::QueryBuffer)) // only queries can be merged
@@ -205,16 +213,8 @@ 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();
-  bufferItem.remove(getBufferByIndex(parent));
   removeRow(parent.row(), BufferTreeModel::parent(parent));
   
   return true;
@@ -246,14 +246,16 @@ void BufferTreeModel::doubleClickReceived(const QModelIndex &clicked) {
 }
 
 void BufferTreeModel::bufferActivity(Buffer::ActivityLevel level, Buffer *buffer) {
-  if(bufferItem.contains(buffer) and buffer != currentBuffer)
-    bufferItem[buffer]->setActivity(level);
+  BufferTreeItem *bufferItem = static_cast<BufferTreeItem*>(getOrCreateBufferItemIndex(buffer).internalPointer());
+  if(buffer != currentBuffer)
+    bufferItem->setActivity(level);
   else
-    bufferItem[buffer]->setActivity(Buffer::NoActivity);
+    bufferItem->setActivity(Buffer::NoActivity);
   bufferUpdated(buffer);
 }
 
 void BufferTreeModel::selectBuffer(Buffer *buffer) {
   QModelIndex index = getOrCreateBufferItemIndex(buffer);
-  emit selectionChanged(index);
+  //emit selectionChanged(index);
+  changeCurrent(index, QModelIndex());
 }