# HG changeset patch
# User insilmaril
# Date 1260868499 0
# Node ID 25ee6b988b737ae24120c6515987e4d15f1ecbfb
# Parent  b486ffd0fa1152b762f6149a4ceaa01531e90a16
Fixed A&O report to show subitems

diff -r b486ffd0fa11 -r 25ee6b988b73 exports.cpp
--- a/exports.cpp	Mon Dec 14 10:17:55 2009 +0000
+++ b/exports.cpp	Tue Dec 15 09:14:59 2009 +0000
@@ -185,9 +185,10 @@
 					case 2: // Main heading
 						ts << "\n";
 						ts << underline ( cur->getHeading(), QString("=") );
-						ts << "\n\n";
+						ts << "\n";
 						break;
 					case 3: // Achievement, Bonus, Objective ...
+						ts << "\n\n";
 						ts << underline ( cur->getHeading(), "-");
 						ts << "\n\n";
 						break;
@@ -201,8 +202,8 @@
 						else	if (cur->isActiveStandardFlag ("cross-red"))
 							ts << " [NOT STARTED] ";
 						ts << "\n";
+						break;
 					default:
-						break;
 						ts << (curIndent + "- " + cur->getHeading());
 						ts << "\n";
 						break;
diff -r b486ffd0fa11 -r 25ee6b988b73 mainwindow.cpp
--- a/mainwindow.cpp	Mon Dec 14 10:17:55 2009 +0000
+++ b/mainwindow.cpp	Tue Dec 15 09:14:59 2009 +0000
@@ -1598,6 +1598,8 @@
 
 	branchContextMenu->addSeparator();	
 	branchContextMenu->addAction ( actionLoadImage);
+	if (settings.value( "/mainwindow/showTestMenu",false).toBool() )
+		branchContextMenu->addAction ( actionAddAttribute);
 
 	// Submenu for Links (URLs, vymLinks)
 	branchLinksContextMenu =new QMenu (this);
diff -r b486ffd0fa11 -r 25ee6b988b73 mapeditor.cpp
--- a/mapeditor.cpp	Mon Dec 14 10:17:55 2009 +0000
+++ b/mapeditor.cpp	Tue Dec 15 09:14:59 2009 +0000
@@ -403,13 +403,15 @@
 	}
 }
 
-QRectF MapEditor::getTotalBBox()	//FIXME-2 needed e.g. for image export
+QRectF MapEditor::getTotalBBox()	
 {
 	QRectF r;
-/*
-	for (int i=0;i<rootItem->branchCount(); i++)
-		r=addBBox (rootItem->getBranchNum(i)->getTotalBBox(), r);
-*/ 
+	BranchObj *bo;
+	for (int i=0;i<model->getRootItem()->branchCount(); i++)
+	{
+		bo=(BranchObj*)(model->getRootItem()->getBranchNum(i)->getLMO());
+		if (bo) r=addBBox (bo->getTotalBBox(), r);
+	}
 	return r;	
 }
 
@@ -417,7 +419,7 @@
 QPixmap MapEditor::getPixmap()
 {
 	QRectF mapRect=getTotalBBox();
-	QPixmap pix((int)mapRect.width()+2,(int)mapRect.height()+1);
+	QPixmap pix((int)mapRect.width()+2,(int)mapRect.height()+2);
 	QPainter pp (&pix);
 	
 	pp.setRenderHints(renderHints());
diff -r b486ffd0fa11 -r 25ee6b988b73 tex/vym.changelog
--- a/tex/vym.changelog	Mon Dec 14 10:17:55 2009 +0000
+++ b/tex/vym.changelog	Tue Dec 15 09:14:59 2009 +0000
@@ -1,7 +1,13 @@
+-------------------------------------------------------------------
+Tue Dec 15 10:14:11 CET 2009 - vym@insilmaril.de
+
+- Bugfix: A&O report didn't show subitems
+
 -------------------------------------------------------------------
 Mon Dec 14 11:16:57 CET 2009 - vym@insilmaril.de
 
 - Bugfix: Wrong tmp position when relinking a mainbranch
+- Bugfix: Image export, also used in HTML export
 
 -------------------------------------------------------------------
 Thu Dec  7 23:17:57 CET 2009 - vym@insilmaril.de
diff -r b486ffd0fa11 -r 25ee6b988b73 version.h
--- a/version.h	Mon Dec 14 10:17:55 2009 +0000
+++ b/version.h	Tue Dec 15 09:14:59 2009 +0000
@@ -7,7 +7,7 @@
 #define __VYM_VERSION "1.13.0"
 //#define __VYM_CODENAME "Codename: RC-1"
 #define __VYM_CODENAME "Codename: development version, not for production!"
-#define __VYM_BUILD_DATE "2009-12-14"
+#define __VYM_BUILD_DATE "2009-12-15"
 
 
 bool checkVersion(const QString &);