Skip to content
Permalink
Browse files

Merge pull request #332 from bischofia/shp_enc

turn ignoreShapeEncoding option ON by default
  • Loading branch information
mhugent committed Nov 20, 2012
2 parents bab4395 + ddb5117 commit 0533e2dbc95145bfb351908341e2e52081fab359
Showing with 2 additions and 2 deletions.
  1. +1 −1 src/app/qgsoptions.cpp
  2. +1 −1 src/providers/ogr/qgsogrprovider.cpp
@@ -429,7 +429,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
cbxCreateRasterLegendIcons->setChecked( settings.value( "/qgis/createRasterLegendIcons", true ).toBool() );
cbxCopyWKTGeomFromTable->setChecked( settings.value( "/qgis/copyGeometryAsWKT", true ).toBool() );
leNullValue->setText( settings.value( "qgis/nullValue", "NULL" ).toString() );
cbxIgnoreShapeEncoding->setChecked( settings.value( "/qgis/ignoreShapeEncoding", false ).toBool() );
cbxIgnoreShapeEncoding->setChecked( settings.value( "/qgis/ignoreShapeEncoding", true ).toBool() );

cmbLegendDoubleClickAction->setCurrentIndex( settings.value( "/qgis/legendDoubleClickAction", 0 ).toInt() );

@@ -206,7 +206,7 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )
QgsApplication::registerOgrDrivers();

QSettings settings;
CPLSetConfigOption( "SHAPE_ENCODING", settings.value( "/qgis/ignoreShapeEncoding", false ).toBool() ? "" : 0 );
CPLSetConfigOption( "SHAPE_ENCODING", settings.value( "/qgis/ignoreShapeEncoding", true ).toBool() ? "" : 0 );

// set the selection rectangle pointer to 0
mSelectionRectangle = 0;

0 comments on commit 0533e2d

Please sign in to comment.
You can’t perform that action at this time.