When searching for options pages, we should also show those

where the page name matches the search term Otherwise searching for eg "python" won't show the python console settings page.
qgis · Jul 29, 2021 · dc6b97c · dc6b97c
1 parent 011a8d2
commit dc6b97c
Showing 1 changed file with 24 additions and 1 deletion.
diff --git a/src/gui/qgsoptionsdialogbase.cpp b/src/gui/qgsoptionsdialogbase.cpp
@@ -514,7 +514,14 @@ void QgsOptionsDialogBase::searchText( const QString &text )
   {
     for ( int r = 0; r < mOptStackedWidget->count(); ++r )
     {
-      mOptListWidget->setRowHidden( r, text.length() >= minimumTextLength );
+      if ( mOptListWidget->item( r )->text().contains( text, Qt::CaseInsensitive ) )
+      {
+        mOptListWidget->setRowHidden( r, false );
+      }
+      else
+      {
+        mOptListWidget->setRowHidden( r, text.length() >= minimumTextLength );
+      }
     }
 
     for ( const QPair< QgsOptionsDialogHighlightWidget *, int > &rsw : std::as_const( mRegisteredSearchWidgets ) )
@@ -533,6 +540,22 @@ void QgsOptionsDialogBase::searchText( const QString &text )
       hiddenPages.insert( r, text.length() >= minimumTextLength );
     }
 
+    std::function<void( const QModelIndex & )> traverseModel;
+    // traverse through the model, showing pages which match by page name
+    traverseModel = [&]( const QModelIndex & parent )
+    {
+      for ( int row = 0; row < mOptTreeModel->rowCount( parent ); ++row )
+      {
+        const QModelIndex currentIndex = mOptTreeModel->index( row, 0, parent );
+        if ( currentIndex.data().toString().contains( text, Qt::CaseInsensitive ) )
+        {
+          hiddenPages.insert( mTreeProxyModel->sourceIndexToPageNumber( currentIndex ), false );
+        }
+        traverseModel( currentIndex );
+      }
+    };
+    traverseModel( QModelIndex() );
+
     for ( const QPair< QgsOptionsDialogHighlightWidget *, int > &rsw : std::as_const( mRegisteredSearchWidgets ) )
     {
       if ( rsw.first->searchHighlight( text.length() >= minimumTextLength ? text : QString() ) )