qgis · Dec 7, 2016
diff --git a/‎images/themes/default/mIconSnapping.svg
Lines changed: 2228 additions & 70 deletions b/‎images/themes/default/mIconSnapping.svg
Lines changed: 2228 additions & 70 deletions
diff --git a/‎src/app/qgssnappingwidget.cpp
Lines changed: 22 additions & 12 deletions b/‎src/app/qgssnappingwidget.cpp
Lines changed: 22 additions & 12 deletions
diff --git a/‎src/app/qgssnappingwidget.h
Lines changed: 6 additions & 0 deletions b/‎src/app/qgssnappingwidget.h
Lines changed: 6 additions & 0 deletions
@@ -225,14 +225,18 @@ QgsSnappingWidget::QgsSnappingWidget( QgsProject* project, QgsMapCanvas* canvas,
   modeChanged();
   updateToleranceDecimals();
 
-  restoreGeometry( QSettings().value( "/Windows/SnappingWidget/geometry" ).toByteArray() );
+  mSettings = new QSettings();
+  bool defaultSnapEnabled = mSettings->value( QStringLiteral( "/qgis/digitizing/default_snap_enabled" ), false ).toBool();
+  enableSnapping( defaultSnapEnabled );
+
+  restoreGeometry( mSettings->value( "/Windows/SnappingWidget/geometry" ).toByteArray() );
 }
 
 QgsSnappingWidget::~QgsSnappingWidget()
 {
   if ( mDisplayMode == Widget )
   {
-    QSettings().setValue( QStringLiteral( "/Windows/SnappingWidget/geometry" ), saveGeometry() );
+    mSettings->setValue( QStringLiteral( "/Windows/SnappingWidget/geometry" ), saveGeometry() );
   }
 }
 
@@ -291,6 +295,8 @@ void QgsSnappingWidget::projectSnapSettingsChanged()
   {
     mIntersectionSnappingAction->setChecked( config.intersectionSnapping() );
   }
+
+  toggleSnappingWidgets( config.enabled() );
 }
 
 void QgsSnappingWidget::projectTopologicalEditingChanged()
@@ -303,19 +309,23 @@ void QgsSnappingWidget::projectTopologicalEditingChanged()
 
 void QgsSnappingWidget::enableSnapping( bool checked )
 {
-  mModeButton->setEnabled( checked );
-  mTypeButton->setEnabled( checked );
-  mToleranceSpinBox->setEnabled( checked );
-  mUnitsComboBox->setEnabled( checked );
+  toggleSnappingWidgets( checked );
+  mConfig.setEnabled( checked );
+  mProject->setSnappingConfig( mConfig );
+}
+
+void QgsSnappingWidget::toggleSnappingWidgets( bool enabled )
+{
+  mModeButton->setEnabled( enabled );
+  mTypeButton->setEnabled( enabled );
+  mToleranceSpinBox->setEnabled( enabled );
+  mUnitsComboBox->setEnabled( enabled );
   if ( mLayerTreeView )
   {
-    mLayerTreeView->setEnabled( checked );
+    mLayerTreeView->setEnabled( enabled );
   }
-  mTopologicalEditingAction->setEnabled( checked );
-  mIntersectionSnappingAction->setEnabled( checked );
-
-  mConfig.setEnabled( checked );
-  mProject->setSnappingConfig( mConfig );
+  mTopologicalEditingAction->setEnabled( enabled );
+  mIntersectionSnappingAction->setEnabled( enabled );
 }
 
 void QgsSnappingWidget::changeTolerance( double tolerance )
 
@@ -33,6 +33,7 @@ class QgsProject;
 #include "qgssnappingconfig.h"
 
 #include <QWidget>
