add level and duration to message emitted

qgis · May 6, 2020 · c6ee633 · c6ee633
1 parent 5f50322
commit c6ee633
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/python/core/auto_generated/layertree/qgslayertreemodel.sip.in b/python/core/auto_generated/layertree/qgslayertreemodel.sip.in
@@ -323,7 +323,7 @@ displays.
 
   signals:
 
-    void messageEmitted( const QString &message );
+    void messageEmitted( const QString &message, Qgis::MessageLevel level = Qgis::Info, int duration = 5 );
 %Docstring
 Emits a message than can be displayed to the user in a GUI class
 

diff --git a/src/core/layertree/qgslayertreemodel.h b/src/core/layertree/qgslayertreemodel.h
@@ -292,7 +292,7 @@ class CORE_EXPORT QgsLayerTreeModel : public QAbstractItemModel
      * Emits a message than can be displayed to the user in a GUI class
      * \since QGIS 3.14
      */
-    void messageEmitted( const QString &message );
+    void messageEmitted( const QString &message, Qgis::MessageLevel level = Qgis::Info, int duration = 5 );
 
   protected slots:
     void nodeWillAddChildren( QgsLayerTreeNode *node, int indexFrom, int indexTo );

diff --git a/src/gui/layertree/qgslayertreeview.cpp b/src/gui/layertree/qgslayertreeview.cpp
@@ -80,7 +80,10 @@ void QgsLayerTreeView::setModel( QAbstractItemModel *model )
   connect( model, &QAbstractItemModel::rowsRemoved, this, &QgsLayerTreeView::modelRowsRemoved );
 
   if ( mMessageBar )
-    connect( layerTreeModel(), &QgsLayerTreeModel::messageEmitted, [ = ]( const QString & message ) {mMessageBar->pushMessage( message );} );
+    connect( layerTreeModel(), &QgsLayerTreeModel::messageEmitted,
+             [ = ]( const QString & message, Qgis::MessageLevel level = Qgis::Info, int duration = 5 )
+  {mMessageBar->pushMessage( message, level, duration );}
+         );
 
   QTreeView::setModel( model );
 
@@ -503,7 +506,10 @@ void QgsLayerTreeView::setMessageBar( QgsMessageBar *messageBar )
   mMessageBar = messageBar;
 
   if ( mMessageBar )
-    connect( layerTreeModel(), &QgsLayerTreeModel::messageEmitted, [ = ]( const QString & message ) {mMessageBar->pushMessage( message );} );
+    connect( layerTreeModel(), &QgsLayerTreeModel::messageEmitted,
+             [ = ]( const QString & message, Qgis::MessageLevel level = Qgis::Info, int duration = 5 )
+  {mMessageBar->pushMessage( message, level, duration );}
+         );
 }
 
 void QgsLayerTreeView::mouseReleaseEvent( QMouseEvent *event )