1.1 --- a/xml.cpp	Tue Jan 03 09:44:41 2006 +0000
     1.2 +++ b/xml.cpp	Tue Jan 03 09:44:41 2006 +0000
     1.3 @@ -420,7 +420,7 @@
     1.4  		{
     1.5  			x=a.value("absPosX").toInt (&okx, 10);
     1.6  			y=a.value("absPosY").toInt (&oky, 10);
     1.7 -			if (okx && oky) 
     1.8 +			if (okx && oky  )
     1.9  				lastBranch->move(x,y);
    1.10  			else
    1.11  				return false;   // Couldn't read absPos
    1.12 @@ -434,16 +434,26 @@
    1.13  		lastBranch->setVymLink (a.value ("vymLink"));
    1.14  	if (!a.value( "frameType").isEmpty() ) 
    1.15  		lastBranch->setFrameType (a.value("frameType"));
    1.16 +
    1.17 +	if (!a.value( "incImgV").isEmpty() ) 
    1.18 +		lastBranch->setIncludeImagesVer(a.value("incImgV"));
    1.19 +	if (!a.value( "incImgH").isEmpty() ) 
    1.20 +		lastBranch->setIncludeImagesHor(a.value("incImgH"));
    1.21  	return true;	
    1.22  }
    1.23  
    1.24  bool mapBuilderHandler::readLinkAttr (const QXmlAttributes& a)
    1.25  {
    1.26 -	if (!a.value( "hideLinkUnselected").isEmpty()) 
    1.27 +	if (lastLMO)
    1.28  	{
    1.29 -		if (a.value ("hideLinkUnselected") =="true")
    1.30 -			if (lastLMO) lastLMO->setHideLinkUnselected(true);
    1.31 -	}	
    1.32 +		if (!a.value( "hideLink").isEmpty()) 
    1.33 +		{
    1.34 +			if (a.value ("hideLink") =="true")
    1.35 +				lastLMO->setHideLinkUnselected(true);
    1.36 +			else	
    1.37 +				lastLMO->setHideLinkUnselected(false);
    1.38 +		}	
    1.39 +	}
    1.40  	return true;	
    1.41  }
    1.42  
    1.43 @@ -496,7 +506,6 @@
    1.44  bool mapBuilderHandler::readFloatImageAttr (const QXmlAttributes& a)
    1.45  {
    1.46  	lastLMO=lastFloat;
    1.47 -	if (!readLinkAttr(a)) return false;
    1.48  	
    1.49  	if (!a.value( "useOrientation").isEmpty() ) 
    1.50  	{
    1.51 @@ -520,7 +529,7 @@
    1.52  	}	
    1.53  	if (!a.value( "floatExport").isEmpty() ) 
    1.54  	{
    1.55 -		if (a.value ("floatExpofrt") =="true")
    1.56 +		if (a.value ("floatExport") =="true")
    1.57  			lastFloat->setFloatExport (true);
    1.58  		else	
    1.59  			lastFloat->setFloatExport (false);
    1.60 @@ -543,6 +552,9 @@
    1.61  				return false;  
    1.62  		}           
    1.63  	}	
    1.64 +	
    1.65 +	if (!readLinkAttr(a)) return false;
    1.66 +
    1.67  	return true;
    1.68  }
    1.69