allow to use icons too

qgis · Nov 29, 2018 · f24daa2 · f24daa2
1 parent d272f3c
commit f24daa2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/python/core/auto_generated/locator/qgslocatorfilter.sip.in b/python/core/auto_generated/locator/qgslocatorfilter.sip.in
@@ -55,9 +55,10 @@ Constructor for QgsLocatorResult.
 %Docstring
 Constructor for ResultAction
 %End
-        ResultAction( int id, QString text );
+        ResultAction( int id, QString text, QString iconPath = QString() );
         int id;
         QString text;
+        QString iconPath;
     };
 
     QList<ResultAction> actions;

diff --git a/src/core/locator/qgslocatorfilter.h b/src/core/locator/qgslocatorfilter.h
@@ -107,12 +107,14 @@ class CORE_EXPORT QgsLocatorResult
       public:
         //! Constructor for ResultAction
         ResultAction() = default;
-        ResultAction( int id, QString text )
+        ResultAction( int id, QString text, QString iconPath = QString() )
           : id( id )
           , text( text )
+          , iconPath( iconPath )
         {}
         int id = -1;
         QString text;
+        QString iconPath;
     };
 
     /**

diff --git a/src/gui/locator/qgslocatorwidget.cpp b/src/gui/locator/qgslocatorwidget.cpp
@@ -183,10 +183,12 @@ void QgsLocatorWidget::showContextMenu( const QPoint &point )
 
   const QList<QgsLocatorResult::ResultAction> actions = mResultsView->model()->data( index, QgsLocatorModel::ResultActionsRole ).value<QList<QgsLocatorResult::ResultAction>>();
   QMenu *contextMenu = new QMenu( mResultsView );
-  for ( auto action : actions )
+  for ( auto resultAction : actions )
   {
-    QAction *menuAction = new QAction( action.text, contextMenu );
-    connect( menuAction, &QAction::triggered, this, [ = ]() {mModelBridge->triggerResult( index, action.id );} );
+    QAction *menuAction = new QAction( resultAction.text, contextMenu );
+    if ( !resultAction.iconPath.isEmpty() )
+      menuAction->setIcon( QIcon( resultAction.iconPath ) );
+    connect( menuAction, &QAction::triggered, this, [ = ]() {mModelBridge->triggerResult( index, resultAction.id );} );
     contextMenu->addAction( menuAction );
   }
   contextMenu->exec( mResultsView->viewport()->mapToGlobal( point ) );