X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=180db0da1c658a6af9384ce0a926872fc44ed571;hp=8c26056b1115486dff15ba56e038337c1982d23a;hb=29b3fd2d4ee33d8bc72ef28982e5a6e963892991;hpb=d69da0b56103c347107fb490008b5c6b0d59e3df diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index 8c26056b..180db0da 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -18,14 +18,28 @@ * 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 + /***************************************** * The TreeView showing the Buffers *****************************************/ @@ -55,20 +69,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 +93,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 +112,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(); @@ -102,26 +191,54 @@ void BufferView::joinChannel(const QModelIndex &index) { } void BufferView::keyPressEvent(QKeyEvent *event) { - if(event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete) { + if((event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete) && !selectionModel()->selectedIndexes().isEmpty()) { event->accept(); QModelIndex index = selectionModel()->selectedIndexes().first(); - if(index.isValid()) { + if(index.isValid() && index.data(NetworkModel::ItemTypeRole) == NetworkModel::BufferItemType) { 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 +253,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); @@ -227,16 +343,20 @@ 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()) { BufferInfo bufferInfo = index.child(0,0).data(NetworkModel::BufferInfoRole).value(); if(bufferInfo.isValid()) { Client::instance()->userInput(bufferInfo, QString("/J %1").arg(channelName)); } } +#endif } else if(result == joinBufferAction) { Client::instance()->userInput(bufferInfo, QString("/JOIN %1").arg(channelname)); @@ -287,6 +407,8 @@ void BufferView::wheelEvent(QWheelEvent* event) { QSize BufferView::sizeHint() const { + return QTreeView::sizeHint(); + if(!model()) return QTreeView::sizeHint(); @@ -300,3 +422,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); +}