xml-vym.cpp
changeset 822 c2ce9944148c
parent 821 4a84d7e444d8
child 823 0bba81dde1bc
     1.1 --- a/xml-vym.cpp	Thu Jan 21 11:56:57 2010 +0000
     1.2 +++ b/xml-vym.cpp	Wed Feb 10 13:48:42 2010 +0000
     1.3 @@ -272,7 +272,7 @@
     1.4      switch ( state ) 
     1.5  	{
     1.6  		case StateMap:
     1.7 -			mainWindow->removeProgressValue (branchesTotal); //FIXME-2 let mainWindow handle this 
     1.8 +			mainWindow->removeProgressCounter(); 
     1.9  			break;
    1.10          case StateMapCenter: 
    1.11  			model->emitDataHasChanged (lastBranch);
    1.12 @@ -447,9 +447,6 @@
    1.13  					return false;   // Couldn't read absPos
    1.14  			}           
    1.15  		}           
    1.16 -		if (!a.value( "id").isEmpty() ) 
    1.17 -			lastMI->setID (a.value ("id"));		
    1.18 -			
    1.19  		if (!a.value( "url").isEmpty() ) 
    1.20  			lastMI->setURL (a.value ("url"));
    1.21  		if (!a.value( "vymLink").isEmpty() ) 
    1.22 @@ -555,8 +552,8 @@
    1.23  	{ 
    1.24  		if (!a.value( "endID").isEmpty() ) 
    1.25  		{
    1.26 -			TreeItem *beginBI=model->findID (a.value( "beginID"));
    1.27 -			TreeItem   *endBI=model->findID (a.value( "endID"));
    1.28 +			TreeItem *beginBI=model->findBySelectString (a.value( "beginID"));
    1.29 +			TreeItem   *endBI=model->findBySelectString (a.value( "endID"));
    1.30  			if (beginBI && endBI && beginBI->isBranchLikeType() && endBI->isBranchLikeType() )
    1.31  			{
    1.32  				XLinkItem *xli=model->createXLink (lastBranch,true);