X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fuisupport%2Fbufferview.cpp;h=b879acd3d2a217115b737a93e116e26eba960899;hb=52cb14f784374a0739a3c7d029a687dcb5b377e9;hp=f002405c61fa0a0b387f254ae385655c82ef9656;hpb=3545504d0588f79ac92a7702c4cf78dc0adff05f;p=quassel.git

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index f002405c..b879acd3 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -517,6 +517,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)
 {
@@ -658,8 +682,14 @@ BufferViewDock::BufferViewDock(BufferViewConfig *config, QWidget *parent)
     _widget->setLayout(new QVBoxLayout);
     _widget->layout()->setSpacing(0);
     _widget->layout()->setContentsMargins(0, 0, 0, 0);
-    _filterEdit->setVisible(config->showSearch()); // hide it here, so we don't flicker or somesuch
+
+    // 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);
 }
@@ -675,11 +705,30 @@ void BufferViewDock::updateTitle()
 
 void BufferViewDock::configChanged()
 {
-    _filterEdit->setVisible(config()->showSearch());
+    if (_filterEdit->isVisible() != config()->showSearch()) {
+        _filterEdit->setVisible(config()->showSearch());
+        _filterEdit->clear();
+    }
+}
+
+void BufferViewDock::onFilterReturnPressed()
+{
+    if (_oldFocusItem) {
+        _oldFocusItem->setFocus();
+        _oldFocusItem = 0;
+    }
 
-    if (!_filterEdit->isVisible()) {
-        _filterEdit->setText(QLatin1String(""));
+    if (!config()->showSearch()) {
+        _filterEdit->setVisible(false);
     }
+
+    BufferView *view = bufferView();
+    if (!view || _filterEdit->text().isEmpty()) {
+        return;
+    }
+
+    view->selectFirstBuffer();
+    _filterEdit->clear();
 }
 
 void BufferViewDock::setActive(bool active)
@@ -687,11 +736,41 @@ 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<QKeyEvent*>(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)
 {
@@ -730,3 +809,14 @@ void BufferViewDock::setWidget(QWidget *newWidget)
 
     connect(_filterEdit, SIGNAL(textChanged(QString)), bufferView(), SLOT(filterTextChanged(QString)));
 }
+
+void BufferViewDock::activateFilter()
+{
+    if (!_filterEdit->isVisible()) {
+        _filterEdit->setVisible(true);
+    }
+
+    _oldFocusItem = qApp->focusWidget();
+
+    _filterEdit->setFocus();
+}