[addlayerbutton] Pass canvas to the manager (needed by AMS)

qgis · Jun 2, 2017 · 75f0e54 · 75f0e54
1 parent 220d125
commit 75f0e54
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1591,8 +1591,8 @@ void QgisApp::dataSourceManager()
 {
   if ( ! mDataSourceManagerDialog )
   {
-    mDataSourceManagerDialog = new QgsDataSourceManagerDialog( this );
+    mDataSourceManagerDialog = new QgsDataSourceManagerDialog( mapCanvas( ), this );
-    // Forward signals
+    // Forward signals to this
     connect( mDataSourceManagerDialog, SIGNAL( addRasterLayer( QString const &, QString const &, QString const & ) ),
              this, SLOT( addRasterLayer( QString const &, QString const &, QString const & ) ) );
     connect( mDataSourceManagerDialog, SIGNAL( addVectorLayer( QString const &, QString const &, QString const & ) ),
@@ -2388,7 +2388,6 @@ void QgisApp::createToolBars()
 
   bt = new QToolButton();
   bt->setPopupMode( QToolButton::MenuButtonPopup );
-  bt->addAction( mActionDataSourceManager );
   bt->addAction( mActionNewVectorLayer );
   bt->addAction( mActionNewSpatiaLiteLayer );
   bt->addAction( mActionNewGeoPackageLayer );

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -425,8 +425,8 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
     QAction *actionShowBookmarks() { return mActionShowBookmarks; }
     QAction *actionDraw() { return mActionDraw; }
 
-    QAction *actionNewVectorLayer() { return mActionNewVectorLayer; }
     QAction *actionDataSourceManager() { return mActionDataSourceManager; }
+    QAction *actionNewVectorLayer() { return mActionNewVectorLayer; }
     QAction *actionNewSpatialLiteLayer() { return mActionNewSpatiaLiteLayer; }
     QAction *actionEmbedLayers() { return mActionEmbedLayers; }
     QAction *actionAddOgrLayer() { return mActionAddOgrLayer; }