Skip to content
Permalink
Browse files

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

  • Loading branch information
elpaso committed Jun 2, 2017
1 parent 220d125 commit 75f0e543d9b829012a956a33f4a37dbb8b85c95a
Showing with 3 additions and 4 deletions.
  1. +2 −3 src/app/qgisapp.cpp
  2. +1 −1 src/app/qgisapp.h
@@ -1591,8 +1591,8 @@ void QgisApp::dataSourceManager()
{
if ( ! mDataSourceManagerDialog )
{
mDataSourceManagerDialog = new QgsDataSourceManagerDialog( this );
// Forward signals
mDataSourceManagerDialog = new QgsDataSourceManagerDialog( mapCanvas( ), this );
// 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 );
@@ -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; }

0 comments on commit 75f0e54

Please sign in to comment.
You can’t perform that action at this time.