#include <QColor> // FIXME Dependency on QtGui!
-#include "global.h"
+#include "clientproxy.h"
#include "buffertreemodel.h"
/*****************************************
activity = Buffer::NoActivity;
}
+uint BufferTreeItem::id() const {
+ return buf->bufferId().uid();
+}
+
void BufferTreeItem::setActivity(const Buffer::ActivityLevel &level) {
activity = level;
}
}
}
-QColor BufferTreeItem::foreground(int column) const {
+QColor BufferTreeItem::foreground(int /*column*/) const {
// for the time beeing we ignore the column :)
if(activity & Buffer::Highlight) {
return QColor(Qt::red);
return text(column);
case Qt::ForegroundRole:
return foreground(column);
+ case BufferTreeModel::BufferNameRole:
+ return buf->bufferName();
case BufferTreeModel::BufferTypeRole:
return buf->bufferType();
case BufferTreeModel::BufferActiveRole:
return buf->isActive();
+ case BufferTreeModel::BufferIdRole:
+ return buf->bufferId().uid();
default:
return QVariant();
}
}
+/*****************************************
+* Network Items
+*****************************************/
+NetworkTreeItem::NetworkTreeItem(const QString &network, TreeItem *parent) : TreeItem(parent) {
+ net = network;
+ itemData << net << "";
+}
+
+uint NetworkTreeItem::id() const {
+ return qHash(net);
+}
+
+
+
/*****************************************
* BufferTreeModel
*****************************************/
BufferTreeModel::BufferTreeModel(QObject *parent) : TreeModel(BufferTreeModel::defaultHeader(), parent) {
- connect(this, SIGNAL(fakeUserInput(BufferId, QString)), ClientProxy::instance(), SLOT(gsUserInput(BufferId, QString)));
+ connect(this, SIGNAL(fakeUserInput(BufferId, QString)),
+ ClientProxy::instance(), SLOT(gsUserInput(BufferId, QString)));
}
QList<QVariant >BufferTreeModel::defaultHeader() {
Qt::ItemFlags BufferTreeModel::flags(const QModelIndex &index) const {
if(!index.isValid())
- return 0;
+ return Qt::ItemIsDropEnabled;
+ //return 0;
// I think this is pretty ugly..
if(isBufferIndex(index)) {
if(buffer->bufferType() == Buffer::QueryBuffer)
return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
else
- return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+ 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(networkItem.contains(net)) {
- return index(networkItem[net]->row(), 0);
- } else {
- QList<QVariant> data;
- data << net << "";
-
+ 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 {
QStringList types;
types << "application/Quassel/BufferItem/row"
- << "application/Quassel/BufferItem/network";
+ << "application/Quassel/BufferItem/network"
+ << "application/Quassel/BufferItem/bufferId";
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()));
return mimeData;
}
-bool BufferTreeModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) {
+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...
+
int sourcerow = data->data("application/Quassel/BufferItem/row").toInt();
QString network = QString::fromUtf8(data->data("application/Quassel/BufferItem/network"));
- if(!networkItem.contains(network))
- return false;
+ Q_ASSERT(rootItem->childById(qHash(network)));
- if(!isBufferIndex(parent)) // dropping at a network -> no merging needed
+ 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
+ return false;
if(sourceBuffer == targetBuffer) // we won't merge with ourself :)
return false;
-
+
/*
if(QMessageBox::warning(static_cast<QWidget *>(QObject::parent()),
tr("Merge Buffers?"),
*/
qDebug() << "merging" << sourceBuffer->bufferName() << "with" << targetBuffer->bufferName();
- bufferItem.remove(getBufferByIndex(parent));
removeRow(parent.row(), BufferTreeModel::parent(parent));
return true;
}
// This Slot indicates that the user has selected a different buffer in the gui
-void BufferTreeModel::changeCurrent(const QModelIndex ¤t, const QModelIndex &previous) {
+void BufferTreeModel::changeCurrent(const QModelIndex ¤t, const QModelIndex &/*previous*/) {
if(isBufferIndex(current)) {
currentBuffer = getBufferByIndex(current);
bufferActivity(Buffer::NoActivity, currentBuffer);
emit bufferSelected(currentBuffer);
- emit updateSelection(current, QItemSelectionModel::ClearAndSelect);
+ emit selectionChanged(current);
}
}
if(!buffer->isStatusBuffer())
emit fakeUserInput(buffer->bufferId(), QString("/join " + buffer->bufferName()));
}
-
}
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 updateSelection(index, QItemSelectionModel::ClearAndSelect);
+ emit selectionChanged(index);
}
+
+
projects / quassel.git / blobdiff