diff -r 914f330b6aa8 -r 25a77484ec72 ornamentedobj.cpp --- a/ornamentedobj.cpp Thu Apr 02 09:57:47 2009 +0000 +++ b/ornamentedobj.cpp Tue Apr 07 16:15:53 2009 +0000 @@ -57,9 +57,6 @@ frame = new FrameObj (scene); - hideExport=false; - hidden=false; - url=""; vymLink=""; @@ -76,16 +73,10 @@ ornamentsBBox=other->ornamentsBBox; - hideExport=other->hideExport; url=other->url; vymLink=other->vymLink; } -QString OrnamentedObj::getHeading() -{ - return heading->text(); -} - void OrnamentedObj::setLinkColor() { if (model->getMapLinkColorHint()==HeadingColor) @@ -198,13 +189,13 @@ ox=leftPad + d; oy=topPad + d; - systemFlags-> move (ox +x , oy + y ); + //FIXME-2 systemFlags-> move (ox +x , oy + y ); // vertical align heading to bottom heading->move (ox + x + systemFlags->getBBox().width(), oy + y + ornamentsBBox.height() - heading->getHeight() ); - standardFlags->move (ox +x + heading->getWidth() + systemFlags->getBBox().width() , oy + y ); + //FIXME-2 standardFlags->move (ox +x + heading->getWidth() + systemFlags->getBBox().width() , oy + y ); ornamentsBBox.moveTopLeft ( QPointF ((int)(ox+x),(int)(oy+y))); clickBox.moveTopLeft (QPointF ((int)(ox + x), (int)(oy + y))); @@ -412,32 +403,6 @@ standardFlags->updateToolbar(); } -void OrnamentedObj::setHideInExport(bool b) -{ - if (parObj) - { - // Don't allow to MapCenter to be hidden - hideExport=b; - if (b) - systemFlags->activate("hideInExport"); - else - systemFlags->deactivate("hideInExport"); - calcBBoxSize(); - positionBBox(); - requestReposition(); - } -} - -bool OrnamentedObj::hideInExport() -{ - return hideExport; -} - -bool OrnamentedObj::isHidden() -{ - return hidden; -} - QString OrnamentedObj::getOrnXMLAttr() { QString posAttr; @@ -467,12 +432,12 @@ if (!vymLink.isEmpty()) vymLinkAttr=attribut ("vymLink",convertToRel(model->getDestPath(),vymLink) ); - QString hideExpAttr; +/* FIXME-2 QString hideExpAttr; if (hideExport) hideExpAttr= attribut("hideInExport","true"); else hideExpAttr=""; - - return posAttr +urlAttr +vymLinkAttr +getLinkAttr() +hideExpAttr; +*/ + return posAttr +urlAttr +vymLinkAttr +getLinkAttr() ;//+hideExpAttr; }