X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=8c28ac0f700bb2c758c198a119f21b3661024b8a;hb=aebc2f7d1808b4ead2e0370f064ae3935c585840;hp=e01ca09aea8123bca3b70b12ee276a4e82def792;hpb=de2c1a4f9bbae7070cf8fd8247db765a23d28a9c;p=quassel.git diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index e01ca09a..8c28ac0f 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include "action.h" #include "buffermodel.h" @@ -210,13 +211,14 @@ void BufferView::joinChannel(const QModelIndex &index) Client::userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName())); } + void BufferView::keyPressEvent(QKeyEvent *event) { if (event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete) { event->accept(); removeSelectedBuffers(); } - TreeViewTouch::keyPressEvent(event); + TreeViewTouch::keyPressEvent(event); } @@ -228,27 +230,44 @@ void BufferView::dropEvent(QDropEvent *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 TreeViewTouch::dropEvent(event); + // If more than one buffer was being dragged, treat this as a rearrangement instead of a merge request QList > bufferList = Client::networkModel()->mimeDataToBufferList(event->mimeData()); if (bufferList.count() != 1) return TreeViewTouch::dropEvent(event); + // Get the Buffer ID of the buffer that was being dragged BufferId bufferId2 = bufferList[0].second; - if (index.data(NetworkModel::ItemTypeRole) != NetworkModel::BufferItemType) + // Get the Buffer ID of the target buffer + BufferId bufferId1 = index.data(NetworkModel::BufferIdRole).value(); + + // 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::BufferTypeRole) != BufferInfo::QueryBuffer) + // Get index of buffer that was being dragged + QModelIndex index2 = Client::networkModel()->bufferIndex(bufferId2); + + // 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); - BufferId bufferId1 = index.data(NetworkModel::BufferIdRole).value(); - if (bufferId1 == bufferId2) + //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); @@ -287,7 +306,7 @@ void BufferView::removeSelectedBuffers(bool permanently) void BufferView::rowsInserted(const QModelIndex &parent, int start, int end) { - TreeViewTouch::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) @@ -375,11 +394,11 @@ void BufferView::setExpandedState(const QModelIndex &networkIdx) #if QT_VERSION < 0x050000 void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) { - TreeViewTouch::dataChanged(topLeft, bottomRight); + TreeViewTouch::dataChanged(topLeft, bottomRight); #else void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles) { - TreeViewTouch::dataChanged(topLeft, bottomRight, roles); + TreeViewTouch::dataChanged(topLeft, bottomRight, roles); #endif // determine how many items have been changed and if any of them is a networkitem @@ -515,6 +534,30 @@ void BufferView::changeBuffer(Direction direction) selectionModel()->select(resultingIndex, QItemSelectionModel::ClearAndSelect); } +void BufferView::selectFirstBuffer() +{ + int networksCount = model()->rowCount(QModelIndex()); + if (networksCount == 0) { + return; + } + + QModelIndex bufferIndex; + for (int row = 0; row < networksCount; row++) { + QModelIndex networkIndex = model()->index(row, 0, QModelIndex()); + int childCount = model()->rowCount(networkIndex); + if (childCount > 0) { + bufferIndex = model()->index(0, 0, networkIndex); + break; + } + } + + if (!bufferIndex.isValid()) { + return; + } + + selectionModel()->setCurrentIndex(bufferIndex, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows); + selectionModel()->select(bufferIndex, QItemSelectionModel::ClearAndSelect); +} void BufferView::wheelEvent(QWheelEvent *event) { @@ -547,6 +590,16 @@ void BufferView::hideCurrentBuffer() config()->requestRemoveBuffer(bufferId); } +void BufferView::filterTextChanged(QString filterString) +{ + BufferViewFilter *filter = qobject_cast(model()); + if (!filter) { + return; + } + filter->setFilterString(filterString); + on_configChanged(); // make sure collapsation is correct +} + QSize BufferView::sizeHint() const { @@ -630,6 +683,9 @@ bool BufferViewDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, c // ============================== BufferViewDock::BufferViewDock(BufferViewConfig *config, QWidget *parent) : QDockWidget(parent), + _childWidget(0), + _widget(new QWidget(parent)), + _filterEdit(new QLineEdit(parent)), _active(false), _title(config->bufferViewName()) { @@ -637,7 +693,22 @@ BufferViewDock::BufferViewDock(BufferViewConfig *config, QWidget *parent) toggleViewAction()->setData(config->bufferViewId()); setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea); connect(config, SIGNAL(bufferViewNameSet(const QString &)), this, SLOT(bufferViewRenamed(const QString &))); + connect(config, SIGNAL(configChanged()), SLOT(configChanged())); updateTitle(); + + _widget->setLayout(new QVBoxLayout); + _widget->layout()->setSpacing(0); + _widget->layout()->setContentsMargins(0, 0, 0, 0); + + // We need to potentially hide it early, so it doesn't flicker + _filterEdit->setVisible(config->showSearch()); + _filterEdit->setFocusPolicy(Qt::ClickFocus); + _filterEdit->installEventFilter(this); + _filterEdit->setPlaceholderText(tr("Search...")); + connect(_filterEdit, SIGNAL(returnPressed()), SLOT(onFilterReturnPressed())); + + _widget->layout()->addWidget(_filterEdit); + QDockWidget::setWidget(_widget); } @@ -649,17 +720,74 @@ void BufferViewDock::updateTitle() setWindowTitle(title); } +void BufferViewDock::configChanged() +{ + if (_filterEdit->isVisible() != config()->showSearch()) { + _filterEdit->setVisible(config()->showSearch()); + _filterEdit->clear(); + } +} + +void BufferViewDock::onFilterReturnPressed() +{ + if (_oldFocusItem) { + _oldFocusItem->setFocus(); + _oldFocusItem = 0; + } + + if (!config()->showSearch()) { + _filterEdit->setVisible(false); + } + + BufferView *view = bufferView(); + if (!view || _filterEdit->text().isEmpty()) { + return; + } + + view->selectFirstBuffer(); + _filterEdit->clear(); +} void BufferViewDock::setActive(bool active) { if (active != isActive()) { _active = active; updateTitle(); - if (active) + if (active) { raise(); // for tabbed docks + } } } +bool BufferViewDock::eventFilter(QObject *object, QEvent *event) +{ + if (object != _filterEdit) { + return false; + } + + if (event->type() == QEvent::FocusOut) { + if (!config()->showSearch() && _filterEdit->text().isEmpty()) { + _filterEdit->setVisible(false); + return true; + } + } else if (event->type() == QEvent::KeyRelease) { + QKeyEvent *keyEvent = static_cast(event); + if (keyEvent->key() != Qt::Key_Escape) { + return false; + } + + _filterEdit->clear(); + + if (_oldFocusItem) { + _oldFocusItem->setFocus(); + _oldFocusItem = 0; + } + + return true; + } + + return false; +} void BufferViewDock::bufferViewRenamed(const QString &newName) { @@ -690,3 +818,22 @@ BufferViewConfig *BufferViewDock::config() const else return view->config(); } + +void BufferViewDock::setWidget(QWidget *newWidget) +{ + _widget->layout()->addWidget(newWidget); + _childWidget = newWidget; + + connect(_filterEdit, SIGNAL(textChanged(QString)), bufferView(), SLOT(filterTextChanged(QString))); +} + +void BufferViewDock::activateFilter() +{ + if (!_filterEdit->isVisible()) { + _filterEdit->setVisible(true); + } + + _oldFocusItem = qApp->focusWidget(); + + _filterEdit->setFocus(); +}