1.1 Binary file demos/todo.vym has changed

     2.1 --- a/mapeditor.cpp	Wed May 31 12:27:38 2006 +0000
     2.2 +++ b/mapeditor.cpp	Wed May 31 12:27:39 2006 +0000
     2.3 @@ -321,6 +321,7 @@
     2.4  		{
     2.5  			mapCenter->moveAllBy(dx,dy);
     2.6  			mapCenter->reposition();
     2.7 +//			mapCenter->positionBBox();	// To move float
     2.8  
     2.9  			// scroll the view (in order to not move map on screen)
    2.10  			scrollBy (dx,dy);
    2.11 @@ -2316,7 +2317,7 @@
    2.12  	{		
    2.13  		BranchObj *bo=(BranchObj*)selection;
    2.14  		QString url= "https://bugzilla.novell.com/show_bug.cgi?id="+bo->getHeading();
    2.15 -		saveState("setURL (\""+bo->getURL()+"\")","setURL (\""+url+"\")",QString("Use heading of %1 as link to Bugzilla").arg(getName(bo)));	
    2.16 +		saveState("setURL (\""+bo->getURL()+"\")","setURL (\""+url+"\")",QString("Use heading of %1 as link to Novell Bugzilla").arg(getName(bo)));	
    2.17  		bo->setURL (url);
    2.18  		updateActions();
    2.19  	}
    2.20 @@ -2438,7 +2439,7 @@
    2.21  {
    2.22  	if (selection && (typeid(*selection) == typeid(BranchObj) ))
    2.23  	{		
    2.24 -		saveState(selection->getParObj(), QString("Remove childs of branch").arg(getName(selection)));
    2.25 +		saveState(selection->getParObj(), QString("Remove childs of branch %1").arg(getName(selection)));
    2.26  		((BranchObj*)selection)->removeChilds();
    2.27  		mapCenter->reposition();
    2.28  	}	
    2.29 @@ -3073,6 +3074,9 @@
    2.30  {
    2.31  	cout << "MapEditor::testFunction() called\n";
    2.32  
    2.33 +	mapCenter->positionBBox();
    2.34 +	return;
    2.35 +
    2.36  	WarningDialog dia;
    2.37  	dia.setCancelButton (true);
    2.38  	dia.setText("This is a longer \nWarning");
    2.39 @@ -3425,14 +3429,6 @@
    2.40  				} else	
    2.41  				{
    2.42  					lmosel->unsetParObjTmp();
    2.43 -					/* FIXME not needed anymore?
    2.44 -					if (lmo &&(lmo==selection))   
    2.45 -						// Could link to myself (happens sometimes...)
    2.46 -						lmosel->unsetParObjTmp();
    2.47 -					if (!lmo)  
    2.48 -						// no Obj under selection, go back to original Parent
    2.49 -						lmosel->unsetParObjTmp();
    2.50 -					*/	
    2.51  				}		
    2.52  			} // depth>0
    2.53  
    2.54 @@ -3524,8 +3520,7 @@
    2.55  		dst=mapCenter->findMapObj(inverseWorldMatrix().map(e->pos() ), 
    2.56  			((LinkableMapObj*)selection) );
    2.57  
    2.58 -		if (dst &&
    2.59 -		(typeid(*dst)!=typeid(BranchObj)&&typeid(*dst)!=typeid(MapCenterObj))) 
    2.60 +		if (dst && (typeid(*dst)!=typeid(BranchObj) && typeid(*dst)!=typeid(MapCenterObj))) 
    2.61  			dst=NULL;
    2.62  		
    2.63  		// Now check, if we have been moving a branch 

     3.1 --- a/mapobj.cpp	Wed May 31 12:27:38 2006 +0000
     3.2 +++ b/mapobj.cpp	Wed May 31 12:27:39 2006 +0000
     3.3 @@ -94,7 +94,7 @@
     3.4  {
     3.5  	int ix=(int)x;
     3.6  	int iy=(int)y;
     3.7 -    move (x+absPos.x(),y+absPos.y() );
     3.8 +    MapObj::move (x+absPos.x(),y+absPos.y() );
     3.9  	bbox.moveBy (ix,iy);
    3.10  	clickBox.moveBy (ix,iy);
    3.11  }

     4.1 --- a/ornamentedobj.cpp	Wed May 31 12:27:38 2006 +0000
     4.2 +++ b/ornamentedobj.cpp	Wed May 31 12:27:39 2006 +0000
     4.3 @@ -125,7 +125,6 @@
     4.4  
     4.5  	ornamentsBBox.moveTopLeft ( QPoint ((int)(ox+x),(int)(oy+y)));
     4.6  	clickBox.moveTopLeft (QPoint ((int)(ox + x), (int)(oy + y)));
     4.7 -
     4.8  }
     4.9  
    4.10  void OrnamentedObj::move (double x, double y)

     5.1 --- a/xml.cpp	Wed May 31 12:27:38 2006 +0000
     5.2 +++ b/xml.cpp	Wed May 31 12:27:39 2006 +0000
     5.3 @@ -585,7 +585,11 @@
     5.4  			y=a.value("relPosY").toInt (&oky, 10);
     5.5  			if (okx && oky) 
     5.6  				
     5.7 -				lastFloat->setRelPos (QPoint (x,y) );
     5.8 +				{
     5.9 +					lastFloat->setRelPos (QPoint (x,y) );
    5.10 +					// make sure floats in mapcenter are repositioned to relative pos
    5.11 +					if (mc==lastBranch) mc->positionContents();
    5.12 +				}
    5.13  			else
    5.14  				// Couldn't read relPos
    5.15  				return false;  
    5.16 @@ -594,6 +598,10 @@
    5.17  	
    5.18  	if (!readOOAttr(a)) return false;
    5.19  
    5.20 +	if (!a.value ("orgName").isEmpty() )
    5.21 +	{
    5.22 +		((FloatImageObj*)(lastFloat))->setOriginalFilename (a.value("orgName"));
    5.23 +	}
    5.24  	return true;
    5.25  }
    5.26