Github Issue #122: Got a working version of the text search on the ma…

…in window

navigationview.cpp

@@ -27,6 +27,11 @@ NavigationView::NavigationView(QWidget *parent, bool editable):QTreeView(parent)
     connect(this,&NavigationView::clicked, this, &NavigationView::rowClicked);
 }
 
+void NavigationView::setRowsEditable(bool enable)
+{
+    this->editable = enable;
+}
+
 void NavigationView::expandEveryItems(QModelIndex index)
 {
     if(!expandTimer.isActive())

navigationview.h

@@ -17,6 +17,7 @@ class NavigationView : public QTreeView
     Q_OBJECT
 public:
     NavigationView(QWidget * parent = nullptr, bool editable = true);
+    void setRowsEditable(bool enable);
     void expandEveryItems(QModelIndex index);
     void keyPressEvent(QKeyEvent *event)override;
 private:

views_handler.cpp

@@ -45,6 +45,7 @@ void ViewsHandler::initViews(Ui::MainWindow &ui)
     frameSearchTextTree = ui.uiFrameSearchTree;
     viewTextSearchEdit = ui.uiSearchText;
     viewTextSearchTree = ui.uiSearchTree;
+    viewTextSearchTree->setRowsEditable(false);
     viewTextSearchCount = ui.uiTextSearchCount;
 
     viewTextSearchEdit->setPlaceholderText("Search Texts...");
@@ -178,12 +179,6 @@ void ViewsHandler::initConnection()
     QObject::connect(&textSearchWorker,&TextSearchWorker::finished,
                      &searchThread, &QThread::quit);
 
-//    QObject::connect(&textSearchWorker,&TextSearchWorker::updateTextSearchView,
-//                     textSearchAllView, &SearchAllDialog::updateTextSearchViewHandle);
-
-    QObject::connect(textSearchAllView,&SearchAllDialog::showSearchedTextInFile,
-                     this,&ViewsHandler::displayTextSearchedFilePosition);
-
     QObject::connect(this,&ViewsHandler::updateRecentFile,
                      recentFilesView,&RecentFilesDialog::updateRecentFileHandle);
 
@@ -206,6 +201,9 @@ void ViewsHandler::initConnection()
     QObject::connect(&textSearchWorker,&TextSearchWorker::updateTextSearchView,
                      this, &ViewsHandler::updateTextSearchViewHandler);
 
+    QObject::connect(viewTextSearchTree,&NavigationView::pressed,
+            this,&ViewsHandler::textSearchResultPositionSelected);
+
 
 }
 
@@ -612,6 +610,7 @@ void ViewsHandler::textSearchChangedHandler(const QString &text)
 {
     textSearchWorker.setText(text);
     textSearchWorker.setRootPath(modelTree.rootPath());
+    proxyModel.createAllFilesList(viewTree->rootIndex(), textSearchWorker.getListPaths());
     searchThread.start();
 }
 
@@ -625,6 +624,17 @@ void ViewsHandler::updateTextSearchViewHandler(QStandardItemModel *model, int ma
 
 }
 
+void ViewsHandler::textSearchResultPositionSelected(const QModelIndex &index)
+{
+    QModelIndex parentIndex = viewTextSearchTree->model()->parent(index);
+    QString filePath = parentIndex.data(Qt::UserRole).toString();
+    int searchTextLength = index.data(Qt::UserRole).toInt();
+    int blockNumber = index.data(Qt::UserRole+1).toInt();
+    int positionInBlock = index.data(Qt::UserRole+2).toInt();
+
+    displayTextSearchedFilePosition(filePath, searchTextLength, blockNumber,  positionInBlock);
+}
+
 void ViewsHandler::openRecentFilesDialogHandle(bool show)
 {
     if(show){

views_handler.h

@@ -133,6 +133,7 @@ private slots:
     void checkIfCursorInBlockHandler(bool &isBlock, QTextCursor &cursor);
     void textSearchChangedHandler(const QString &text);
     void updateTextSearchViewHandler(QStandardItemModel *model, int matchCount);
+    void textSearchResultPositionSelected(const QModelIndex &index);
 };
 
 #endif // VIEWS_HANDLER_H