diff -r e44baadd4958 -r 72cc3873306a branchobj.cpp --- a/branchobj.cpp Thu Sep 01 15:35:18 2005 +0000 +++ b/branchobj.cpp Mon Sep 05 11:56:31 2005 +0000 @@ -743,6 +743,8 @@ else posAttr=""; + QString linkAttr=getLinkAttr(); + QString urlAttr; if (!url.isEmpty()) urlAttr=attribut ("url",url); @@ -770,11 +772,11 @@ } else areaAttr=""; - s=beginElement ("branch" +scrolledAttr +posAttr +urlAttr +vymLinkAttr +frameAttr +areaAttr ); + s=beginElement ("branch" +scrolledAttr +posAttr +linkAttr +urlAttr +vymLinkAttr +frameAttr +areaAttr ); incIndent(); // save heading - s=s+valueElement("heading", getHeading(), + s+=valueElement("heading", getHeading(), attribut ("textColor",QColor(heading->getColor()).name())); // save names of flags set @@ -1302,6 +1304,15 @@ void BranchObj::select() { + // set Text in Editor + textEditor->setText(note.getNote() ); + QString fnh=note.getFilenameHint(); + if (fnh!="") + textEditor->setFilenameHint(note.getFilenameHint() ); + else + textEditor->setFilenameHint(getHeading() ); + textEditor->setFontHint (note.getFontHint() ); + LinkableMapObj::select(); // Tell parent that I am selected now: BranchObj* po=(BranchObj*)(parObj); @@ -1311,17 +1322,6 @@ // temporary unscroll, if we have scrolled parents somewhere if (parObj) ((BranchObj*)(parObj))->tmpUnscroll(); - // set Text in Editor - textEditor->setText(note.getNote() ); - QString fnh=note.getFilenameHint(); - if (fnh!="") - textEditor->setFilenameHint(note.getFilenameHint() ); - else - textEditor->setFilenameHint(getHeading() ); - textEditor->setFontHint (note.getFontHint() ); - connect (textEditor, SIGNAL (textHasChanged() ), this, SLOT (updateNoteFlag() ) ); - connect (textEditor, SIGNAL (fontSizeHasChanged() ), this, SLOT (updateNoteFlag() ) ); - // Show URL and link in statusbar QString status; if (!url.isEmpty()) status+="URL: "+url+" "; @@ -1355,10 +1355,6 @@ // reset temporary unscroll, if we have scrolled parents somewhere if (parObj) ((BranchObj*)(parObj))->resetTmpUnscroll(); - // Disconnect textEditor from this LMO - disconnect( textEditor, SIGNAL(textHasChanged()), 0, 0 ); - disconnect( textEditor, SIGNAL (fontSizeHasChanged()),0,0 ); - // Erase content of editor textEditor->setInactive();