X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffertreemodel.cpp;h=93c9063b025733009bba41b033fdcb481d4d003d;hp=e1b52668c78b370ac05b2c80a4d4639c3f53904e;hb=ef0e65458bf4e1cbc01399fe0e025a5b4fd327dc;hpb=012df68ce8a743a71bfe3beda529a21c02daddb6 diff --git a/src/client/buffertreemodel.cpp b/src/client/buffertreemodel.cpp index e1b52668..93c9063b 100644 --- a/src/client/buffertreemodel.cpp +++ b/src/client/buffertreemodel.cpp @@ -20,9 +20,15 @@ #include // FIXME Dependency on QtGui! -#include "clientproxy.h" #include "buffertreemodel.h" +#include "mappedselectionmodel.h" +#include + +#include "bufferinfo.h" +#include "client.h" +#include "signalproxy.h" + /***************************************** * Fancy Buffer Items *****************************************/ @@ -32,7 +38,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) { @@ -76,16 +82,24 @@ QVariant BufferTreeItem::data(int column, int role) const { case BufferTreeModel::BufferNameRole: return buf->bufferName(); case BufferTreeModel::BufferTypeRole: - return buf->bufferType(); + return int(buf->bufferType()); case BufferTreeModel::BufferActiveRole: return buf->isActive(); - case BufferTreeModel::BufferIdRole: - return buf->bufferId().uid(); + case BufferTreeModel::BufferUidRole: + 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::QueryType) + flags |= Qt::ItemIsDropEnabled; + + return flags; +} + /***************************************** * Network Items *****************************************/ @@ -98,14 +112,27 @@ 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), + _selectionModelSynchronizer(new SelectionModelSynchronizer(this)), + _propertyMapper(new ModelPropertyMapper(this)) +{ + rootItem->setFlags(rootItem->flags() | Qt::ItemIsDropEnabled); + _propertyMapper->setModel(this); + delete _propertyMapper->selectionModel(); + MappedSelectionModel *mappedSelectionModel = new MappedSelectionModel(this); + _propertyMapper->setSelectionModel(mappedSelectionModel); + synchronizeSelectionModel(mappedSelectionModel); + + connect(_selectionModelSynchronizer, SIGNAL(setCurrentIndex(QModelIndex, QItemSelectionModel::SelectionFlags)), + this, SLOT(setCurrentIndex(QModelIndex, QItemSelectionModel::SelectionFlags))); } QListBufferTreeModel::defaultHeader() { @@ -114,22 +141,20 @@ QListBufferTreeModel::defaultHeader() { return data; } +void BufferTreeModel::synchronizeSelectionModel(MappedSelectionModel *selectionModel) { + selectionModelSynchronizer()->addSelectionModel(selectionModel); +} -Qt::ItemFlags BufferTreeModel::flags(const QModelIndex &index) const { - if(!index.isValid()) - return Qt::ItemIsDropEnabled; - //return 0; +void BufferTreeModel::synchronizeView(QAbstractItemView *view) { + MappedSelectionModel *mappedSelectionModel = new MappedSelectionModel(view->model()); + selectionModelSynchronizer()->addSelectionModel(mappedSelectionModel); + Q_ASSERT(mappedSelectionModel); + delete view->selectionModel(); + view->setSelectionModel(mappedSelectionModel); +} - // 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; - } +void BufferTreeModel::mapProperty(int column, int role, QObject *target, const QByteArray &property) { + propertyMapper()->addMapping(column, role, target, property); } bool BufferTreeModel::isBufferIndex(const QModelIndex &index) const { @@ -145,8 +170,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 +189,7 @@ QModelIndex BufferTreeModel::getOrCreateBufferItemIndex(Buffer *buffer) { NetworkTreeItem *networkItem = static_cast(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 +206,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 +217,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")); @@ -213,20 +238,13 @@ bool BufferTreeModel::dropMimeData(const QMimeData *data, Qt::DropAction /*actio Buffer *sourceBuffer = static_cast(rootItem->childById(qHash(network))->child(sourcerow))->buffer(); Buffer *targetBuffer = getBufferByIndex(parent); - if(!(sourceBuffer->bufferType() & targetBuffer->bufferType() & Buffer::QueryBuffer)) // only queries can be merged + if(!(sourceBuffer->bufferType() & targetBuffer->bufferType() & Buffer::QueryType)) // only queries can be merged return false; if(sourceBuffer == targetBuffer) // we won't merge with ourself :) return false; - /* - if(QMessageBox::warning(static_cast(QObject::parent()), - tr("Merge Buffers?"), - tr("Do you really want to merge the following Buffers?
%1.%2
%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)); @@ -240,21 +258,13 @@ void BufferTreeModel::bufferUpdated(Buffer *buffer) { } // This Slot indicates that the user has selected a different buffer in the gui -void BufferTreeModel::changeCurrent(const QModelIndex ¤t, const QModelIndex &/*previous*/) { - if(isBufferIndex(current)) { - currentBuffer = getBufferByIndex(current); +void BufferTreeModel::setCurrentIndex(const QModelIndex &index, QItemSelectionModel::SelectionFlags command) { + Q_UNUSED(command) + if(isBufferIndex(index)) { + currentBuffer = getBufferByIndex(index); bufferActivity(Buffer::NoActivity, currentBuffer); emit bufferSelected(currentBuffer); - emit selectionChanged(current); - } -} - -// we received a double click on a buffer, so we're going to join it -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 selectionChanged(index); } } @@ -269,7 +279,6 @@ void BufferTreeModel::bufferActivity(Buffer::ActivityLevel level, Buffer *buffer void BufferTreeModel::selectBuffer(Buffer *buffer) { QModelIndex index = getOrCreateBufferItemIndex(buffer); - emit selectionChanged(index); + // SUPER UGLY! + setCurrentIndex(index, 0); } - -