Skip to content

Commit a5b9209

Browse files
author
timlinux
committed
Fix for ticket #15 (Use term CRS instead of Projection throughout. Note 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
1 parent fa99c34 commit a5b9209

9 files changed

+208
-358
lines changed

python/gui/qgsprojectionselector.sip

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ class QgsProjectionSelector: QWidget //, private Ui::QgsProjectionSelectorBase
4141
*/
4242
void applyProjList(QSet<QString> * crsFilter = 0);
4343

44-
void updateProjAndEllipsoidAcronyms(int theSrsid, QString theProj4String);
4544

4645
/*!
4746
* \brief Make the string safe for use in SQL statements.

src/app/qgisapp.cpp

+6-5
Original file line numberDiff line numberDiff line change
@@ -661,9 +661,9 @@ void QgisApp::createActions()
661661
mActionOptions->setStatusTip(tr("Change various QGIS options"));
662662
connect(mActionOptions, SIGNAL(triggered()), this, SLOT(options()));
663663
//
664-
mActionCustomProjection= new QAction(getThemeIcon("/mActionCustomProjection.png"), tr("Custom Projection..."), this);
664+
mActionCustomProjection= new QAction(getThemeIcon("/mActionCustomProjection.png"), tr("Custom CRS..."), this);
665665
// mActionCustomProjection->setShortcut(tr("Alt+I","Manage custom projections"));
666-
mActionCustomProjection->setStatusTip(tr("Manage custom projections"));
666+
mActionCustomProjection->setStatusTip(tr("Manage custom coordinate reference systems"));
667667
connect(mActionCustomProjection, SIGNAL(triggered()), this, SLOT(customProjection()));
668668
//
669669
// Help Menu Related items
@@ -1237,10 +1237,11 @@ void QgisApp::createStatusBar()
12371237
exit(0);
12381238
}
12391239
mOnTheFlyProjectionStatusButton->setWhatsThis(tr("This icon shows whether "
1240-
"on the fly projection is enabled or not. Click the icon to bring up "
1240+
"on the fly coordinate reference system transformation is enabled or not. "
1241+
"Click the icon to bring up "
12411242
"the project properties dialog to alter this behaviour."));
1242-
mOnTheFlyProjectionStatusButton->setToolTip(tr("Projection status - Click "
1243-
"to open projection dialog"));
1243+
mOnTheFlyProjectionStatusButton->setToolTip(tr("CRS status - Click "
1244+
"to open coordinate reference system dialog"));
12441245
connect(mOnTheFlyProjectionStatusButton, SIGNAL(clicked()),
12451246
this, SLOT(projectPropertiesProjections()));//bring up the project props dialog when clicked
12461247
statusBar()->addPermanentWidget(mOnTheFlyProjectionStatusButton,0);

src/app/qgsprojectproperties.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ QgsProjectProperties::QgsProjectProperties(QgsMapCanvas* mapCanvas, QWidget *par
5959
bool myProjectionEnabled = myRender->projectionsEnabled();
6060
cbxProjectionEnabled->setChecked(myProjectionEnabled);
6161

62-
// set the default wkt to WGS 84
6362
long mySRSID = myRender->destinationSrs().srsid();
6463
QgsDebugMsg("Read project SRSID: " + QString::number(mySRSID));
6564
projectionSelector->setSelectedSRSID(mySRSID);

0 commit comments

Comments
 (0)