diff -r 192e1392ba6a -r 12958f987bcf branchobj.cpp
--- a/branchobj.cpp	Wed Jul 16 10:44:44 2008 +0000
+++ b/branchobj.cpp	Wed Jul 16 10:46:14 2008 +0000
@@ -21,7 +21,7 @@
 BranchObj* BranchObj::itFirst=NULL;
 
 
-BranchObj::BranchObj () :OrnamentedObj()
+BranchObj::BranchObj () :OrnamentedObj()	// FIXME needed at all?
 {
 //    cout << "Const BranchObj ()\n";
     setParObj (this);	
@@ -103,7 +103,7 @@
 	branch.clear();
 	for (int i=0; i<other->branch.size(); ++i)
 		// Make deep copy of b
-		// Because addBranch again calls copy for the childs,
+		// Because addBranch again calls copy for the children,
 		// Those will get a deep copy, too
 		addBranch(other->branch.at(i) );	
 
@@ -214,7 +214,7 @@
 		if (off==0)
 		{
 			// new parent is just a branch, link to it
-			QRectF t=o->getBBoxSizeWithChilds();
+			QRectF t=o->getBBoxSizeWithChildren();
 			if (o->getLastBranch())
 				y=t.y() + t.height() ;
 			else
@@ -343,10 +343,10 @@
 		standardFlags->setVisibility(v);
 		LinkableMapObj::setVisibility (v);
 		
-		// Only change childs, if I am not scrolled
+		// Only change children, if I am not scrolled
 		if (!scrolled && (depth < toDepth))
 		{
-			// Now go recursivly through all childs
+			// Now go recursivly through all children
 			int i;
 			for (i=0; i<branch.size(); ++i)
 				branch.at(i)->setVisibility (v,toDepth);	
@@ -370,9 +370,9 @@
 	// Overloaded from LinkableMapObj
 	// BranchObj can use color of heading
 
-	if (mapEditor)
+	if (model)
 	{
-		if (mapEditor->getMapLinkColorHint()==HeadingColor)
+		if (model->getMapLinkColorHint()==HeadingColor)
 			LinkableMapObj::setLinkColor (heading->getColor() );
 		else	
 			LinkableMapObj::setLinkColor ();
@@ -409,13 +409,13 @@
 		// no itLast, we are just beginning
 		if (bo) 
 		{
-			// we have childs, return first one
+			// we have children, return first one
 			itLast=this;
 			return bo;
 		}	
 		else
 		{
-			// No childs, so there is no next
+			// No children, so there is no next
 			itLast=this;
 			return NULL;
 		}	
@@ -426,12 +426,12 @@
 	{	// We come from parent
 		if (bo)
 		{
-			// there are childs, go there
+			// there are children, go there
 			itLast=this;
 			return bo;
 		}	
 		else
-		{	// no childs, try to go up again
+		{	// no children, try to go up again
 			if (po)
 			{
 				// go back to parent and try to find next there
@@ -450,17 +450,17 @@
 		}
 	}
 
-	// We don't come from parent, but from brother or childs
+	// We don't come from parent, but from brother or children
 
-	// Try to find last child, where we came from, in my own childs
+	// Try to find last child, where we came from, in my own children
 	bool searching=true;
 	int i=0;
 	while (i<branch.size())
 	{
-		// Try to find itLast in my own childs
+		// Try to find itLast in my own children
 		if (itLast==branch.at(i))
 		{
-			// ok, we come from my own childs
+			// ok, we come from my own children
 			if (i<branch.size()-1)
 				bo=branch.at(i+1);
 			 else
@@ -471,7 +471,7 @@
 		++i;	
 	}
 	if (!searching)
-	{	// found itLast in my childs
+	{	// found itLast in my children
 		if (bo)
 		{
 			// found a brother of lastLMO 
@@ -756,7 +756,7 @@
 		hidden=false;
 	}	
 
-	// And take care of my childs
+	// And take care of my children
 	for (int i=0; i<branch.size(); ++i)
 		branch.at(i)->setHideTmp (mode);
 }
@@ -1114,7 +1114,7 @@
 void BranchObj::removeBranchHere(BranchObj* borem)
 {
 	// This removes the branch bo from list, but 
-	// inserts its childs at the place of bo
+	// inserts its children at the place of bo
 	BranchObj *bo;
 	bo=borem->getLastBranch();
 	int pos=borem->getNum();
@@ -1126,7 +1126,7 @@
 	removeBranch (borem);
 }
 
-void BranchObj::removeChilds()
+void BranchObj::removeChildren()
 {
 	clear();
 }
@@ -1302,7 +1302,7 @@
 	}	
 }
 
-void BranchObj::alignRelativeTo (QPointF ref)
+void BranchObj::alignRelativeTo (QPointF ref,bool alignSelf)
 {
 	qreal th = bboxTotal.height();	
 // TODO testing
@@ -1313,9 +1313,11 @@
 		"  ref="<<ref<<
 //		"  bbox.topLeft="<<bboxTotal.topLeft()<<
 		"  absPos="<<absPos<<
-		"  relPos="<<relPos<<
-		"  parPos="<<pp<<
+//		"  relPos="<<relPos<<
+//		"  parPos="<<pp<<
+		"  width="<<bbox.width()<<
 		"  orient="<<orientation<<
+		"  alignSelf="<<alignSelf<<
 //		"  pad="<<topPad<<","<<botPad<<","<<leftPad<<","<<rightPad<<
 //		"  hidden="<<hidden<<
 //		"  th="<<th<<
@@ -1351,24 +1353,26 @@
 		{
 			LinkableMapObj::Orientation o;
 			o=parObj->getOrientation();
-			switch (orientation) 
-			{
-				case LinkableMapObj::LeftOfCenter:
-					move (ref.x() - bbox.width(), ref.y() + (th-bbox.height())/2 );
-				break;
-				case LinkableMapObj::RightOfCenter:	
-					move (ref.x() , ref.y() + (th-bbox.height())/2  );
-				break;
-				default:
-					qWarning ("LMO::alignRelativeTo: oops, no orientation given...");
-				break;
-			}	
+			if (alignSelf)
+				switch (orientation) 
+				{
+					case LinkableMapObj::LeftOfCenter:
+						move (ref.x() - bbox.width(), ref.y() + (th-bbox.height())/2 );
+						//move (ref.x() , ref.y() + (th-bbox.height())/2 );
+					break;
+					case LinkableMapObj::RightOfCenter:	
+						move (ref.x() , ref.y() + (th-bbox.height())/2  );
+					break;
+					default:
+						qWarning ("LMO::alignRelativeTo: oops, no orientation given...");
+					break;
+				}
 		}
     }		
 
 	if (scrolled) return;
 
-    // Set reference point for alignment of childs
+    // Set reference point for alignment of children
     QPointF ref2;
     if (orientation==LinkableMapObj::LeftOfCenter)
 		ref2.setX(bbox.topLeft().x() - linkwidth);
@@ -1380,13 +1384,15 @@
 	else	
 		ref2.setY(ref.y() );	
 
-    // Align the childs depending on reference point 
+    // Align the children depending on reference point 
 	for (int i=0; i<branch.size(); ++i)
     {	
 		if (!branch.at(i)->isHidden())
 		{
-			branch.at(i)->alignRelativeTo (ref2);
-			ref2.setY(ref2.y() + branch.at(i)->getBBoxSizeWithChilds().height() );
+			branch.at(i)->alignRelativeTo (ref2,true);
+
+			// append next branch below current one
+			ref2.setY(ref2.y() + branch.at(i)->getBBoxSizeWithChildren().height() );
 		}
     }
 }
@@ -1408,7 +1414,7 @@
 		// only calculate the sizes once. If the deepest LMO 
 		// changes its height,
 		// all upper LMOs have to change, too.
-		calcBBoxSizeWithChilds();
+		calcBBoxSizeWithChildren();
 		updateLink();	// This update is needed if the scene is resized 
 						// due to excessive moving of a FIO
 
@@ -1472,12 +1478,12 @@
 	return r;
 }
 
-QRectF BranchObj::getBBoxSizeWithChilds()
+QRectF BranchObj::getBBoxSizeWithChildren()
 {
 	return bboxTotal;
 }
 
-void BranchObj::calcBBoxSizeWithChilds()
+void BranchObj::calcBBoxSizeWithChildren()
 {	
 	// This is initially called only from reposition and
 	// and only for mapcenter. So it won't be
@@ -1485,11 +1491,11 @@
 	// action
 	
 
-	// Calculate size of LMO including all childs (to align them later)
+	// Calculate size of LMO including all children (to align them later)
 	bboxTotal.setX(bbox.x() );
 	bboxTotal.setY(bbox.y() );
 
-	// if branch is scrolled, ignore childs, but still consider floatimages
+	// if branch is scrolled, ignore children, but still consider floatimages
 	if (scrolled)
 	{
 		bboxTotal.setWidth (bbox.width());
@@ -1523,8 +1529,8 @@
 	{
 		if (!branch.at(i)->isHidden())
 		{
-			branch.at(i)->calcBBoxSizeWithChilds();
-			br=branch.at(i)->getBBoxSizeWithChilds();
+			branch.at(i)->calcBBoxSizeWithChildren();
+			br=branch.at(i)->getBBoxSizeWithChildren();
 			r.setWidth( max (br.width(), r.width() ));
 			r.setHeight(br.height() + r.height() );
 			if (br.y()<bboxTotal.y()) bboxTotal.setY(br.y());
@@ -1573,14 +1579,14 @@
 	updateFlagsToolbar();
 
 	// Update actions
-	mapEditor->updateActions();
+	model->updateActions();
 }
 
 void BranchObj::unselect()
 {
 	LinkableMapObj::unselect();
 	// Delete any messages like vymLink in StatusBar
-	mainWindow->statusMessage ("");
+	mainWindow->statusMessage ("");		//FIXME this causes segfault, when MainWindow is already gone in global destructor on quitting vym
 
 	// Save current note
 	if (isNoteInEditor) getNoteFromTextEditor();
@@ -1609,7 +1615,11 @@
 bool BranchObj::animate()
 {
 	anim.animate ();
-	setRelPos (anim);
-	return anim.isAnimated();
+	if ( anim.isAnimated() )
+	{
+		setRelPos (anim);
+		return true;
+	}
+	return false;
 }