Merge pull request #4889 from gacarrillor/one_button_ESC_key_handling

elpaso · web-flow · commit cd399990f182 · 2017-07-20T07:55:21.000+02:00
Handle Esc key in Data Source Manager
diff --git a/src/gui/qgsdatasourcemanagerdialog.cpp b/src/gui/qgsdatasourcemanagerdialog.cpp
@@ -60,6 +60,7 @@ QgsDataSourceManagerDialog::QgsDataSourceManagerDialog( QWidget *parent, QgsMapC
   ogrItem->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddOgrLayer.svg" ) ) );
   ogrItem->setToolTip( tr( "Add Vector layer" ) );
   connect( ovl, &QgsOpenVectorLayerDialog::addVectorLayers, this, &QgsDataSourceManagerDialog::vectorLayersAdded );
+  connect( ovl, &QgsOpenVectorLayerDialog::rejected, this, &QgsDataSourceManagerDialog::reject );
   mPageNames.append( QStringLiteral( "ogr" ) );
 
   // RASTER (forward to app)
@@ -187,6 +188,7 @@ QgsAbstractDataSourceWidget *QgsDataSourceManagerDialog::providerDialog( const Q
     {
       dlg->setMapCanvas( mMapCanvas );
     }
+    connect( dlg, &QgsAbstractDataSourceWidget::rejected, this, &QgsDataSourceManagerDialog::reject );
     return dlg;
   }
 }
@@ -229,3 +231,9 @@ void QgsDataSourceManagerDialog::addVectorProviderDialog( const QString provider
     connect( this,  SIGNAL( providerDialogsRefreshRequested() ), dlg, SLOT( refresh() ) );
   }
 }
+
+void QgsDataSourceManagerDialog::showEvent( QShowEvent *e )
+{
+  ui->mOptionsStackedWidget->currentWidget()->show();
+  QDialog::showEvent( e );
+}
diff --git a/src/gui/qgsdatasourcemanagerdialog.h b/src/gui/qgsdatasourcemanagerdialog.h
@@ -78,6 +78,9 @@ class GUI_EXPORT QgsDataSourceManagerDialog : public QgsOptionsDialogBase, priva
     //! Refresh the browser view
     void refresh();
 
+  protected:
+    virtual void showEvent( QShowEvent *event ) override;
+
   signals:
     //! Emitted when a raster layer was selected for addition: for signal forwarding to QgisApp
     void addRasterLayer( const QString &uri, const QString &baseName, const QString &providerKey );

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ QgsDataSourceManagerDialog::QgsDataSourceManagerDialog( QWidget *parent, QgsMapC`
`60`	`60`	`ogrItem->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddOgrLayer.svg" ) ) );`
`61`	`61`	`ogrItem->setToolTip( tr( "Add Vector layer" ) );`
`62`	`62`	`connect( ovl, &QgsOpenVectorLayerDialog::addVectorLayers, this, &QgsDataSourceManagerDialog::vectorLayersAdded );`
	`63`	`+ connect( ovl, &QgsOpenVectorLayerDialog::rejected, this, &QgsDataSourceManagerDialog::reject );`
`63`	`64`	`mPageNames.append( QStringLiteral( "ogr" ) );`
`64`	`65`
`65`	`66`	`// RASTER (forward to app)`
`@@ -187,6 +188,7 @@ QgsAbstractDataSourceWidget *QgsDataSourceManagerDialog::providerDialog( const Q`
`187`	`188`	`{`
`188`	`189`	`dlg->setMapCanvas( mMapCanvas );`
`189`	`190`	`}`
	`191`	`+ connect( dlg, &QgsAbstractDataSourceWidget::rejected, this, &QgsDataSourceManagerDialog::reject );`
`190`	`192`	`return dlg;`
`191`	`193`	`}`
`192`	`194`	`}`
`@@ -229,3 +231,9 @@ void QgsDataSourceManagerDialog::addVectorProviderDialog( const QString provider`
`229`	`231`	`connect( this, SIGNAL( providerDialogsRefreshRequested() ), dlg, SLOT( refresh() ) );`
`230`	`232`	`}`
`231`	`233`	`}`
	`234`	`+`
	`235`	`+void QgsDataSourceManagerDialog::showEvent( QShowEvent *e )`
	`236`	`+{`
	`237`	`+ ui->mOptionsStackedWidget->currentWidget()->show();`
	`238`	`+ QDialog::showEvent( e );`
	`239`	`+}`