Skip to content

Commit

Permalink
Applied the patch in ticket #57. Resolves the bug in ticket #57.
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@5502 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
g_j_m committed Jun 1, 2006
1 parent 0f11f90 commit c9eaae5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/composer/qgscomposervectorlegend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ bool QgsComposerVectorLegend::writeSettings ( void )
if ( !layer->visible() ) continue;

QString id = layer->getLayerID();
path.sprintf("/composition_%d/vectorlegend_%d/layers/layer_%s/", mComposition->id(), mId, (const char *)id.toLocal8Bit().data() );
path.sprintf("/composition_%d/vectorlegend_%d/layers/layer_%s/", mComposition->id(), mId, id );
QgsProject::instance()->writeEntry( "Compositions", path+"on", layerOn(id) );
QgsProject::instance()->writeEntry( "Compositions", path+"group", layerGroup(id) );
}
Expand Down Expand Up @@ -871,7 +871,7 @@ bool QgsComposerVectorLegend::readSettings ( void )

QString id = (*it).right( (*it).length() - (idx+1) );

path.sprintf("/composition_%d/vectorlegend_%d/layers/layer_%s/", mComposition->id(), mId, (const char *)id.toLocal8Bit().data() );
path.sprintf("/composition_%d/vectorlegend_%d/layers/layer_%s/", mComposition->id(), mId, id );
bool on = QgsProject::instance()->readBoolEntry("Compositions", path+"on", true, &ok);
int group = QgsProject::instance()->readNumEntry("Compositions", path+"group", 0, &ok);
setLayerOn ( id , on );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgisapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2669,7 +2669,7 @@ bool QgisApp::addProject(QString projectFile)
qDebug( "%s:%d BAD LAYERS FOUND", __FILE__, __LINE__ );

QMessageBox::critical( 0x0,
tr("Unable to open project"), e.what(), QMessageBox::Ok,
tr("Unable to open project"), QString::fromLocal8Bit(e.what()), QMessageBox::Ok,
Qt::NoButton );

mMapCanvas->freeze(false);
Expand Down

0 comments on commit c9eaae5

Please sign in to comment.