diff -r 4a84d7e444d8 -r c2ce9944148c xml-vym.cpp --- a/xml-vym.cpp Thu Jan 21 11:56:57 2010 +0000 +++ b/xml-vym.cpp Wed Feb 10 13:48:42 2010 +0000 @@ -272,7 +272,7 @@ switch ( state ) { case StateMap: - mainWindow->removeProgressValue (branchesTotal); //FIXME-2 let mainWindow handle this + mainWindow->removeProgressCounter(); break; case StateMapCenter: model->emitDataHasChanged (lastBranch); @@ -447,9 +447,6 @@ return false; // Couldn't read absPos } } - if (!a.value( "id").isEmpty() ) - lastMI->setID (a.value ("id")); - if (!a.value( "url").isEmpty() ) lastMI->setURL (a.value ("url")); if (!a.value( "vymLink").isEmpty() ) @@ -555,8 +552,8 @@ { if (!a.value( "endID").isEmpty() ) { - TreeItem *beginBI=model->findID (a.value( "beginID")); - TreeItem *endBI=model->findID (a.value( "endID")); + TreeItem *beginBI=model->findBySelectString (a.value( "beginID")); + TreeItem *endBI=model->findBySelectString (a.value( "endID")); if (beginBI && endBI && beginBI->isBranchLikeType() && endBI->isBranchLikeType() ) { XLinkItem *xli=model->createXLink (lastBranch,true);