1.1 --- a/vymmodel.cpp	Mon Jun 29 10:28:28 2009 +0000
     1.2 +++ b/vymmodel.cpp	Tue Jul 07 09:34:24 2009 +0000
     1.3 @@ -1623,7 +1623,7 @@
     1.4  			saveState (bi, QString("setFrameType (\"%1\")").arg(s),
     1.5  				bi, QString ("setFrameType (\"%1\")").arg(bo->getFrameTypeName()),QString ("set type of frame to %1").arg(s));
     1.6  			reposition();
     1.7 -			bo->updateLink();
     1.8 +			bo->updateLinkGeometry();
     1.9  		}
    1.10  	}
    1.11  }
    1.12 @@ -1640,7 +1640,7 @@
    1.13  				bi, QString ("setFrameType (\"%1\")").arg(s),QString ("set type of frame to %1").arg(s));
    1.14  			bo->setFrameType (s);
    1.15  			reposition();
    1.16 -			bo->updateLink();
    1.17 +			bo->updateLinkGeometry();
    1.18  		}
    1.19  	}
    1.20  }
    1.21 @@ -1688,7 +1688,7 @@
    1.22  				bi, QString ("setFramePadding (\"%1\")").arg(i),QString ("set brush color of frame to %1").arg(i));
    1.23  			bo->setFramePadding (i);
    1.24  			reposition();
    1.25 -			bo->updateLink();
    1.26 +			bo->updateLinkGeometry();
    1.27  		}	
    1.28  	}	
    1.29  }
    1.30 @@ -1705,7 +1705,7 @@
    1.31  				bi, QString ("setFrameBorderWidth (\"%1\")").arg(i),QString ("set border width of frame to %1").arg(i));
    1.32  			bo->setFrameBorderWidth (i);
    1.33  			reposition();
    1.34 -			bo->updateLink();
    1.35 +			bo->updateLinkGeometry();
    1.36  		}	
    1.37  	}	
    1.38  }
    1.39 @@ -1763,26 +1763,21 @@
    1.40  
    1.41  void VymModel::setHideLinkUnselected (bool b)//FIXME-2
    1.42  {
    1.43 -/*
    1.44 -	LinkableMapObj *sel=getSelectedLMO();
    1.45 -	if (sel &&
    1.46 -		(selectionType() == TreeItem::Branch || 
    1.47 -		selectionType() == TreeItem::MapCenter  ||
    1.48 -		selectionType() == TreeItem::Image ))
    1.49 +	TreeItem *ti=getSelectedItem();
    1.50 +	if (ti && (ti->getType()==TreeItem::Image ||ti->isBranchLikeType()))
    1.51  	{
    1.52  		QString u= b ? "false" : "true";
    1.53  		QString r=!b ? "false" : "true";
    1.54  		
    1.55  		saveState(
    1.56 -			sel,
    1.57 +			ti,
    1.58  			QString("setHideLinkUnselected (%1)").arg(u),
    1.59 -			sel, 
    1.60 +			ti, 
    1.61  			QString("setHideLinkUnselected (%1)").arg(r),
    1.62 -			QString("Hide link of %1 if unselected").arg(getObjectName(sel))
    1.63 +			QString("Hide link of %1 if unselected").arg(getObjectName(ti))
    1.64  		);	
    1.65 -		sel->setHideLinkUnselected(b);
    1.66 +		((MapItem*)ti)->setHideLinkUnselected(b);
    1.67  	}
    1.68 -*/
    1.69  }
    1.70  
    1.71  void VymModel::setHideExport(bool b)
    1.72 @@ -4283,7 +4278,7 @@
    1.73                  QString("Move %1 to relative position %2").arg(getObjectName(bo)).arg(ps));
    1.74              ((OrnamentedObj*)bo)->move2RelPos (x,y);
    1.75              reposition();
    1.76 -            bo->updateLink();
    1.77 +            bo->updateLinkGeometry();
    1.78              emitSelectionChanged();
    1.79          }
    1.80  	}
    1.81 @@ -4953,9 +4948,7 @@
    1.82  		TreeItem *ti = getItem (list.first() );
    1.83  		TreeItem::Type type=ti->getType();
    1.84  		if (type ==TreeItem::Branch || type==TreeItem::MapCenter || type==TreeItem::Image)
    1.85 -		{
    1.86 -			return ti->getLMO();
    1.87 -		}	
    1.88 +			return ((MapItem*)ti)->getLMO();
    1.89  	}
    1.90  	return NULL;
    1.91  }
    1.92 @@ -4964,7 +4957,7 @@
    1.93  {
    1.94  	TreeItem *ti = getSelectedBranchItem();
    1.95  	if (ti)
    1.96 -		return (BranchObj*)(ti->getLMO());
    1.97 +		return (BranchObj*)(  ((MapItem*)ti)->getLMO());
    1.98  	else	
    1.99  		return NULL;
   1.100  }