#include <QColor> // FIXME Dependency on QtGui!
-#include "clientproxy.h"
#include "buffertreemodel.h"
+#include "bufferinfo.h"
+#include "client.h"
+#include "signalproxy.h"
+
/*****************************************
* Fancy Buffer Items
*****************************************/
}
uint BufferTreeItem::id() const {
- return buf->bufferId().uid();
+ return buf->bufferInfo().uid();
}
void BufferTreeItem::setActivity(const Buffer::ActivityLevel &level) {
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
*****************************************/
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() {
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();
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);
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);
QStringList types;
types << "application/Quassel/BufferItem/row"
<< "application/Quassel/BufferItem/network"
- << "application/Quassel/BufferItem/bufferId";
+ << "application/Quassel/BufferItem/bufferInfo";
return types;
}
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"));
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));
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()));
}
}
void BufferTreeModel::selectBuffer(Buffer *buffer) {
QModelIndex index = getOrCreateBufferItemIndex(buffer);
- emit selectionChanged(index);
+ //emit selectionChanged(index);
+ changeCurrent(index, QModelIndex());
}
-
-