X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/a05db2f0d081a67f306141e2f31442eea49dd71b..dd07a327:/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp

diff --git a/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp b/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp
index 38154864b..afc3bb071 100644
--- a/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp
+++ b/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp
@@ -1,33 +1,16 @@
-/***************************************************************************
- * Copyright (C) 2011 by Tirtha Chatterjee <tirtha.p.chatterjee@gmail.com> *
- *                                                                         *
- *   Based on the Itemviews NG project from Trolltech Labs:                *
- *   http://qt.gitorious.org/qt-labs/itemviews-ng                          *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2011 Tirtha Chatterjee <tirtha.p.chatterjee@gmail.com>
+ *
+ * Based on the Itemviews NG project from Trolltech Labs
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "kitemlistkeyboardsearchmanager.h"
 
-#include <QApplication>
-#include <QElapsedTimer>
-
-KItemListKeyboardSearchManager::KItemListKeyboardSearchManager(QObject* parent) :
-    QObject(parent),
-    m_timeout(1000)
+KItemListKeyboardSearchManager::KItemListKeyboardSearchManager(QObject *parent)
+    : QObject(parent)
+    , m_timeout(1000)
 {
     m_keyboardInputTime.invalidate();
 }
@@ -36,16 +19,32 @@ KItemListKeyboardSearchManager::~KItemListKeyboardSearchManager()
 {
 }
 
-void KItemListKeyboardSearchManager::addKeys(const QString& keys)
+bool KItemListKeyboardSearchManager::shouldClearSearchIfInputTimeReached()
 {
     const bool keyboardTimeWasValid = m_keyboardInputTime.isValid();
     const qint64 keyboardInputTimeElapsed = m_keyboardInputTime.restart();
-    if (keyboardInputTimeElapsed > m_timeout || !keyboardTimeWasValid) {
+    return (keyboardInputTimeElapsed > m_timeout) || !keyboardTimeWasValid;
+}
+
+bool KItemListKeyboardSearchManager::isSearchAsYouTypeActive() const
+{
+    return !m_searchedString.isEmpty() && !m_keyboardInputTime.hasExpired(m_timeout);
+}
+
+void KItemListKeyboardSearchManager::addKeys(const QString &keys)
+{
+    if (shouldClearSearchIfInputTimeReached()) {
         m_searchedString.clear();
     }
 
     const bool newSearch = m_searchedString.isEmpty();
 
+    // Do not start a new search if the user pressed Space. Only add
+    // it to the search string if a search is in progress already.
+    if (newSearch && keys == QLatin1Char(' ')) {
+        return;
+    }
+
     if (!keys.isEmpty()) {
         m_searchedString.append(keys);
 
@@ -59,7 +58,7 @@ void KItemListKeyboardSearchManager::addKeys(const QString& keys)
         // 2. a 'repeated key' search is done.
         const bool searchFromNextItem = newSearch || sameKey;
 
-        emit changeCurrentItem(sameKey ? firstKey : m_searchedString, searchFromNextItem);
+        Q_EMIT changeCurrentItem(sameKey ? firstKey : m_searchedString, searchFromNextItem);
     }
     m_keyboardInputTime.start();
 }
@@ -81,10 +80,20 @@ void KItemListKeyboardSearchManager::cancelSearch()
 
 void KItemListKeyboardSearchManager::slotCurrentChanged(int current, int previous)
 {
-    Q_UNUSED(previous);
+    Q_UNUSED(previous)
 
     if (current < 0) {
         // The current item has been removed. We should cancel the search.
         cancelSearch();
     }
 }
+
+void KItemListKeyboardSearchManager::slotSelectionChanged(const KItemSet &current, const KItemSet &previous)
+{
+    if (!previous.isEmpty() && current.isEmpty() && previous.count() > 0 && current.count() == 0) {
+        // The selection has been emptied. We should cancel the search.
+        cancelSearch();
+    }
+}
+
+#include "moc_kitemlistkeyboardsearchmanager.cpp"