georeferencer: fix closeEvent handling for dock widget.

git-svn-id: http://svn.osgeo.org/qgis/trunk@13561 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · May 24, 2010 · d4b96cc · d4b96cc
1 parent 6c517c4
commit d4b96cc
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 15 deletions.
diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp
@@ -62,20 +62,22 @@
 
 #include "qgsgeorefplugingui.h"
 
-class QgsGeorefDockWidget : public QDockWidget
+
+QgsGeorefDockWidget::QgsGeorefDockWidget( const QString & title, QWidget * parent, Qt::WindowFlags flags )
+    : QDockWidget( title, parent, flags )
 {
-  public:
-    QgsGeorefDockWidget( const QString & title, QWidget * parent = 0, Qt::WindowFlags flags = 0 )
-        : QDockWidget( title, parent, flags )
-    {
-      setObjectName( "GeorefDockWidget" ); // set object name so the position can be saved
-    }
+  setObjectName( "GeorefDockWidget" ); // set object name so the position can be saved
+}
 
-    virtual void closeEvent( QCloseEvent * ev )
-    {
-      deleteLater();
-    }
-};
+void QgsGeorefDockWidget::closeEvent( QCloseEvent * ev )
+{
+  if (widget() && !widget()->close())
+  {
+    ev->ignore();
+    return;
+  }
+  deleteLater();
+}
 
 QgsGeorefPluginGui::QgsGeorefPluginGui( QgisInterface* theQgisInterface, QWidget* parent, Qt::WFlags fl )
     : QMainWindow( parent, fl )
@@ -130,7 +132,6 @@ void QgsGeorefPluginGui::dockThisWindow( bool dock )
   {
     mDock = new QgsGeorefDockWidget( tr( "Georeferencer" ), mIface->mainWindow() );
     mDock->setWidget( this );
-    connect( this, SIGNAL( destroyed() ), mDock, SLOT( close() ) );
     mIface->addDockWidget( Qt::BottomDockWidgetArea, mDock );
   }
 }
@@ -151,6 +152,7 @@ QgsGeorefPluginGui::~QgsGeorefPluginGui()
   delete mToolAddPoint;
   delete mToolDeletePoint;
   delete mToolMovePoint;
+
 }
 
 // ----------------------------- protected --------------------------------- //
@@ -929,8 +931,8 @@ void QgsGeorefPluginGui::createDockWidgets()
   dockWidgetGCPpoints->setWidget( mGCPListWidget );
 
   connect( mGCPListWidget, SIGNAL( jumpToGCP( uint ) ), this, SLOT( jumpToGCP( uint ) ) );
-  connect( mGCPListWidget, SIGNAL( replaceDataPoint( QgsGeorefDataPoint*, int ) ),
-           this, SLOT( replaceDataPoint( QgsGeorefDataPoint*, int ) ) );
+  /*connect( mGCPListWidget, SIGNAL( replaceDataPoint( QgsGeorefDataPoint*, int ) ),
+           this, SLOT( replaceDataPoint( QgsGeorefDataPoint*, int ) ) );*/
   connect( mGCPListWidget, SIGNAL( deleteDataPoint( int ) ),
            this, SLOT( deleteDataPoint( int ) ) );
   connect( mGCPListWidget, SIGNAL( pointEnabled( QgsGeorefDataPoint*, int ) ), this, SLOT( updateGeorefTransform() ) );

diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.h b/src/plugins/georeferencer/qgsgeorefplugingui.h
@@ -225,4 +225,13 @@ class QgsGeorefPluginGui : public QMainWindow, private Ui::QgsGeorefPluginGuiBas
 
     QDockWidget* mDock;
 };
+
+class QgsGeorefDockWidget : public QDockWidget
+{
+    Q_OBJECT
+  public:
+    QgsGeorefDockWidget( const QString & title, QWidget * parent = 0, Qt::WindowFlags flags = 0 );
+    virtual void closeEvent( QCloseEvent * ev );
+};
+
 #endif