[QGIS Commit] r8674 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: jef
Date: 2008-06-23 12:45:16 -0400 (Mon, 23 Jun 2008)
New Revision: 8674

Modified:
   trunk/qgis/src/app/qgisapp.cpp
Log:
fix #958 - again

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2008-06-23 11:50:12 UTC (rev 8673)
+++ trunk/qgis/src/app/qgisapp.cpp	2008-06-23 16:45:16 UTC (rev 8674)
@@ -1356,8 +1356,6 @@
   connect(mMapCanvas, SIGNAL(extentsChanged()),this,SLOT(showExtents()));
   connect(mMapCanvas, SIGNAL(scaleChanged(double)), this, SLOT(showScale(double)));
   connect(mMapCanvas, SIGNAL(scaleChanged(double)), this, SLOT(updateMouseCoordinatePrecision()));
-
-  mNonEditMapTool=NULL;
   connect(mMapCanvas, SIGNAL(mapToolSet(QgsMapTool *)), this, SLOT(mapToolChanged(QgsMapTool *)));
 
   connect(mRenderSuppressionCBox, SIGNAL(toggled(bool )), mMapCanvas, SLOT(setRenderFlag(bool)));
@@ -2603,8 +2601,9 @@
   
   mMapCanvas->mapRender()->setProjectionsEnabled(FALSE);
   
-  pan(); // set map tool - panning
-
+  // set the initial map tool
+  mMapCanvas->setMapTool(mMapTools.mPan);
+  mNonEditMapTool = mMapTools.mPan;  // signals are not yet setup to catch this
 } // QgisApp::fileNew(bool thePromptToSaveFlag)
 
 
@@ -4540,7 +4539,7 @@
     if (QMessageBox::Save == answer)
     {
       if (!fileSave())
-	    answer = QMessageBox::Cancel;
+        answer = QMessageBox::Cancel;
     }
   }
 
@@ -4876,7 +4875,7 @@
 
     if( !vlayer->isEditable() && mMapCanvas->mapTool() && mMapCanvas->mapTool()->isEditTool() )
     {
-	mMapCanvas->setMapTool(mNonEditMapTool);
+      mMapCanvas->setMapTool(mNonEditMapTool);
     }
 
     if (dprovider)