mapeditor.cpp
changeset 756 a8a5c7288f57
parent 755 ed5b407975b3
child 760 59614eaf5fbb
     1.1 --- a/mapeditor.cpp	Thu Apr 23 12:15:31 2009 +0000
     1.2 +++ b/mapeditor.cpp	Mon Apr 27 12:07:15 2009 +0000
     1.3 @@ -918,17 +918,19 @@
     1.4  				if (e->state() & Qt::ShiftModifier && dst->getParObj())
     1.5  				{	// Link above dst
     1.6  					preDstParStr=model->getSelectString (dst->getParObj());
     1.7 -					bsel->linkTo ( (BranchObj*)(bdst->getParObj()), seli->num());
     1.8 +					bsel->linkTo ( (BranchObj*)(bdst->getParObj()), seli->num());	//FIXME-2 not needed
     1.9 +					model->relinkBranch ((BranchItem*)seli,(BranchItem*)dsti->parent(),((BranchItem*)dsti)->num());
    1.10  				} else 
    1.11  				if (e->state() & Qt::ControlModifier && dst->getParObj())
    1.12  				{
    1.13  					// Link below dst
    1.14  					preDstParStr=model->getSelectString (dst->getParObj());
    1.15 -					bsel->linkTo ( (BranchObj*)(bdst->getParObj()), seli->num()+1);
    1.16 +					bsel->linkTo ( (BranchObj*)(bdst->getParObj()), seli->num()+1);//FIXME-2 not needed
    1.17 +					model->relinkBranch ((BranchItem*)seli,(BranchItem*)dsti->parent(),((BranchItem*)seli)->num()+1);
    1.18  				} else	
    1.19  				{	// Append to dst
    1.20  					preDstParStr=model->getSelectString(dst);
    1.21 -					bsel->linkTo (bdst,-1);
    1.22 +					bsel->linkTo (bdst,-1);//FIXME-2 not needed
    1.23  					model->relinkBranch ((BranchItem*)seli,(BranchItem*)dsti);
    1.24  					if (dsti->depth()==0) bsel->move (savePos);
    1.25  				} 
    1.26 @@ -955,7 +957,6 @@
    1.27  
    1.28  				if (seli->depth()==1)
    1.29  				{
    1.30 -					cout << "ME::releaseMouse d=1\n"; // FIXME_1    better use depth
    1.31  					// The select string might be different _after_ moving around.
    1.32  					// Therefor reposition and then use string of old selection, too
    1.33  					model->reposition();