Skip to content

Commit 2d8de27

Browse files
author
jef
committed
- update .gitignore
- typo fix - fix ui permissions git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14728 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 3809467 commit 2d8de27

6 files changed

+13
-4
lines changed

.gitignore

+9
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ Thumb.db
44
desktop.ini
55
*.*~
66
*~
7+
*.diff
8+
*.log*
9+
*.prepare
10+
debian/*.debhelper
11+
debian/*.substvars
12+
Makefile
13+
*-stamp
714
api_doc
815
build
916
ms-windows/Installer-Files/postinstall.bat
@@ -13,3 +20,5 @@ ms-windows/osgeo4w/unpacked/
1320
ms-windows/*Setup.exe
1421
ms-windows/osgeo4w/nsis/
1522
ms-windows/osgeo4w/untgz/
23+
scripts/astyle
24+
qtcreator-build/

src/app/qgssnappingdialog.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ void QgsSnappingDialog::update()
106106
QSettings myQsettings;
107107
bool myDockFlag = myQsettings.value( "/qgis/dockSnapping", false ).toBool();
108108

109-
double defaultSnapppingTolerance = myQsettings.value( "/qgis/digitizing/default_snapping_tolerance", 0 ).toDouble();
110-
int defaultSnapppingUnit = myQsettings.value( "/qgis/digitizing/default_snapping_tolerance_unit", 0 ).toInt();
109+
double defaultSnappingTolerance = myQsettings.value( "/qgis/digitizing/default_snapping_tolerance", 0 ).toDouble();
110+
int defaultSnappingUnit = myQsettings.value( "/qgis/digitizing/default_snapping_tolerance_unit", 0 ).toInt();
111111
QString defaultSnappingString = myQsettings.value( "/qgis/digitizing/default_snap_mode", "to vertex" ).toString();
112112

113113
int defaultSnappingStringIdx = 0;
@@ -160,15 +160,15 @@ void QgsSnappingDialog::update()
160160
QLineEdit *leTolerance = new QLineEdit( mLayerTreeWidget );
161161
QDoubleValidator *validator = new QDoubleValidator( leTolerance );
162162
leTolerance->setValidator( validator );
163-
leTolerance->setText( QString::number( defaultSnapppingTolerance, 'f' ) );
163+
leTolerance->setText( QString::number( defaultSnappingTolerance, 'f' ) );
164164

165165
mLayerTreeWidget->setItemWidget( item, 3, leTolerance );
166166

167167
//snap to vertex/ snap to segment
168168
QComboBox *cbxUnits = new QComboBox( mLayerTreeWidget );
169169
cbxUnits->insertItem( 0, tr( "map units" ) );
170170
cbxUnits->insertItem( 1, tr( "pixels" ) );
171-
cbxUnits->setCurrentIndex( defaultSnapppingUnit );
171+
cbxUnits->setCurrentIndex( defaultSnappingUnit );
172172
mLayerTreeWidget->setItemWidget( item, 4, cbxUnits );
173173

174174
int idx = layerIdList.indexOf( currentVectorLayer->getLayerID() );

src/ui/qgsannotationwidgetbase.ui

100755100644
File mode changed.

src/ui/qgscredentialdialog.ui

100755100644
File mode changed.

src/ui/qgsdetaileditemwidgetbase.ui

100755100644
File mode changed.

src/ui/qgstextannotationdialogbase.ui

100755100644
File mode changed.

0 commit comments

Comments
 (0)