/***************************************************************************
- * Copyright (C) 2005-2013 by the Quassel Project *
+ * Copyright (C) 2005-2015 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* The TreeView showing the Buffers
*****************************************/
// Please be carefull when reimplementing methods which are used to inform the view about changes to the data
-// to be on the safe side: call QTreeView's method aswell
+// to be on the safe side: call QTreeView's method aswell (or TreeViewTouch's)
BufferView::BufferView(QWidget *parent)
- : QTreeView(parent)
+ : TreeViewTouch(parent)
{
connect(this, SIGNAL(collapsed(const QModelIndex &)), SLOT(storeExpandedState(const QModelIndex &)));
connect(this, SIGNAL(expanded(const QModelIndex &)), SLOT(storeExpandedState(const QModelIndex &)));
{
delete selectionModel();
- QTreeView::setModel(model);
+ TreeViewTouch::setModel(model);
init();
// remove old Actions
QList<QAction *> oldactions = header()->actions();
}
-void BufferView::setSelectionModel(QItemSelectionModel *selectionModel)
-{
- if (QTreeView::selectionModel())
- disconnect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
- model(), SIGNAL(checkPreviousCurrentForRemoval(QModelIndex, QModelIndex)));
-
- QTreeView::setSelectionModel(selectionModel);
- BufferViewFilter *filter = qobject_cast<BufferViewFilter *>(model());
- if (filter) {
- connect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
- filter, SLOT(checkPreviousCurrentForRemoval(QModelIndex, QModelIndex)));
- }
-}
-
-
void BufferView::setConfig(BufferViewConfig *config)
{
if (_config == config)
event->accept();
removeSelectedBuffers();
}
- QTreeView::keyPressEvent(event);
+ TreeViewTouch::keyPressEvent(event);
}
QPoint cursorPos = event->pos();
// check if we're really _on_ the item and not indicating a move to just above or below the item
+ // Magic margin number for this is from QAbstractItemViewPrivate::position()
const int margin = 2;
if (cursorPos.y() - indexRect.top() < margin
|| indexRect.bottom() - cursorPos.y() < margin)
- return QTreeView::dropEvent(event);
+ return TreeViewTouch::dropEvent(event);
+ // If more than one buffer was being dragged, treat this as a rearrangement instead of a merge request
QList<QPair<NetworkId, BufferId> > bufferList = Client::networkModel()->mimeDataToBufferList(event->mimeData());
if (bufferList.count() != 1)
- return QTreeView::dropEvent(event);
+ return TreeViewTouch::dropEvent(event);
- NetworkId networkId = bufferList[0].first;
+ // Get the Buffer ID of the buffer that was being dragged
BufferId bufferId2 = bufferList[0].second;
- if (index.data(NetworkModel::ItemTypeRole) != NetworkModel::BufferItemType)
- return QTreeView::dropEvent(event);
+ // Get the Buffer ID of the target buffer
+ BufferId bufferId1 = index.data(NetworkModel::BufferIdRole).value<BufferId>();
- if (index.data(NetworkModel::BufferTypeRole) != BufferInfo::QueryBuffer)
- return QTreeView::dropEvent(event);
+ // If the source and target are the same buffer, this was an aborted rearrangement
+ if (bufferId1 == bufferId2)
+ return TreeViewTouch::dropEvent(event);
- if (index.data(NetworkModel::NetworkIdRole).value<NetworkId>() != networkId)
- return QTreeView::dropEvent(event);
+ // Get index of buffer that was being dragged
+ QModelIndex index2 = Client::networkModel()->bufferIndex(bufferId2);
- BufferId bufferId1 = index.data(NetworkModel::BufferIdRole).value<BufferId>();
- if (bufferId1 == bufferId2)
- return QTreeView::dropEvent(event);
+ // If the buffer being dragged is a channel and we're still joined to it, treat this as a rearrangement
+ // This prevents us from being joined to a channel with no associated UI elements
+ if (index2.data(NetworkModel::BufferTypeRole) == BufferInfo::ChannelBuffer && index2.data(NetworkModel::ItemActiveRole) == true)
+ return TreeViewTouch::dropEvent(event);
+
+ //If the source buffer is not mergeable(AKA not a Channel and not a Query), try rearranging instead
+ if (index2.data(NetworkModel::BufferTypeRole) != BufferInfo::ChannelBuffer && index2.data(NetworkModel::BufferTypeRole) != BufferInfo::QueryBuffer)
+ return TreeViewTouch::dropEvent(event);
+
+ // If the target buffer is not mergeable(AKA not a Channel and not a Query), try rearranging instead
+ if (index.data(NetworkModel::BufferTypeRole) != BufferInfo::ChannelBuffer && index.data(NetworkModel::BufferTypeRole) != BufferInfo::QueryBuffer)
+ return TreeViewTouch::dropEvent(event);
+ // Confirm that the user really wants to merge the buffers before doing so
int res = QMessageBox::question(0, tr("Merge buffers permanently?"),
tr("Do you want to merge the buffer \"%1\" permanently into buffer \"%2\"?\n This cannot be reversed!").arg(Client::networkModel()->bufferName(bufferId2)).arg(Client::networkModel()->bufferName(bufferId1)),
QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
void BufferView::rowsInserted(const QModelIndex &parent, int start, int end)
{
- QTreeView::rowsInserted(parent, start, end);
+ TreeViewTouch::rowsInserted(parent, start, end);
// ensure that newly inserted network nodes are expanded per default
if (parent.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
storeExpandedState(networkIdx); // this call is needed to keep track of the isActive state
}
-
+#if QT_VERSION < 0x050000
void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
{
- QTreeView::dataChanged(topLeft, bottomRight);
+ TreeViewTouch::dataChanged(topLeft, bottomRight);
+#else
+void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles)
+{
+ TreeViewTouch::dataChanged(topLeft, bottomRight, roles);
+#endif
// determine how many items have been changed and if any of them is a networkitem
// which just swichted from active to inactive or vice versa
void BufferView::wheelEvent(QWheelEvent *event)
{
if (ItemViewSettings().mouseWheelChangesBuffer() == (bool)(event->modifiers() & Qt::AltModifier))
- return QTreeView::wheelEvent(event);
+ return TreeViewTouch::wheelEvent(event);
int rowDelta = (event->delta() > 0) ? -1 : 1;
changeBuffer((Direction)rowDelta);
QSize BufferView::sizeHint() const
{
- return QTreeView::sizeHint();
+ return TreeViewTouch::sizeHint();
if (!model())
- return QTreeView::sizeHint();
+ return TreeViewTouch::sizeHint();
if (model()->rowCount() == 0)
return QSize(120, 50);