[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kate] addons/search: Update the result view also when creating the search list
From:       Kåre Särs <kare.sars () iki ! fi>
Date:       2016-07-03 11:39:58
Message-ID: E1bJfkk-0003C3-9e () code ! kde ! org
[Download RAW message or body]

Git commit 2d65d7b3d1cb8b97bcf04e5550f99c8599073e76 by Kåre Särs.
Committed on 02/07/2016 at 20:39.
Pushed by sars into branch 'master'.

Update the result view also when creating the search list

M  +5    -0    addons/search/FolderFilesList.cpp
M  +5    -0    addons/search/FolderFilesList.h
M  +1    -0    addons/search/plugin_search.cpp

http://commits.kde.org/kate/2d65d7b3d1cb8b97bcf04e5550f99c8599073e76

diff --git a/addons/search/FolderFilesList.cpp b/addons/search/FolderFilesList.cpp
index 4e452c9..d2d3850 100644
--- a/addons/search/FolderFilesList.cpp
+++ b/addons/search/FolderFilesList.cpp
@@ -73,6 +73,7 @@ void FolderFilesList::generateList(const QString &folder,
         m_excludeList << rx;
     }
 
+    m_time.restart();
     start();
 }
 
@@ -88,6 +89,10 @@ void FolderFilesList::checkNextItem(const QFileInfo &item)
     if (m_cancelSearch) {
         return;
     }
+    if (m_time.elapsed() > 100) {
+        m_time.restart();
+        emit searching(item.absoluteFilePath());
+    }
     if (item.isFile()) {
         if (!m_binary) {
             QMimeType mimeType = QMimeDatabase().mimeTypeForFile(item);
diff --git a/addons/search/FolderFilesList.h b/addons/search/FolderFilesList.h
index e27a8fd..3a3b88b 100644
--- a/addons/search/FolderFilesList.h
+++ b/addons/search/FolderFilesList.h
@@ -26,6 +26,7 @@
 #include <QFileInfo>
 #include <QVector>
 #include <QStringList>
+#include <QTime>
 
 class FolderFilesList: public QThread
 {
@@ -50,6 +51,9 @@ public:
 public Q_SLOTS:
     void cancelSearch();
 
+Q_SIGNALS:
+    void searching(const QString &path);
+
 private:
     void checkNextItem(const QFileInfo &item);
 
@@ -64,6 +68,7 @@ private:
     bool             m_binary;
     QStringList      m_types;
     QVector<QRegExp> m_excludeList;
+    QTime            m_time;
 };
 
 
diff --git a/addons/search/plugin_search.cpp b/addons/search/plugin_search.cpp
index ff15cc5..f6644f6 100644
--- a/addons/search/plugin_search.cpp
+++ b/addons/search/plugin_search.cpp
@@ -333,6 +333,7 @@ m_mainWindow (mainWin)
     connect(&m_searchOpenFiles, SIGNAL(searching(QString)), this, SLOT(searching(QString)));
 
     connect(&m_folderFilesList, SIGNAL(finished()),  this, SLOT(folderFileListChanged()));
+    connect(&m_folderFilesList, SIGNAL(searching(QString)),  this, SLOT(searching(QString)));
 
     connect(&m_searchDiskFiles, SIGNAL(matchFound(QString,QString,int,int,QString,int)),
             this,                 SLOT(matchFound(QString,QString,int,int,QString,int)));

[prev in list] [next in list] [prev in thread] [next in thread]