- update .gitignore

- typo fix
- fix ui permissions

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14728 c8812cc2-4d05-0410-92ff-de0c093fc19c

.gitignore

@@ -4,6 +4,13 @@ Thumb.db
 desktop.ini
 *.*~
 *~
+*.diff
+*.log*
+*.prepare
+debian/*.debhelper
+debian/*.substvars
+Makefile
+*-stamp
 api_doc
 build
 ms-windows/Installer-Files/postinstall.bat
@@ -13,3 +20,5 @@ ms-windows/osgeo4w/unpacked/
 ms-windows/*Setup.exe
 ms-windows/osgeo4w/nsis/
 ms-windows/osgeo4w/untgz/
+scripts/astyle
+qtcreator-build/

src/app/qgssnappingdialog.cpp

@@ -106,8 +106,8 @@ void QgsSnappingDialog::update()
   QSettings myQsettings;
   bool myDockFlag = myQsettings.value( "/qgis/dockSnapping", false ).toBool();
 
-  double defaultSnapppingTolerance = myQsettings.value( "/qgis/digitizing/default_snapping_tolerance", 0 ).toDouble();
-  int defaultSnapppingUnit = myQsettings.value( "/qgis/digitizing/default_snapping_tolerance_unit", 0 ).toInt();
+  double defaultSnappingTolerance = myQsettings.value( "/qgis/digitizing/default_snapping_tolerance", 0 ).toDouble();
+  int defaultSnappingUnit = myQsettings.value( "/qgis/digitizing/default_snapping_tolerance_unit", 0 ).toInt();
   QString defaultSnappingString = myQsettings.value( "/qgis/digitizing/default_snap_mode", "to vertex" ).toString();
 
   int defaultSnappingStringIdx = 0;
@@ -160,15 +160,15 @@ void QgsSnappingDialog::update()
     QLineEdit *leTolerance = new QLineEdit( mLayerTreeWidget );
     QDoubleValidator *validator = new QDoubleValidator( leTolerance );
     leTolerance->setValidator( validator );
-    leTolerance->setText( QString::number( defaultSnapppingTolerance, 'f' ) );
+    leTolerance->setText( QString::number( defaultSnappingTolerance, 'f' ) );
 
     mLayerTreeWidget->setItemWidget( item, 3, leTolerance );
 
     //snap to vertex/ snap to segment
     QComboBox *cbxUnits = new QComboBox( mLayerTreeWidget );
     cbxUnits->insertItem( 0, tr( "map units" ) );
     cbxUnits->insertItem( 1, tr( "pixels" ) );
-    cbxUnits->setCurrentIndex( defaultSnapppingUnit );
+    cbxUnits->setCurrentIndex( defaultSnappingUnit );
     mLayerTreeWidget->setItemWidget( item, 4, cbxUnits );
 
     int idx = layerIdList.indexOf( currentVectorLayer->getLayerID() );