# HG changeset patch
# User insilmaril
# Date 1260223006 0
# Node ID 2881c44241909e519c79ce50b03fa457be2de8bf
# Parent  31de6677aa96f1b8bfa14693e8fde99c53fa3455
bugfixes, added flag-wip

diff -r 31de6677aa96 -r 2881c4424190 branchobj.cpp
--- a/branchobj.cpp	Thu Dec 03 22:32:24 2009 +0000
+++ b/branchobj.cpp	Mon Dec 07 21:56:46 2009 +0000
@@ -125,7 +125,7 @@
 
 	BranchItem *pi=(BranchItem*)(dsti->parent());
 	int pi_depth=pi->depth();
-	BranchObj* bo=(BranchObj*)dst;
+	BranchObj* bodst=(BranchObj*)dst;
 
 	if (!tmpParent) 
 	{
@@ -138,7 +138,7 @@
 		link2ParPos=false;
 	else
 		link2ParPos=true;
-	parObj=bo;
+	parObj=bodst;
 
 	setLinkStyle (dst->getDefLinkStyle (dsti));
  
@@ -146,10 +146,10 @@
 	// Usually the positioning would be done by reposition(),
 	// but then also the destination branch would "Jump" around...
 	// Better just do it approximately
-	cout << "BO::setTmp  d="<<dsti->depth();
+	cout << "BO::setTmp ";
 	if (dsti->depth()==0)	
 	{	// new parent is a mapcenter
-		Vector v= ( m - bo->getChildPos());
+		Vector v= ( m - bodst->getChildPos());
 		if (v.x()<0) v.setX( v.x()-bbox.width() );
 		v.normalize();
 		v.scale (100);
@@ -161,28 +161,33 @@
 		if (off==0)
 		{
 			// new parent is just a branch, link to it
-			QRectF t=bo->getBBoxSizeWithChildren();
+			QRectF t=bodst->getBBoxSizeWithChildren();
 			if (dsti->getLastBranch())
 				y=t.y() + t.height() ;
 			else
 				y=t.y();
 
+			y=t.bottom();
+			cout << "  y="<<y;		
+			cout << "  t.h="<<t.height();
+
 		} else
 		{
 			if (off<0)
 				// we want to link above dst
-				y=bo->y() - height() + 5;
+				y=bodst->y() - height() + 5;
 			else	
 				// we want to link below dst
 				// Bottom of sel should be 5 pixels above
 				// the bottom of the branch _below_ the target:
 				// Don't try to find that branch, guess 12 pixels
-				y=bo->getChildPos().y()  -height() + 12; 
+				y=bodst->getChildPos().y()  -height() + 12; 
 		}	
-		if (bo->getOrientation()==LinkableMapObj::LeftOfCenter)
-			move ( bo->getChildPos().x() - linkwidth, y );
+		cout << "  pos="<<getAbsPos()<<" cPos="<<bodst->getChildPos()<<endl;
+		if (bodst->getOrientation()==LinkableMapObj::LeftOfCenter)
+			move ( bodst->getChildPos().x() - linkwidth, y );
 		else	
-			move (bo->getChildPos().x() + linkwidth, y );
+			move (bodst->getChildPos().x() + linkwidth, y );
 	}	
 
 	// updateLinkGeometry is called implicitly in move
diff -r 31de6677aa96 -r 2881c4424190 exports.cpp
--- a/exports.cpp	Thu Dec 03 22:32:24 2009 +0000
+++ b/exports.cpp	Mon Dec 07 21:56:46 2009 +0000
@@ -192,10 +192,11 @@
 						ts << "\n\n";
 						break;
 					case 4:	// That's the item we need to know
-						ts << (curIndent + "* " + colString+" "+ cur->getHeading());
+						//ts << (curIndent + "* " + colString+" "+ cur->getHeading());
+						ts << colString+" "+ cur->getHeading();
 						if (cur->isActiveStandardFlag ("hook-green"))
 							ts << " [DONE] ";
-						else	if (cur->isActiveStandardFlag ("clock"))
+						else	if (cur->isActiveStandardFlag ("wip"))
 							ts << " [WIP] ";
 						else	if (cur->isActiveStandardFlag ("cross-red"))
 							ts << " [NOT STARTED] ";
diff -r 31de6677aa96 -r 2881c4424190 flags/flag-wip.png
Binary file flags/flag-wip.png has changed
diff -r 31de6677aa96 -r 2881c4424190 icons/find.png
Binary file icons/find.png has changed
diff -r 31de6677aa96 -r 2881c4424190 mainwindow.cpp
--- a/mainwindow.cpp	Thu Dec 03 22:32:24 2009 +0000
+++ b/mainwindow.cpp	Mon Dec 07 21:56:46 2009 +0000
@@ -1203,12 +1203,16 @@
 	setupFlag (flag,tb,"questionmark",tr("Really?","Standardflag"));
 
 	flag->load(flagsPath+"flag-hook-green.png");
-	flag->setGroup("standard-hook");
-	setupFlag (flag,tb,"hook-green",tr("ok!","Standardflag"));
+	flag->setGroup("standard-status");
+	setupFlag (flag,tb,"hook-green",tr("Status - ok,done","Standardflag"));
+
+	flag->load(flagsPath+"flag-wip.png");
+	flag->setGroup("standard-status");
+	setupFlag (flag,tb,"wip",tr("Status - work in progress","Standardflag"));
 
 	flag->load(flagsPath+"flag-cross-red.png");
-	flag->setGroup("standard-hook");
-	setupFlag (flag,tb,"cross-red",tr("Not ok!","Standardflag"));
+	flag->setGroup("standard-status");
+	setupFlag (flag,tb,"cross-red",tr("Status - missing, not started","Standardflag"));
 	flag->unsetGroup();
 
 	flag->load(flagsPath+"flag-stopsign.png");
diff -r 31de6677aa96 -r 2881c4424190 mapeditor.cpp
--- a/mapeditor.cpp	Thu Dec 03 22:32:24 2009 +0000
+++ b/mapeditor.cpp	Mon Dec 07 21:56:46 2009 +0000
@@ -1,4 +1,4 @@
-														  #include "mapeditor.h"
+#include "mapeditor.h"
 
 #include <iostream>
 #include <cstdlib>
@@ -286,7 +286,7 @@
 		zoomAnimation.stop();
 	if (settings.value ("/animation/use/",true).toBool() )
 	{
-		//zoomAnimation=QtPropertyAnimation(this, "zoomFactor");
+		//zoomAnimation=QPropertyAnimation(this, "zoomFactor");
 		zoomAnimation.setTargetObject (this);
 		zoomAnimation.setPropertyName ("zoomFactor");
 		zoomAnimation.setDuration(1000);
@@ -1485,7 +1485,7 @@
 				}
 			} else
 			{
-				// No destination, undo  temporary move	// FIXME-1 animation missing now?
+				// No destination, undo  temporary move	
 
 				if (seli->depth()==1)
 				{
@@ -1505,7 +1505,7 @@
 				}
 
 				// Draw the original link, before selection was moved around
-				if (settings.value("/animation/use",false).toBool() && seli->depth()>1) 
+				if (settings.value("/animation/use",true).toBool() && seli->depth()>1) 
 				{
 					lmosel->setRelPos();	// calc relPos first for starting point
 					
diff -r 31de6677aa96 -r 2881c4424190 mapeditor.h
--- a/mapeditor.h	Thu Dec 03 22:32:24 2009 +0000
+++ b/mapeditor.h	Mon Dec 07 21:56:46 2009 +0000
@@ -4,7 +4,7 @@
 #include <QGraphicsView>
 #include <QItemSelectionModel>
 
-#include <QtPropertyAnimation>	//! Not yet officially in Qt!
+#include <QtPropertyAnimation>	
 
 #include "attribute.h"
 #include "ornamentedobj.h"
diff -r 31de6677aa96 -r 2881c4424190 tex/vym.changelog
--- a/tex/vym.changelog	Thu Dec 03 22:32:24 2009 +0000
+++ b/tex/vym.changelog	Mon Dec 07 21:56:46 2009 +0000
@@ -1,8 +1,13 @@
 -------------------------------------------------------------------
-Thu Dec  3 23:17:57 CET 2009 - vym@insilmaril.de
+Thu Dec  7 23:17:57 CET 2009 - vym@insilmaril.de
 
 - Feature: Following xLinks is now possible by clicking in the 
            part of a branch near to beginning of branch (20 pixels)
+- Feature: Added new flag for status "work in progress" 
+           (between green hook and red cross)
+- Bugfix: Animation of branches (default off in MapEditor)
+- Bugfix: Segfault when closing map (due clearing selection in
+          VymModel::clear()  )
 
 -------------------------------------------------------------------
 Thu Dec  3 17:26:59 CET 2009 - vym@insilmaril.de
diff -r 31de6677aa96 -r 2881c4424190 version.h
--- a/version.h	Thu Dec 03 22:32:24 2009 +0000
+++ b/version.h	Mon Dec 07 21:56:46 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-03"
+#define __VYM_BUILD_DATE "2009-12-07"
 
 
 bool checkVersion(const QString &);
diff -r 31de6677aa96 -r 2881c4424190 vym.pro
--- a/vym.pro	Thu Dec 03 22:32:24 2009 +0000
+++ b/vym.pro	Mon Dec 07 21:56:46 2009 +0000
@@ -5,6 +5,7 @@
 CONFIG += x86 ppc
 CONFIG += qdbus
 
+# Only needed with Qt < 4.6
 include (/data/qtanimationframework-2.3-opensource/src/gui-animation.pri)
 include (/data/qtanimationframework-2.3-opensource/src/corelib-animation.pri)
 include (/data/qtanimationframework-2.3-opensource/src/qtanimationframework.pri)
diff -r 31de6677aa96 -r 2881c4424190 vymmodel.cpp
--- a/vymmodel.cpp	Thu Dec 03 22:32:24 2009 +0000
+++ b/vymmodel.cpp	Mon Dec 07 21:56:46 2009 +0000
@@ -69,7 +69,6 @@
 
 void VymModel::clear() 
 {
-	selModel->clearSelection();
 	while (rootItem->childCount() >0)
 		deleteItem (rootItem->getChildNum(0) );
 }