- The application caption now syncs to new project titles; previously it would

only do so if a project was loaded.

- Application caption now (hopefully) made consistent regardless of how the
  project title is set, whether from reading an existing project, changing the
  project properties, or setting up a new project.


git-svn-id: http://svn.osgeo.org/qgis/trunk@2374 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
mcoletti 2004-11-29 19:43:04 +00:00
parent 67f279f022
commit 5e8e39bd04

View File

@ -1321,7 +1321,12 @@ void QgisApp::fileNew()
QgsMapLayerRegistry::instance()->removeAllMapLayers();
mMapCanvas->clear();
mOverviewCanvas->clear();
setCaption(tr("Quantum GIS -- Untitled"));
QString caption = tr("Quantum GIS - ");
caption += QString("%1 ('%2')").arg(QGis::qgisVersion).arg(QGis::qgisReleaseName);
caption += " -- Untitled";
setCaption( caption );
QgsProject::instance()->filename( QString::null );
QgsProject::instance()->clearProperties(); // why carry over properties from previous projects?
@ -1350,7 +1355,11 @@ void QgisApp::fileNew(bool thePromptToSaveFlag)
mOverviewCanvas->removeAll();
mOverviewCanvas->clear();
setCaption(tr("Quantum GIS -- Untitled"));
QString caption = tr("Quantum GIS - ");
caption += QString("%1 ('%2')").arg(QGis::qgisVersion).arg(QGis::qgisReleaseName);
caption += " Untitled ";
setCaption( caption );
QgsProject::instance()->filename( QString::null );
QgsProject::instance()->clearProperties(); // why carry over properties from previous projects?
@ -1493,7 +1502,10 @@ void QgisApp::fileOpen()
if ( QgsProject::instance()->read() )
{
setCaption(tr("Quantum GIS --") + " " + QgsProject::instance()->title());
QString caption = tr("Quantum GIS - ");
caption += QString("%1 ('%2') ").arg(QGis::qgisVersion).arg(QGis::qgisReleaseName);
setCaption( caption + " " + QgsProject::instance()->title() );
emit projectRead(); // let plug-ins know that we've read in a new
// project so that they can check any project
@ -1522,7 +1534,10 @@ bool QgisApp::addProject(QString projectFile)
{
if ( QgsProject::instance()->read( projectFile ) )
{
setCaption(tr("Quantum GIS --") + " " + QgsProject::instance()->title() );
QString caption = tr("Quantum GIS - ");
caption += QString("%1 ('%2') ").arg(QGis::qgisVersion).arg(QGis::qgisReleaseName);
setCaption( caption + " " + QgsProject::instance()->title() );
emit projectRead(); // let plug-ins know that we've read in a new
// project so that they can check any project
@ -3353,6 +3368,12 @@ void QgisApp::projectProperties()
// set the map units for the project (ie the map canvas)
mMapCanvas->setMapUnits(pp->mapUnits());
QgsProject::instance()->title( pp->title() );
QString caption = tr("Quantum GIS - ");
caption += QString("%1 ('%2') ").arg(QGis::qgisVersion).arg(QGis::qgisReleaseName);
setCaption(caption + pp->title());
}
}