[QGIS Commit] r14728 - in trunk/qgis: . src/app src/ui

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-11-21 12:04:36 -0800 (Sun, 21 Nov 2010)
New Revision: 14728

Modified:
   trunk/qgis/.gitignore
   trunk/qgis/src/app/qgssnappingdialog.cpp
   trunk/qgis/src/ui/qgsannotationwidgetbase.ui
   trunk/qgis/src/ui/qgscredentialdialog.ui
   trunk/qgis/src/ui/qgsdetaileditemwidgetbase.ui
   trunk/qgis/src/ui/qgstextannotationdialogbase.ui
Log:
- update .gitignore
- typo fix
- fix ui permissions

Modified: trunk/qgis/.gitignore
===================================================================
--- trunk/qgis/.gitignore	2010-11-21 12:21:10 UTC (rev 14727)
+++ trunk/qgis/.gitignore	2010-11-21 20:04:36 UTC (rev 14728)
@@ -4,6 +4,13 @@
 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/*Setup.exe
 ms-windows/osgeo4w/nsis/
 ms-windows/osgeo4w/untgz/
+scripts/astyle
+qtcreator-build/

Modified: trunk/qgis/src/app/qgssnappingdialog.cpp
===================================================================
--- trunk/qgis/src/app/qgssnappingdialog.cpp	2010-11-21 12:21:10 UTC (rev 14727)
+++ trunk/qgis/src/app/qgssnappingdialog.cpp	2010-11-21 20:04:36 UTC (rev 14728)
@@ -106,8 +106,8 @@
   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,7 +160,7 @@
     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 );
 
@@ -168,7 +168,7 @@
     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() );


Property changes on: trunk/qgis/src/ui/qgsannotationwidgetbase.ui
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/ui/qgscredentialdialog.ui
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/ui/qgsdetaileditemwidgetbase.ui
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: trunk/qgis/src/ui/qgstextannotationdialogbase.ui
___________________________________________________________________
Deleted: svn:executable
   - *