qgis · Feb 6, 2019
diff --git a/‎src/app/qgisapp.cpp
Lines changed: 291 additions & 187 deletions b/‎src/app/qgisapp.cpp
Lines changed: 291 additions & 187 deletions
diff --git a/‎src/app/qgisapp.h
Lines changed: 3 additions & 0 deletions b/‎src/app/qgisapp.h
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/gui/qgsdatasourcemanagerdialog.cpp
Lines changed: 10 additions & 1 deletion b/‎src/gui/qgsdatasourcemanagerdialog.cpp
Lines changed: 10 additions & 1 deletion
diff --git a/‎src/gui/qgsdatasourcemanagerdialog.h
Lines changed: 5 additions & 1 deletion b/‎src/gui/qgsdatasourcemanagerdialog.h
Lines changed: 5 additions & 1 deletion
@@ -1957,6 +1957,9 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
     //! Create the option dialog
     QgsOptions *createOptionsDialog( QWidget *parent = nullptr );
 
+    //! Returns the message bar of the datasource manager dialog if it is visible, the canvas's message bar otherwise.
+    QgsMessageBar *visibleMessageBar();
+
     QgisAppStyleSheet *mStyleSheetBuilder = nullptr;
 
     // actions for menus and toolbars -----------------
 
@@ -26,6 +26,7 @@
 #include "qgsabstractdatasourcewidget.h"
 #include "qgsmapcanvas.h"
 #include "qgsmessagelog.h"
+#include "qgsmessagebar.h"
 #include "qgsgui.h"
 
 QgsDataSourceManagerDialog::QgsDataSourceManagerDialog( QgsBrowserModel *browserModel, QWidget *parent, QgsMapCanvas *canvas, Qt::WindowFlags fl )
@@ -34,12 +35,15 @@ QgsDataSourceManagerDialog::QgsDataSourceManagerDialog( QgsBrowserModel *browser
   , mPreviousRow( -1 )
   , mMapCanvas( canvas )
 {
-
   ui->setupUi( this );
   ui->verticalLayout_2->setSpacing( 6 );
   ui->verticalLayout_2->setMargin( 0 );
   ui->verticalLayout_2->setContentsMargins( 0, 0, 0, 0 );
 
+  mMessageBar = new QgsMessageBar( this );
+  mMessageBar->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Fixed );
+  static_cast<QVBoxLayout *>( layout() )->insertWidget( 0, mMessageBar );
+
   // QgsOptionsDialogBase handles saving/restoring of geometry, splitter and current tab states,
   // switching vertical tabs between icon/text to icon-only modes (splitter collapsed to left),
   // and connecting QDialogButtonBox's accepted/rejected signals to dialog's accept/reject slots
@@ -89,6 +93,11 @@ void QgsDataSourceManagerDialog::openPage( const QString &pageName )
   }
 }
 
+QgsMessageBar *QgsDataSourceManagerDialog::messageBar() const
+{
+  return mMessageBar;
+}
+
 void QgsDataSourceManagerDialog::setCurrentPage( int index )
 {
   mPreviousRow = ui->mOptionsStackedWidget->currentIndex();
 
@@ -33,6 +33,7 @@ class QgsRasterLayer;
 class QgsMapCanvas;
 class QgsAbstractDataSourceWidget;
 class QgsBrowserModel;
+class QgsMessageBar;
 
 /**
  * \ingroup gui
@@ -66,6 +67,9 @@ class GUI_EXPORT QgsDataSourceManagerDialog : public QgsOptionsDialogBase, priva
      */
     void openPage( const QString &pageName );
 
+    //! Returns the dialog's message bar
+    QgsMessageBar *messageBar() const;
+
   public slots:
 
     //! Sync current page with the leftbar list
@@ -139,7 +143,7 @@ class GUI_EXPORT QgsDataSourceManagerDialog : public QgsOptionsDialogBase, priva
     QStringList mPageNames;
     // Map canvas
     QgsMapCanvas *mMapCanvas = nullptr;
-
+    QgsMessageBar *mMessageBar = nullptr;
 
 };