Fix for ticket #15 (Use term CRS instead of Projection throughout. No…

…te this is a cosmetic fix only - internally class and var names still use the incorrect 'projection' nomenclature git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8954 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jul 31, 2008 · a5b9209 · a5b9209
1 parent fa99c34
commit a5b9209
Show file tree

Hide file tree

Showing 9 changed files with 208 additions and 358 deletions.
diff --git a/python/gui/qgsprojectionselector.sip b/python/gui/qgsprojectionselector.sip
@@ -41,7 +41,6 @@ class QgsProjectionSelector: QWidget //, private Ui::QgsProjectionSelectorBase
        */
       void applyProjList(QSet<QString> * crsFilter = 0);
 
-      void updateProjAndEllipsoidAcronyms(int theSrsid, QString theProj4String);
 
       /*!
        * \brief Make the string safe for use in SQL statements.

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -661,9 +661,9 @@ void QgisApp::createActions()
   mActionOptions->setStatusTip(tr("Change various QGIS options"));
   connect(mActionOptions, SIGNAL(triggered()), this, SLOT(options()));
   //
-  mActionCustomProjection= new QAction(getThemeIcon("/mActionCustomProjection.png"), tr("Custom Projection..."), this);
+  mActionCustomProjection= new QAction(getThemeIcon("/mActionCustomProjection.png"), tr("Custom CRS..."), this);
   // mActionCustomProjection->setShortcut(tr("Alt+I","Manage custom projections"));
-  mActionCustomProjection->setStatusTip(tr("Manage custom projections"));
+  mActionCustomProjection->setStatusTip(tr("Manage custom coordinate reference systems"));
   connect(mActionCustomProjection, SIGNAL(triggered()), this, SLOT(customProjection()));
   //
   // Help Menu Related items
@@ -1237,10 +1237,11 @@ void QgisApp::createStatusBar()
     exit(0);
   }
   mOnTheFlyProjectionStatusButton->setWhatsThis(tr("This icon shows whether "
-        "on the fly projection is enabled or not. Click the icon to bring up "
+        "on the fly coordinate reference system transformation is enabled or not. "
+        "Click the icon to bring up "
         "the project properties dialog to alter this behaviour."));
-  mOnTheFlyProjectionStatusButton->setToolTip(tr("Projection status - Click "
-        "to open projection dialog"));
+  mOnTheFlyProjectionStatusButton->setToolTip(tr("CRS status - Click "
+        "to open coordinate reference system dialog"));
   connect(mOnTheFlyProjectionStatusButton, SIGNAL(clicked()),
       this, SLOT(projectPropertiesProjections()));//bring up the project props dialog when clicked
   statusBar()->addPermanentWidget(mOnTheFlyProjectionStatusButton,0);

diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp
@@ -59,7 +59,6 @@ QgsProjectProperties::QgsProjectProperties(QgsMapCanvas* mapCanvas, QWidget *par
   bool myProjectionEnabled = myRender->projectionsEnabled();
   cbxProjectionEnabled->setChecked(myProjectionEnabled);
 
-  // set the default wkt to WGS 84
   long mySRSID = myRender->destinationSrs().srsid();
   QgsDebugMsg("Read project SRSID: " + QString::number(mySRSID));
   projectionSelector->setSelectedSRSID(mySRSID);