From 9a51d89476f0149ed3324f39250df4a22cf899c6 Mon Sep 17 00:00:00 2001 From: Alessandro Pasotti Date: Tue, 23 May 2017 12:17:43 +0200 Subject: [PATCH] [addlayerbutton] Embedded dialog support --- src/providers/arcgisrest/qgsafssourceselect.cpp | 2 +- src/providers/arcgisrest/qgsamssourceselect.cpp | 2 +- src/providers/spatialite/qgsspatialitesourceselect.cpp | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/providers/arcgisrest/qgsafssourceselect.cpp b/src/providers/arcgisrest/qgsafssourceselect.cpp index 739c56a2144..b8159d93d7a 100644 --- a/src/providers/arcgisrest/qgsafssourceselect.cpp +++ b/src/providers/arcgisrest/qgsafssourceselect.cpp @@ -31,7 +31,7 @@ QgsAfsSourceSelect::QgsAfsSourceSelect( QWidget *parent, Qt::WindowFlags fl, boo { if ( embeddedMode ) { - buttonBox->button( QDialogButtonBox::Close )->hide(); + buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Close ) ); } // import/export of connections not supported yet diff --git a/src/providers/arcgisrest/qgsamssourceselect.cpp b/src/providers/arcgisrest/qgsamssourceselect.cpp index f0d817ef467..5137c75c408 100644 --- a/src/providers/arcgisrest/qgsamssourceselect.cpp +++ b/src/providers/arcgisrest/qgsamssourceselect.cpp @@ -30,7 +30,7 @@ QgsAmsSourceSelect::QgsAmsSourceSelect( QWidget *parent, Qt::WindowFlags fl, boo { if ( embeddedMode ) { - buttonBox->button( QDialogButtonBox::Close )->hide(); + buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Close ) ); } // import/export of connections not supported yet diff --git a/src/providers/spatialite/qgsspatialitesourceselect.cpp b/src/providers/spatialite/qgsspatialitesourceselect.cpp index 602b3fcdac5..bf38007921a 100644 --- a/src/providers/spatialite/qgsspatialitesourceselect.cpp +++ b/src/providers/spatialite/qgsspatialitesourceselect.cpp @@ -45,6 +45,10 @@ QgsSpatiaLiteSourceSelect::QgsSpatiaLiteSourceSelect( QWidget *parent, Qt::Windo { setupUi( this ); + if ( embeddedMode ) + { + buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Close ) ); + } QgsSettings settings; restoreGeometry( settings.value( QStringLiteral( "Windows/SpatiaLiteSourceSelect/geometry" ) ).toByteArray() );