# HG changeset patch
# User insilmaril
# Date 1238053832 0
# Node ID 008e72977ab860416a82f36704df6527e19be822
# Parent  ee6b0f3a4c2f51b7d983bf70d673d818a37bebc5
Notes work again (to some degree)

diff -r ee6b0f3a4c2f -r 008e72977ab8 branchitem.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/branchitem.cpp	Thu Mar 26 07:50:32 2009 +0000
@@ -0,0 +1,116 @@
+#include "branchitem.h"
+#include "branchobj.h"
+
+#include <iostream>
+using namespace std;
+
+BranchItem::BranchItem(const QList<QVariant> &data, TreeItem *parent):TreeItem (data,parent)
+{
+	cout << "Constr. BranchItem\n";
+}
+
+BranchItem::~BranchItem()
+{
+	cout << "Destr. BranchItem\n";
+    qDeleteAll(childItems);
+}
+
+QString BranchItem::saveToDir (const QString &tmpdir,const QString &prefix, const QPointF& offset)
+{
+	// Cloudy stuff can be hidden during exports
+	if (hidden) return "";
+
+    QString s,a;
+	BranchObj *bo=(BranchObj*)lmo;
+
+	/* FIXME-1
+	// Update of note is usually done while unselecting a branch
+	if (isNoteInEditor) getNoteFromTextEditor();
+	
+	QString scrolledAttr;
+	if (scrolled) 
+		scrolledAttr=attribut ("scrolled","yes");
+	else
+		scrolledAttr="";
+
+	// save area, if not scrolled
+	QString areaAttr;
+	if (!((BranchObj*)(parObj))->isScrolled() )
+	{
+		areaAttr=
+			attribut("x1",QString().setNum(absPos.x()-offset.x())) +
+			attribut("y1",QString().setNum(absPos.y()-offset.y())) +
+			attribut("x2",QString().setNum(absPos.x()+width()-offset.x())) +
+			attribut("y2",QString().setNum(absPos.y()+height()-offset.y()));
+
+	} else
+		areaAttr="";
+	
+	// Providing an ID for a branch makes export to XHTML easier
+	QString idAttr;
+	if (countXLinks()>0)
+		idAttr=attribut ("id",model->getSelectString(this)); //TODO directly access model
+	else
+		idAttr="";
+
+	*/
+    s=beginElement ("branch" 
+	//	+getOrnXMLAttr() 
+	//	+scrolledAttr 
+	//	+areaAttr 
+	//	+idAttr 
+	//	+getIncludeImageAttr() 
+		);
+    incIndent();
+
+	// save heading
+    s+=valueElement("heading", getHeading(),
+		attribut ("textColor",QColor( bo->getColor()).name()));
+
+/*
+	// Save frame
+	if (frame->getFrameType()!=FrameObj::NoFrame) 
+		s+=frame->saveToDir ();
+
+	// save names of flags set
+	s+=standardFlags->saveToDir(tmpdir,prefix,0);
+	
+	// Save FloatImages
+	for (int i=0; i<floatimage.size(); ++i)
+		s+=floatimage.at(i)->saveToDir (tmpdir,prefix);
+*/
+
+	// save note
+	if (!note.isEmpty() )
+		s+=note.saveToDir();
+	
+	// Save branches
+	TreeItem *ti=getFirstBranch();
+	TreeItem *last=getLastBranch();
+	while (ti && ti!=last) 
+		s+=ti->saveToDir(tmpdir,prefix,offset);
+
+	/*
+	// Save XLinks
+	QString ol;	// old link
+	QString cl;	// current link
+	for (int i=0; i<xlink.size(); ++i)
+	{
+		cl=xlink.at(i)->saveToDir();
+		if (cl!=ol)
+		{
+			s+=cl;
+			ol=cl;
+		} else
+		{
+			qWarning (QString("Ignoring of duplicate xLink in %1").arg(getHeading()));
+		}
+	}	
+	*/
+
+    decIndent();
+    s+=endElement   ("branch");
+    return s;
+}
+
+
diff -r ee6b0f3a4c2f -r 008e72977ab8 branchitem.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/branchitem.h	Thu Mar 26 07:50:32 2009 +0000
@@ -0,0 +1,18 @@
+#ifndef BRANCHITEM_H
+#define BRANCHITEM_H
+
+#include "treeitem.h"
+
+class QString;
+
+class BranchItem:public TreeItem
+{
+public:
+    BranchItem(const QList<QVariant> &data, TreeItem *parent = 0);
+    ~BranchItem();
+
+	QString saveToDir (const QString &tmpdir,const QString &prefix, const QPointF& offset);
+
+};
+
+#endif
diff -r ee6b0f3a4c2f -r 008e72977ab8 version.h
--- a/version.h	Thu Mar 26 07:49:17 2009 +0000
+++ b/version.h	Thu Mar 26 07:50:32 2009 +0000
@@ -7,7 +7,7 @@
 #define __VYM_VERSION "1.13.0"
 //#define __VYM_CODENAME "Codename: RC-1"
 #define __VYM_CODENAME "Codename: development version"
-#define __VYM_BUILD_DATE "2009-03-24"
+#define __VYM_BUILD_DATE "2009-03-26"
 
 
 bool checkVersion(const QString &);