Set prompt as default behaviour for unknown CRS

mhugent · mhugent · commit fecb0de028a8 · 2011-10-25T10:27:35.000+02:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -327,7 +327,7 @@ static void customSrsValidation_( QgsCoordinateReferenceSystem* srs )
 {
   static QString authid = QString::null;
   QSettings mySettings;
-  QString myDefaultProjectionOption = mySettings.value( "/Projections/defaultBehaviour" ).toString();
+  QString myDefaultProjectionOption = mySettings.value( "/Projections/defaultBehaviour", "prompt" ).toString();
   if ( myDefaultProjectionOption == "prompt" )
   {
     //@note this class is not a descendent of QWidget so we cant pass
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -177,11 +177,11 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
   // set the display update threshold
   spinBoxUpdateThreshold->setValue( settings.value( "/Map/updateThreshold" ).toInt() );
   //set the default projection behaviour radio buttongs
-  if ( settings.value( "/Projections/defaultBehaviour" ).toString() == "prompt" )
+  if ( settings.value( "/Projections/defaultBehaviour", "prompt" ).toString() == "prompt" )
   {
     radPromptForProjection->setChecked( true );
   }
-  else if ( settings.value( "/Projections/defaultBehaviour" ).toString() == "useProject" )
+  else if ( settings.value( "/Projections/defaultBehaviour", "prompt" ).toString() == "useProject" )
   {
     radUseProjectProjection->setChecked( true );
   }
diff --git a/src/plugins/georeferencer/qgsopenrasterdialog.cpp b/src/plugins/georeferencer/qgsopenrasterdialog.cpp
@@ -93,7 +93,7 @@ void QgsOpenRasterDialog::on_tbnSelectRaster_clicked()
 
   // What DOING this code?
   QgsProject* prj = QgsProject::instance();
-  QString projBehaviour = settings.value( "/Projections/defaultBehaviour" ).toString();
+  QString projBehaviour = settings.value( "/Projections/defaultBehaviour", "prompt" ).toString();
   QString projectCRS = prj->readEntry( "SpatialRefSys", "/ProjectCRSProj4String" );
   int projectCrsId = prj->readNumEntry( "SpatialRefSys", "/ProjectCrsId" );
 

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ static void customSrsValidation_( QgsCoordinateReferenceSystem* srs )`
`327`	`327`	`{`
`328`	`328`	`static QString authid = QString::null;`
`329`	`329`	`QSettings mySettings;`
`330`		`- QString myDefaultProjectionOption = mySettings.value( "/Projections/defaultBehaviour" ).toString();`
	`330`	`+ QString myDefaultProjectionOption = mySettings.value( "/Projections/defaultBehaviour", "prompt" ).toString();`
`331`	`331`	`if ( myDefaultProjectionOption == "prompt" )`
`332`	`332`	`{`
`333`	`333`	`//@note this class is not a descendent of QWidget so we cant pass`
Original file line number	Diff line number	Diff line change
`@@ -177,11 +177,11 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :`
`177`	`177`	`// set the display update threshold`
`178`	`178`	`spinBoxUpdateThreshold->setValue( settings.value( "/Map/updateThreshold" ).toInt() );`
`179`	`179`	`//set the default projection behaviour radio buttongs`
`180`		`- if ( settings.value( "/Projections/defaultBehaviour" ).toString() == "prompt" )`
	`180`	`+ if ( settings.value( "/Projections/defaultBehaviour", "prompt" ).toString() == "prompt" )`
`181`	`181`	`{`
`182`	`182`	`radPromptForProjection->setChecked( true );`
`183`	`183`	`}`
`184`		`- else if ( settings.value( "/Projections/defaultBehaviour" ).toString() == "useProject" )`
	`184`	`+ else if ( settings.value( "/Projections/defaultBehaviour", "prompt" ).toString() == "useProject" )`
`185`	`185`	`{`
`186`	`186`	`radUseProjectProjection->setChecked( true );`
`187`	`187`	`}`