Handle deleting map views

qgis · Mar 13, 2017 · 2c61e4c · 2c61e4c
1 parent 864cae4
commit 2c61e4c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/app/qgsmapcanvasdockwidget.cpp b/src/app/qgsmapcanvasdockwidget.cpp
@@ -15,11 +15,13 @@
 #include "qgsmapcanvasdockwidget.h"
 #include "qgsmapcanvas.h"
 #include "qgsprojectionselectiondialog.h"
+#include <QMessageBox>
 
 QgsMapCanvasDockWidget::QgsMapCanvasDockWidget( const QString &name, QWidget *parent )
   : QgsDockWidget( parent )
 {
   setupUi( this );
+  setAttribute( Qt::WA_DeleteOnClose );
 
   mContents->layout()->setContentsMargins( 0, 0, 0, 0 );
   mContents->layout()->setMargin( 0 );
@@ -42,9 +44,24 @@ QgsMapCanvas *QgsMapCanvasDockWidget::mapCanvas()
   return mMapCanvas;
 }
 
+void QgsMapCanvasDockWidget::closeEvent( QCloseEvent *event )
+{
+  if ( mMapCanvas->layerCount() > 0
+       && QMessageBox::question( this, tr( "Close map view" ),
+                                 tr( "Are you sure you want to close this map view?" ), QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) == QMessageBox::No )
+  {
+    event->ignore();
+  }
+  else
+  {
+    event->accept();
+  }
+}
+
 void QgsMapCanvasDockWidget::setMapCrs()
 {
   QgsProjectionSelectionDialog dlg;
+  dlg.setShowNoProjection( true );
   dlg.setCrs( mMapCanvas->mapSettings().destinationCrs() );
 
   if ( dlg.exec() )

diff --git a/src/app/qgsmapcanvasdockwidget.h b/src/app/qgsmapcanvasdockwidget.h
@@ -33,6 +33,10 @@ class APP_EXPORT QgsMapCanvasDockWidget : public QgsDockWidget, private Ui::QgsM
      */
     QgsMapCanvas *mapCanvas();
 
+  protected:
+
+    virtual void closeEvent( QCloseEvent *event ) override;
+
   private slots:
 
     void setMapCrs();