/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel Project *
+ * Copyright (C) 2005-09 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "buffersyncer.h"
#include "client.h"
#include "iconloader.h"
-#include "mappedselectionmodel.h"
#include "network.h"
#include "networkmodel.h"
#include "networkmodelactionprovider.h"
BufferView::BufferView(QWidget *parent)
: QTreeView(parent)
{
- connect(this, SIGNAL(collapsed(const QModelIndex &)), SLOT(on_collapse(const QModelIndex &)));
- connect(this, SIGNAL(expanded(const QModelIndex &)), SLOT(on_expand(const QModelIndex &)));
+ connect(this, SIGNAL(collapsed(const QModelIndex &)), SLOT(storeExpandedState(const QModelIndex &)));
+ connect(this, SIGNAL(expanded(const QModelIndex &)), SLOT(storeExpandedState(const QModelIndex &)));
setSelectionMode(QAbstractItemView::ExtendedSelection);
header()->setContextMenuPolicy(Qt::ActionsContextMenu);
hideColumn(1);
hideColumn(2);
- setIndentation(5);
+ setIndentation(10);
expandAll();
setAnimated(true);
connect(config, SIGNAL(networkIdSet(const NetworkId &)), this, SLOT(setRootIndexForNetworkId(const NetworkId &)));
setRootIndexForNetworkId(config->networkId());
} else {
+ setIndentation(10);
setRootIndex(QModelIndex());
}
}
void BufferView::setRootIndexForNetworkId(const NetworkId &networkId) {
if(!networkId.isValid() || !model()) {
+ setIndentation(10);
setRootIndex(QModelIndex());
} else {
+ setIndentation(5);
int networkCount = model()->rowCount();
QModelIndex child;
for(int i = 0; i < networkCount; i++) {
}
void BufferView::dropEvent(QDropEvent *event) {
- QList< QPair<NetworkId, BufferId> > bufferList = Client::networkModel()->mimeDataToBufferList(event->mimeData());
+ QModelIndex index = indexAt(event->pos());
+
+ QRect indexRect = visualRect(index);
+ QPoint cursorPos = event->pos();
+
+ // check if we're really _on_ the item and not indicating a move to just above or below the item
+ const int margin = 2;
+ if(cursorPos.y() - indexRect.top() < margin
+ || indexRect.bottom() - cursorPos.y() < margin)
+ return QTreeView::dropEvent(event);
+ QList< QPair<NetworkId, BufferId> > bufferList = Client::networkModel()->mimeDataToBufferList(event->mimeData());
if(bufferList.count() != 1)
return QTreeView::dropEvent(event);
NetworkId networkId = bufferList[0].first;
BufferId bufferId2 = bufferList[0].second;
- QModelIndex index = indexAt(event->pos());
if(index.data(NetworkModel::ItemTypeRole) != NetworkModel::BufferItemType)
- return;
+ return QTreeView::dropEvent(event);
if(index.data(NetworkModel::BufferTypeRole) != BufferInfo::QueryBuffer)
- return;
+ return QTreeView::dropEvent(event);
if(index.data(NetworkModel::NetworkIdRole).value<NetworkId>() != networkId)
- return;
+ return QTreeView::dropEvent(event);
BufferId bufferId1 = index.data(NetworkModel::BufferIdRole).value<BufferId>();
if(bufferId1 == bufferId2)
- return;
+ return QTreeView::dropEvent(event);
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)),
continue;
update(networkIdx);
-
- bool expandNetwork = false;
- if(_expandedState.contains(networkId))
- expandNetwork = _expandedState[networkId];
- else
- expandNetwork = model()->data(networkIdx, NetworkModel::ItemActiveRole).toBool();
-
- if(expandNetwork)
- expand(networkIdx);
- else
- collapse(networkIdx);
+ setExpandedState(networkIdx);
}
- // update selection to current one
- MappedSelectionModel *mappedSelectionModel = qobject_cast<MappedSelectionModel *>(selectionModel());
- if(!config() || !mappedSelectionModel)
- return;
+ if(config()) {
+ // update selection to current one
+ Client::bufferModel()->synchronizeView(this);
+ }
- mappedSelectionModel->mappedSetCurrentIndex(Client::bufferModel()->standardSelectionModel()->currentIndex(), QItemSelectionModel::Current);
- mappedSelectionModel->mappedSelect(Client::bufferModel()->standardSelectionModel()->selection(), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+ return;
}
-void BufferView::on_collapse(const QModelIndex &index) {
- storeExpandedState(index.data(NetworkModel::NetworkIdRole).value<NetworkId>(), false);
-}
+void BufferView::storeExpandedState(const QModelIndex &networkIdx) {
+ NetworkId networkId = model()->data(networkIdx, NetworkModel::NetworkIdRole).value<NetworkId>();
+
+ int oldState = 0;
+ if(isExpanded(networkIdx))
+ oldState |= WasExpanded;
+ if(model()->data(networkIdx, NetworkModel::ItemActiveRole).toBool())
+ oldState |= WasActive;
-void BufferView::on_expand(const QModelIndex &index) {
- storeExpandedState(index.data(NetworkModel::NetworkIdRole).value<NetworkId>(), true);
+ _expandedState[networkId] = oldState;
}
-void BufferView::storeExpandedState(NetworkId networkId, bool expanded) {
- _expandedState[networkId] = expanded;
+void BufferView::setExpandedState(const QModelIndex &networkIdx) {
+ if(model()->data(networkIdx, NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
+ return;
+
+ if(model()->rowCount(networkIdx) == 0)
+ return;
+
+ NetworkId networkId = model()->data(networkIdx, NetworkModel::NetworkIdRole).value<NetworkId>();
+
+ bool networkActive = model()->data(networkIdx, NetworkModel::ItemActiveRole).toBool();
+ bool expandNetwork = networkActive;
+ if(_expandedState.contains(networkId)) {
+ int oldState = _expandedState[networkId];
+ if((bool)(oldState & WasActive) == networkActive)
+ expandNetwork = (bool)(oldState & WasExpanded);
+ }
+
+ storeExpandedState(networkIdx); // this call is needed to keep track of the isActive state
+ if(expandNetwork != isExpanded(networkIdx))
+ setExpanded(networkIdx, expandNetwork);
}
void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
for(int i = topLeft.row(); i <= bottomRight.row(); i++) {
QModelIndex networkIdx = topLeft.sibling(i, 0);
- if(model()->rowCount(networkIdx) == 0)
- continue;
-
- bool isActive = networkIdx.data(NetworkModel::ItemActiveRole).toBool();
-#ifdef SPUTDEV
- if(isExpanded(networkIdx) != isActive) setExpanded(networkIdx, true);
-#else
- if(isExpanded(networkIdx) != isActive) setExpanded(networkIdx, isActive);
-#endif
+ setExpandedState(networkIdx);
}
}
}
void BufferView::addActionsToMenu(QMenu *contextMenu, const QModelIndex &index) {
- Client::mainUi()->actionProvider()->addActions(contextMenu, index, this, "menuActionTriggered", (bool)config());
+ QModelIndexList indexList = selectedIndexes();
+ // make sure the item we clicked on is first
+ indexList.removeAll(index);
+ indexList.prepend(index);
+
+ Client::mainUi()->actionProvider()->addActions(contextMenu, indexList, this, "menuActionTriggered", (bool)config());
}
void BufferView::addFilterActions(QMenu *contextMenu, const QModelIndex &index) {
connect(config, SIGNAL(bufferViewNameSet(const QString &)), this, SLOT(bufferViewRenamed(const QString &)));
}
-BufferViewDock::BufferViewDock(QWidget *parent)
- : QDockWidget(tr("All Buffers"), parent)
-{
- setObjectName("BufferViewDock--1");
- toggleViewAction()->setData((int)-1);
- setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
-}
-
void BufferViewDock::bufferViewRenamed(const QString &newName) {
setWindowTitle(newName);
toggleViewAction()->setText(newName);
projects / quassel.git / blobdiff