X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=87e474ba51dee425e4d5362530b983b53768d910;hp=d4deeea9a5f13e42ac0b0c9a52680aa5064eee8a;hb=4319168202d99ddb5895ae0984b2eb0c30b46952;hpb=e0872cf3b3cdb8c52c5a52f32c3140143a29409d diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index d4deeea9..87e474ba 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -18,14 +18,29 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "client.h" -#include "buffersyncer.h" #include "bufferview.h" -#include "networkmodel.h" + +#include "buffermodel.h" +#include "bufferviewfilter.h" +#include "buffersyncer.h" +#include "client.h" +#include "mappedselectionmodel.h" #include "network.h" +#include "networkmodel.h" #include "uisettings.h" +#include "global.h" + +#include +#include +#include +#include +#include +#include +#include +#include + /***************************************** * The TreeView showing the Buffers *****************************************/ @@ -36,6 +51,8 @@ BufferView::BufferView(QWidget *parent) : QTreeView(parent) { connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(showContextMenu(const QPoint &))); + + setSelectionMode(QAbstractItemView::ExtendedSelection); } void BufferView::init() { @@ -55,20 +72,23 @@ void BufferView::init() { setSortingEnabled(true); sortByColumn(0, Qt::AscendingOrder); +#ifndef Q_WS_QWS + // this is a workaround to not join channels automatically... we need a saner way to navigate for qtopia anyway though, + // such as mark first, activate at second click... connect(this, SIGNAL(activated(QModelIndex)), this, SLOT(joinChannel(QModelIndex))); -} - -void BufferView::setFilteredModel(QAbstractItemModel *model, BufferViewFilter::Modes mode, QList nets) { - BufferViewFilter *filter = new BufferViewFilter(model, mode, nets); - setModel(filter); - connect(this, SIGNAL(removeBuffer(const QModelIndex &)), filter, SLOT(removeBuffer(const QModelIndex &))); +#else + connect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(joinChannel(QModelIndex))); // Qtopia uses single click for activation +#endif } void BufferView::setModel(QAbstractItemModel *model) { delete selectionModel(); + if(QTreeView::model()) { + disconnect(QTreeView::model(), SIGNAL(layoutChanged()), this, SLOT(layoutChanged())); + } + QTreeView::setModel(model); init(); - // remove old Actions QList oldactions = header()->actions(); foreach(QAction *action, oldactions) { @@ -76,6 +96,11 @@ void BufferView::setModel(QAbstractItemModel *model) { action->deleteLater(); } + if(!model) + return; + + connect(model, SIGNAL(layoutChanged()), this, SLOT(layoutChanged())); + QString sectionName; QAction *showSection; for(int i = 1; i < model->columnCount(); i++) { @@ -90,6 +115,73 @@ void BufferView::setModel(QAbstractItemModel *model) { } +void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *config) { + BufferViewFilter *filter = qobject_cast(model()); + if(filter) { + filter->setConfig(config); + setConfig(config); + return; + } + + if(model()) { + disconnect(this, 0, model(), 0); + } + + if(!model_) { + setModel(model_); + } else { + BufferViewFilter *filter = new BufferViewFilter(model_, config); + setModel(filter); + connect(this, SIGNAL(removeBuffer(const QModelIndex &)), + filter, SLOT(removeBuffer(const QModelIndex &))); + } + setConfig(config); +} + +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(model()); + if(filter) { + connect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)), + filter, SLOT(checkPreviousCurrentForRemoval(QModelIndex, QModelIndex))); + } +} + +void BufferView::setConfig(BufferViewConfig *config) { + if(_config == config) + return; + + if(_config) { + disconnect(_config, 0, this, 0); + } + + _config = config; + if(config) { + connect(config, SIGNAL(networkIdSet(const NetworkId &)), this, SLOT(setRootIndexForNetworkId(const NetworkId &))); + setRootIndexForNetworkId(config->networkId()); + } else { + setRootIndex(QModelIndex()); + } +} + +void BufferView::setRootIndexForNetworkId(const NetworkId &networkId) { + if(!networkId.isValid() || !model()) { + setRootIndex(QModelIndex()); + } else { + int networkCount = model()->rowCount(); + QModelIndex child; + for(int i = 0; i < networkCount; i++) { + child = model()->index(i, 0); + if(networkId == model()->data(child, NetworkModel::NetworkIdRole).value()) + setRootIndex(child); + } + } +} + void BufferView::joinChannel(const QModelIndex &index) { BufferInfo::Type bufferType = (BufferInfo::Type)index.data(NetworkModel::BufferTypeRole).value(); @@ -104,24 +196,59 @@ void BufferView::joinChannel(const QModelIndex &index) { void BufferView::keyPressEvent(QKeyEvent *event) { if(event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete) { event->accept(); - QModelIndex index = selectionModel()->selectedIndexes().first(); - if(index.isValid()) { + removeSelectedBuffers(); + } + QTreeView::keyPressEvent(event); +} + +void BufferView::removeSelectedBuffers() { + QSet removedRows; + foreach(QModelIndex index, selectionModel()->selectedIndexes()) { + if(index.data(NetworkModel::ItemTypeRole) == NetworkModel::BufferItemType && !removedRows.contains(index.row())) { + removedRows << index.row(); emit removeBuffer(index); } } - QTreeView::keyPressEvent(event); } -// ensure that newly inserted network nodes are expanded per default void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) { QTreeView::rowsInserted(parent, start, end); - if(model()->rowCount(parent) == 1 && parent.data(NetworkModel::ItemTypeRole) == NetworkModel::NetworkItemType && parent.data(NetworkModel::ItemActiveRole) == true) { + + // ensure that newly inserted network nodes are expanded per default + if(parent.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType) + return; + + if(model()->rowCount(parent) == 1 && parent.data(NetworkModel::ItemActiveRole) == true) { // without updating the parent the expand will have no effect... Qt Bug? - update(parent); + update(parent); expand(parent); } } +void BufferView::layoutChanged() { + Q_ASSERT(model()); + + // expand all active networks + QModelIndex networkIdx; + for(int row = 0; row < model()->rowCount(); row++) { + networkIdx = model()->index(row, 0); + update(networkIdx); + if(model()->rowCount(networkIdx) > 0 && model()->data(networkIdx, NetworkModel::ItemActiveRole) == true) { + expand(networkIdx); + } else { + collapse(networkIdx); + } + } + + // update selection to current one + MappedSelectionModel *mappedSelectionModel = qobject_cast(selectionModel()); + if(!config() || !mappedSelectionModel) + return; + + mappedSelectionModel->mappedSetCurrentIndex(Client::bufferModel()->standardSelectionModel()->currentIndex(), QItemSelectionModel::Current); + mappedSelectionModel->mappedSelect(Client::bufferModel()->standardSelectionModel()->selection(), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows); +} + void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) { QTreeView::dataChanged(topLeft, bottomRight); @@ -136,12 +263,11 @@ void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bott continue; bool isActive = networkIdx.data(NetworkModel::ItemActiveRole).toBool(); - if(isExpanded(networkIdx) != isActive) - setExpanded(networkIdx, isActive); + if(isExpanded(networkIdx) != isActive) setExpanded(networkIdx, isActive); } } - + void BufferView::toggleHeader(bool checked) { QAction *action = qobject_cast(sender()); header()->setSectionHidden((action->property("column")).toInt(), !checked); @@ -157,6 +283,8 @@ void BufferView::showContextMenu(const QPoint &pos) { QAction *joinBufferAction = new QAction(tr("Join"), this); QAction *partBufferAction = new QAction(tr("Part"), this); + QAction *hideBufferAction = new QAction(tr("Remove buffers"), this); + hideBufferAction->setToolTip(tr("Removes the selected buffers from a custom view but leaves the buffer itself untouched")); QAction *removeBufferAction = new QAction(tr("Delete buffer"), this); QMenu *hideEventsMenu = new QMenu(tr("Hide Events"), this); @@ -197,6 +325,8 @@ void BufferView::showContextMenu(const QPoint &pos) { if(bufferInfo.type() != BufferInfo::ChannelBuffer && bufferInfo.type() != BufferInfo::QueryBuffer) return; contextMenu.addAction(joinBufferAction); contextMenu.addAction(partBufferAction); + if(config()) + contextMenu.addAction(hideBufferAction); contextMenu.addAction(removeBufferAction); contextMenu.addMenu(hideEventsMenu); contextMenu.addAction(ignoreListAction); @@ -227,24 +357,27 @@ void BufferView::showContextMenu(const QPoint &pos) { network->requestDisconnect(); } else if(result == joinChannelAction) { + // FIXME no QInputDialog in Qtopia +#ifndef Q_WS_QWS bool ok; QString channelName = QInputDialog::getText(this, tr("Join Channel"), tr("Input channel name:"),QLineEdit::Normal, QDir::home().dirName(), &ok); + if (ok && !channelName.isEmpty()) { - const Buffer *statusbuffer = Client::instance()->statusBuffer(index.data(NetworkModel::NetworkIdRole).value()); - if(statusbuffer) { - Client::instance()->userInput(statusbuffer->bufferInfo(), QString("/J %1").arg(channelName)); + BufferInfo bufferInfo = index.child(0,0).data(NetworkModel::BufferInfoRole).value(); + if(bufferInfo.isValid()) { + Client::instance()->userInput(bufferInfo, QString("/J %1").arg(channelName)); } } - } else - if(result == joinBufferAction) { +#endif + } else if(result == joinBufferAction) { Client::instance()->userInput(bufferInfo, QString("/JOIN %1").arg(channelname)); - } else - if(result == partBufferAction) { + } else if(result == partBufferAction) { Client::instance()->userInput(bufferInfo, QString("/PART %1").arg(channelname)); - } else - if(result == removeBufferAction) { + } else if(result == hideBufferAction) { + removeSelectedBuffers(); + } else if(result == removeBufferAction) { int res = QMessageBox::question(this, tr("Remove buffer permanently?"), tr("Do you want to delete the buffer \"%1\" permanently? This will delete all related data, including all backlog " "data, from the core's database!").arg(bufferInfo.bufferName()), @@ -258,37 +391,37 @@ void BufferView::showContextMenu(const QPoint &pos) { } } -void BufferView::wheelEvent(QWheelEvent* event) -{ - UiSettings s; - if(s.value("MouseWheelChangesBuffers",QVariant(true)).toBool()) { - int rowDelta = ( event->delta() > 0 ) ? -1 : 1; - QModelIndex currentIndex = selectionModel()->currentIndex(); - QModelIndex resultingIndex; - if( model()->hasIndex( currentIndex.row() + rowDelta, currentIndex.column(), currentIndex.parent() ) ) +void BufferView::wheelEvent(QWheelEvent* event) { + if(UiSettings().value("MouseWheelChangesBuffers", QVariant(true)).toBool() == (bool)(event->modifiers() & Qt::AltModifier)) + return QTreeView::wheelEvent(event); + + int rowDelta = ( event->delta() > 0 ) ? -1 : 1; + QModelIndex currentIndex = selectionModel()->currentIndex(); + QModelIndex resultingIndex; + if( model()->hasIndex( currentIndex.row() + rowDelta, currentIndex.column(), currentIndex.parent() ) ) { - resultingIndex = currentIndex.sibling( currentIndex.row() + rowDelta, currentIndex.column() ); + resultingIndex = currentIndex.sibling( currentIndex.row() + rowDelta, currentIndex.column() ); } else //if we scroll into a the parent node... - { + { QModelIndex parent = currentIndex.parent(); QModelIndex aunt = parent.sibling( parent.row() + rowDelta, parent.column() ); if( rowDelta == -1 ) - resultingIndex = aunt.child( model()->rowCount( aunt ) - 1, 0 ); + resultingIndex = aunt.child( model()->rowCount( aunt ) - 1, 0 ); else - resultingIndex = aunt.child( 0, 0 ); + resultingIndex = aunt.child( 0, 0 ); if( !resultingIndex.isValid() ) - return; - } - selectionModel()->setCurrentIndex( resultingIndex, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows ); - selectionModel()->select( resultingIndex, QItemSelectionModel::ClearAndSelect ); - } else { - QAbstractScrollArea::wheelEvent(event); - } + return; + } + selectionModel()->setCurrentIndex( resultingIndex, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows ); + selectionModel()->select( resultingIndex, QItemSelectionModel::ClearAndSelect ); + } QSize BufferView::sizeHint() const { + return QTreeView::sizeHint(); + if(!model()) return QTreeView::sizeHint(); @@ -302,3 +435,28 @@ QSize BufferView::sizeHint() const { } return QSize(columnSize, 50); } + +// ============================== +// BufferView Dock +// ============================== +BufferViewDock::BufferViewDock(BufferViewConfig *config, QWidget *parent) + : QDockWidget(config->bufferViewName(), parent) +{ + setObjectName("BufferViewDock-" + QString::number(config->bufferViewId())); + toggleViewAction()->setData(config->bufferViewId()); + setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea); + 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); +}