emit QgsProject.snapSettingsChanged() (fixes #9465)

jef-n · jef-n · commit c25e3587bc8a · 2014-06-21T17:45:51.000+02:00
diff --git a/src/app/qgssnappingdialog.cpp b/src/app/qgssnappingdialog.cpp
@@ -49,7 +49,10 @@ class QgsSnappingDock : public QDockWidget
 
 };
 
-QgsSnappingDialog::QgsSnappingDialog( QWidget* parent, QgsMapCanvas* canvas ): QDialog( parent ), mMapCanvas( canvas ), mDock( 0 )
+QgsSnappingDialog::QgsSnappingDialog( QWidget* parent, QgsMapCanvas* canvas )
+    : QDialog( parent )
+    , mMapCanvas( canvas )
+    , mDock( 0 )
 {
   setupUi( this );
 
@@ -190,6 +193,14 @@ void QgsSnappingDialog::apply()
   QgsProject::instance()->writeEntry( "Digitizing", "/LayerSnappingToleranceUnitList", toleranceUnitList );
   QgsProject::instance()->writeEntry( "Digitizing", "/LayerSnappingEnabledList", enabledList );
   QgsProject::instance()->writeEntry( "Digitizing", "/AvoidIntersectionsList", avoidIntersectionList );
+
+  disconnect( QgsProject::instance(), SIGNAL( snapSettingsChanged() ), this, SLOT( reload() ) );
+  connect( this, SIGNAL( snapSettingsChanged() ), QgsProject::instance(), SIGNAL( snapSettingsChanged() ) );
+
+  emit snapSettingsChanged();
+
+  disconnect( this, SIGNAL( snapSettingsChanged() ), QgsProject::instance(), SIGNAL( snapSettingsChanged() ) );
+  connect( QgsProject::instance(), SIGNAL( snapSettingsChanged() ), this, SLOT( reload() ) );
 }
 
 void QgsSnappingDialog::show()
diff --git a/src/app/qgssnappingdialog.h b/src/app/qgssnappingdialog.h
@@ -69,10 +69,12 @@ class APP_EXPORT QgsSnappingDialog: public QDialog, private Ui::QgsSnappingDialo
      */
     void closeEvent( QCloseEvent* event );
 
+  signals:
+    void snapSettingsChanged();
+
   private slots:
     void reload();
 
-
   private:
     /**Default constructor forbidden*/
     QgsSnappingDialog();