+#include <QSettings>
 
 /**
   * A widget which lets the user defines settings for snapping on a project
@@ -77,6 +78,9 @@ class APP_EXPORT QgsSnappingWidget : public QWidget
 
     void enableSnapping( bool checked );
 
+    //! toggle widgets enabled states
+    void toggleSnappingWidgets( bool enabled );
+
     void changeTolerance( double tolerance );
 
     void changeUnit( int idx );
@@ -104,6 +108,8 @@ class APP_EXPORT QgsSnappingWidget : public QWidget
     //! modeChanged determines if widget are visible or not based on mode
     void modeChanged();
 
+    QSettings *mSettings;
+
     QgsProject* mProject;
     QgsSnappingConfig mConfig;
     QgsMapCanvas* mCanvas;
Original file line number	Diff line number	Diff line change
`@@ -225,14 +225,18 @@ QgsSnappingWidget::QgsSnappingWidget( QgsProject* project, QgsMapCanvas* canvas,`
`225`	`225`	`modeChanged();`
`226`	`226`	`updateToleranceDecimals();`
`227`	`227`
`228`		`- restoreGeometry( QSettings().value( "/Windows/SnappingWidget/geometry" ).toByteArray() );`
	`228`	`+ mSettings = new QSettings();`
	`229`	`+ bool defaultSnapEnabled = mSettings->value( QStringLiteral( "/qgis/digitizing/default_snap_enabled" ), false ).toBool();`
	`230`	`+ enableSnapping( defaultSnapEnabled );`
	`231`	`+`
	`232`	`+ restoreGeometry( mSettings->value( "/Windows/SnappingWidget/geometry" ).toByteArray() );`
`229`	`233`	`}`
`230`	`234`
`231`	`235`	`QgsSnappingWidget::~QgsSnappingWidget()`
`232`	`236`	`{`
`233`	`237`	`if ( mDisplayMode == Widget )`
`234`	`238`	`{`
`235`		`- QSettings().setValue( QStringLiteral( "/Windows/SnappingWidget/geometry" ), saveGeometry() );`
	`239`	`+ mSettings->setValue( QStringLiteral( "/Windows/SnappingWidget/geometry" ), saveGeometry() );`
`236`	`240`	`}`
`237`	`241`	`}`
`238`	`242`
`@@ -291,6 +295,8 @@ void QgsSnappingWidget::projectSnapSettingsChanged()`
`291`	`295`	`{`
`292`	`296`	`mIntersectionSnappingAction->setChecked( config.intersectionSnapping() );`
`293`	`297`	`}`
	`298`	`+`
	`299`	`+ toggleSnappingWidgets( config.enabled() );`
`294`	`300`	`}`
`295`	`301`
`296`	`302`	`void QgsSnappingWidget::projectTopologicalEditingChanged()`
`@@ -303,19 +309,23 @@ void QgsSnappingWidget::projectTopologicalEditingChanged()`
`303`	`309`
`304`	`310`	`void QgsSnappingWidget::enableSnapping( bool checked )`
`305`	`311`	`{`
`306`		`- mModeButton->setEnabled( checked );`
`307`		`- mTypeButton->setEnabled( checked );`
`308`		`- mToleranceSpinBox->setEnabled( checked );`
`309`		`- mUnitsComboBox->setEnabled( checked );`
	`312`	`+ toggleSnappingWidgets( checked );`
	`313`	`+ mConfig.setEnabled( checked );`
	`314`	`+ mProject->setSnappingConfig( mConfig );`
	`315`	`+}`
	`316`	`+`
	`317`	`+void QgsSnappingWidget::toggleSnappingWidgets( bool enabled )`
	`318`	`+{`
	`319`	`+ mModeButton->setEnabled( enabled );`
	`320`	`+ mTypeButton->setEnabled( enabled );`
	`321`	`+ mToleranceSpinBox->setEnabled( enabled );`
	`322`	`+ mUnitsComboBox->setEnabled( enabled );`
`310`	`323`	`if ( mLayerTreeView )`
`311`	`324`	`{`
`312`		`- mLayerTreeView->setEnabled( checked );`
	`325`	`+ mLayerTreeView->setEnabled( enabled );`
`313`	`326`	`}`
`314`		`- mTopologicalEditingAction->setEnabled( checked );`
`315`		`- mIntersectionSnappingAction->setEnabled( checked );`
`316`		`-`
`317`		`- mConfig.setEnabled( checked );`
`318`		`- mProject->setSnappingConfig( mConfig );`
	`327`	`+ mTopologicalEditingAction->setEnabled( enabled );`
	`328`	`+ mIntersectionSnappingAction->setEnabled( enabled );`
`319`	`329`	`}`
`320`	`330`
`321`	`331`	`void QgsSnappingWidget::changeTolerance( double tolerance )`