1.1 --- a/ornamentedobj.cpp	Thu Apr 02 09:57:47 2009 +0000
     1.2 +++ b/ornamentedobj.cpp	Tue Apr 07 16:15:53 2009 +0000
     1.3 @@ -57,9 +57,6 @@
     1.4  
     1.5  	frame = new FrameObj (scene);
     1.6  
     1.7 -	hideExport=false;
     1.8 -	hidden=false;
     1.9 -
    1.10  	url="";
    1.11  	vymLink="";
    1.12  	
    1.13 @@ -76,16 +73,10 @@
    1.14  
    1.15  	ornamentsBBox=other->ornamentsBBox;
    1.16  
    1.17 -	hideExport=other->hideExport;
    1.18  	url=other->url;
    1.19  	vymLink=other->vymLink;
    1.20  }
    1.21  
    1.22 -QString OrnamentedObj::getHeading()
    1.23 -{
    1.24 -    return heading->text();
    1.25 -}
    1.26 -
    1.27  void OrnamentedObj::setLinkColor()
    1.28  {
    1.29  	if (model->getMapLinkColorHint()==HeadingColor)
    1.30 @@ -198,13 +189,13 @@
    1.31  	ox=leftPad + d;
    1.32  	oy=topPad + d;
    1.33  	
    1.34 -	systemFlags-> move (ox +x , oy + y );
    1.35 +	//FIXME-2 systemFlags-> move (ox +x , oy + y );
    1.36  
    1.37  	// vertical align heading to bottom
    1.38      heading->move (ox + x + systemFlags->getBBox().width(),
    1.39  				   oy + y + ornamentsBBox.height() - heading->getHeight() 
    1.40  					);
    1.41 -	standardFlags->move (ox +x + heading->getWidth() + systemFlags->getBBox().width() , oy + y );
    1.42 +	//FIXME-2 standardFlags->move (ox +x + heading->getWidth() + systemFlags->getBBox().width() , oy + y );
    1.43  
    1.44  	ornamentsBBox.moveTopLeft ( QPointF ((int)(ox+x),(int)(oy+y)));
    1.45  	clickBox.moveTopLeft (QPointF ((int)(ox + x), (int)(oy + y)));
    1.46 @@ -412,32 +403,6 @@
    1.47  	standardFlags->updateToolbar();
    1.48  }
    1.49  
    1.50 -void OrnamentedObj::setHideInExport(bool b)
    1.51 -{
    1.52 -	if (parObj)
    1.53 -	{
    1.54 -		// Don't allow to MapCenter to be hidden
    1.55 -		hideExport=b;
    1.56 -		if (b)
    1.57 -			systemFlags->activate("hideInExport");
    1.58 -		else	
    1.59 -			systemFlags->deactivate("hideInExport");
    1.60 -		calcBBoxSize();
    1.61 -		positionBBox();
    1.62 -		requestReposition();	
    1.63 -	}
    1.64 -}	
    1.65 -
    1.66 -bool OrnamentedObj::hideInExport()
    1.67 -{
    1.68 -	return hideExport;
    1.69 -}	
    1.70 -
    1.71 -bool OrnamentedObj::isHidden()
    1.72 -{
    1.73 -	return hidden;
    1.74 -}	
    1.75 -
    1.76  QString OrnamentedObj::getOrnXMLAttr()
    1.77  {
    1.78  	QString posAttr;
    1.79 @@ -467,12 +432,12 @@
    1.80  	if (!vymLink.isEmpty())
    1.81  		vymLinkAttr=attribut ("vymLink",convertToRel(model->getDestPath(),vymLink) );
    1.82  
    1.83 -	QString hideExpAttr;
    1.84 +/* FIXME-2 QString hideExpAttr;
    1.85  	if (hideExport)
    1.86  		hideExpAttr= attribut("hideInExport","true");
    1.87  	else	
    1.88  		hideExpAttr="";
    1.89 -
    1.90 -	return posAttr +urlAttr +vymLinkAttr +getLinkAttr() +hideExpAttr;
    1.91 +*/
    1.92 +	return posAttr +urlAttr +vymLinkAttr +getLinkAttr() ;//+hideExpAttr;
    1.93  }
    1.94