Fix activating the Selection Mode with a keyboard shortcut

[dolphin.git] / src / kitemviews / private / kitemlistkeyboardsearchmanager.cpp

diff --git a/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp b/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp
index 97e2b0b32b6b408363aac2eedba5eb1fe462bf1e..c74ef16386e37c9e1786fde6505caf5893965512 100644 (file)
--- a/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp
+++ b/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp
@@ -8,10 +8,10 @@
 
 #include "kitemlistkeyboardsearchmanager.h"
 
-KItemListKeyboardSearchManager::KItemListKeyboardSearchManager(QObject* parent) :
-    QObject(parent),
-    m_isSearchRestarted(false),
-    m_timeout(1000)
+KItemListKeyboardSearchManager::KItemListKeyboardSearchManager(QObject *parent)
+    : QObject(parent)
+    , m_isSearchRestarted(false)
+    , m_timeout(1000)
 {
     m_keyboardInputTime.invalidate();
 }
@@ -27,7 +27,12 @@ bool KItemListKeyboardSearchManager::shouldClearSearchIfInputTimeReached()
     return (keyboardInputTimeElapsed > m_timeout) || !keyboardTimeWasValid;
 }
 
-void KItemListKeyboardSearchManager::addKeys(const QString& keys)
+bool KItemListKeyboardSearchManager::isSearchAsYouTypeActive() const
+{
+    return !m_searchedString.isEmpty() && !m_keyboardInputTime.hasExpired(m_timeout);
+}
+
+void KItemListKeyboardSearchManager::addKeys(const QString &keys)
 {
     if (shouldClearSearchIfInputTimeReached()) {
         m_searchedString.clear();
@@ -55,10 +60,10 @@ void KItemListKeyboardSearchManager::addKeys(const QString& keys)
         const bool searchFromNextItem = (!m_isSearchRestarted && newSearch) || sameKey;
 
         // to remember not to searchFromNextItem if selection was deselected
-        // loosing keyboard search context basically
+        // losing keyboard search context basically
         m_isSearchRestarted = false;
 
-        emit changeCurrentItem(sameKey ? firstKey : m_searchedString, searchFromNextItem);
+        Q_EMIT changeCurrentItem(sameKey ? firstKey : m_searchedString, searchFromNextItem);
     }
     m_keyboardInputTime.start();
 }
@@ -89,7 +94,7 @@ void KItemListKeyboardSearchManager::slotCurrentChanged(int current, int previou
     }
 }
 
-void KItemListKeyboardSearchManager::slotSelectionChanged(const KItemSet& current, const KItemSet& previous)
+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.