1.1 --- a/branchobj.cpp	Thu Sep 01 15:35:18 2005 +0000
     1.2 +++ b/branchobj.cpp	Mon Sep 05 11:56:31 2005 +0000
     1.3 @@ -743,6 +743,8 @@
     1.4  	else
     1.5  		posAttr="";
     1.6  
     1.7 +	QString linkAttr=getLinkAttr();
     1.8 +
     1.9  	QString urlAttr;
    1.10  	if (!url.isEmpty())
    1.11  		urlAttr=attribut ("url",url);
    1.12 @@ -770,11 +772,11 @@
    1.13  	} else
    1.14  		areaAttr="";
    1.15  	
    1.16 -    s=beginElement ("branch" +scrolledAttr +posAttr +urlAttr +vymLinkAttr +frameAttr +areaAttr );
    1.17 +    s=beginElement ("branch" +scrolledAttr +posAttr +linkAttr +urlAttr +vymLinkAttr +frameAttr +areaAttr );
    1.18      incIndent();
    1.19  
    1.20  	// save heading
    1.21 -    s=s+valueElement("heading", getHeading(),
    1.22 +    s+=valueElement("heading", getHeading(),
    1.23  		attribut ("textColor",QColor(heading->getColor()).name()));
    1.24  
    1.25  	// save names of flags set
    1.26 @@ -1302,6 +1304,15 @@
    1.27  
    1.28  void BranchObj::select()
    1.29  {
    1.30 +	// set Text in Editor	
    1.31 +	textEditor->setText(note.getNote() );
    1.32 +	QString fnh=note.getFilenameHint();
    1.33 +	if (fnh!="")
    1.34 +		textEditor->setFilenameHint(note.getFilenameHint() );
    1.35 +	else	
    1.36 +		textEditor->setFilenameHint(getHeading() );
    1.37 +	textEditor->setFontHint (note.getFontHint() );
    1.38 +
    1.39      LinkableMapObj::select();
    1.40  	// Tell parent that I am selected now:
    1.41  	BranchObj* po=(BranchObj*)(parObj);
    1.42 @@ -1311,17 +1322,6 @@
    1.43  	// temporary unscroll, if we have scrolled parents somewhere
    1.44  	if (parObj) ((BranchObj*)(parObj))->tmpUnscroll();
    1.45  
    1.46 -	// set Text in Editor	
    1.47 -	textEditor->setText(note.getNote() );
    1.48 -	QString fnh=note.getFilenameHint();
    1.49 -	if (fnh!="")
    1.50 -		textEditor->setFilenameHint(note.getFilenameHint() );
    1.51 -	else	
    1.52 -		textEditor->setFilenameHint(getHeading() );
    1.53 -	textEditor->setFontHint (note.getFontHint() );
    1.54 -	connect (textEditor, SIGNAL (textHasChanged() ), this, SLOT (updateNoteFlag() ) ); 
    1.55 -	connect (textEditor, SIGNAL (fontSizeHasChanged() ), this, SLOT (updateNoteFlag() ) ); 
    1.56 -
    1.57  	// Show URL and link in statusbar
    1.58  	QString status;
    1.59  	if (!url.isEmpty()) status+="URL: "+url+"  ";
    1.60 @@ -1355,10 +1355,6 @@
    1.61  	// reset temporary unscroll, if we have scrolled parents somewhere
    1.62  	if (parObj) ((BranchObj*)(parObj))->resetTmpUnscroll();
    1.63  
    1.64 -	// Disconnect textEditor from this LMO
    1.65 -	disconnect( textEditor, SIGNAL(textHasChanged()), 0, 0 );
    1.66 -	disconnect( textEditor, SIGNAL (fontSizeHasChanged()),0,0 ); 
    1.67 -
    1.68  	// Erase content of editor 
    1.69  	textEditor->setInactive();
    1.70