diff -r 8814a667241a -r aa48c7b52549 xml.cpp --- a/xml.cpp Tue Jan 03 09:44:41 2006 +0000 +++ b/xml.cpp Tue Jan 03 09:44:41 2006 +0000 @@ -420,7 +420,7 @@ { x=a.value("absPosX").toInt (&okx, 10); y=a.value("absPosY").toInt (&oky, 10); - if (okx && oky) + if (okx && oky ) lastBranch->move(x,y); else return false; // Couldn't read absPos @@ -434,16 +434,26 @@ lastBranch->setVymLink (a.value ("vymLink")); if (!a.value( "frameType").isEmpty() ) lastBranch->setFrameType (a.value("frameType")); + + if (!a.value( "incImgV").isEmpty() ) + lastBranch->setIncludeImagesVer(a.value("incImgV")); + if (!a.value( "incImgH").isEmpty() ) + lastBranch->setIncludeImagesHor(a.value("incImgH")); return true; } bool mapBuilderHandler::readLinkAttr (const QXmlAttributes& a) { - if (!a.value( "hideLinkUnselected").isEmpty()) + if (lastLMO) { - if (a.value ("hideLinkUnselected") =="true") - if (lastLMO) lastLMO->setHideLinkUnselected(true); - } + if (!a.value( "hideLink").isEmpty()) + { + if (a.value ("hideLink") =="true") + lastLMO->setHideLinkUnselected(true); + else + lastLMO->setHideLinkUnselected(false); + } + } return true; } @@ -496,7 +506,6 @@ bool mapBuilderHandler::readFloatImageAttr (const QXmlAttributes& a) { lastLMO=lastFloat; - if (!readLinkAttr(a)) return false; if (!a.value( "useOrientation").isEmpty() ) { @@ -520,7 +529,7 @@ } if (!a.value( "floatExport").isEmpty() ) { - if (a.value ("floatExpofrt") =="true") + if (a.value ("floatExport") =="true") lastFloat->setFloatExport (true); else lastFloat->setFloatExport (false); @@ -543,6 +552,9 @@ return false; } } + + if (!readLinkAttr(a)) return false; + return true; }