bugfixes, added flag-wip
authorinsilmaril
Mon Dec 07 21:56:46 2009 +0000 (2009-12-07)
changeset 8152881c4424190
parent 814 31de6677aa96
child 816 3086ee01554a
bugfixes, added flag-wip
branchobj.cpp
exports.cpp
flags/flag-wip.png
icons/find.png
mainwindow.cpp
mapeditor.cpp
mapeditor.h
tex/vym.changelog
version.h
vym.pro
vymmodel.cpp
     1.1 --- a/branchobj.cpp	Thu Dec 03 22:32:24 2009 +0000
     1.2 +++ b/branchobj.cpp	Mon Dec 07 21:56:46 2009 +0000
     1.3 @@ -125,7 +125,7 @@
     1.4  
     1.5  	BranchItem *pi=(BranchItem*)(dsti->parent());
     1.6  	int pi_depth=pi->depth();
     1.7 -	BranchObj* bo=(BranchObj*)dst;
     1.8 +	BranchObj* bodst=(BranchObj*)dst;
     1.9  
    1.10  	if (!tmpParent) 
    1.11  	{
    1.12 @@ -138,7 +138,7 @@
    1.13  		link2ParPos=false;
    1.14  	else
    1.15  		link2ParPos=true;
    1.16 -	parObj=bo;
    1.17 +	parObj=bodst;
    1.18  
    1.19  	setLinkStyle (dst->getDefLinkStyle (dsti));
    1.20   
    1.21 @@ -146,10 +146,10 @@
    1.22  	// Usually the positioning would be done by reposition(),
    1.23  	// but then also the destination branch would "Jump" around...
    1.24  	// Better just do it approximately
    1.25 -	cout << "BO::setTmp  d="<<dsti->depth();
    1.26 +	cout << "BO::setTmp ";
    1.27  	if (dsti->depth()==0)	
    1.28  	{	// new parent is a mapcenter
    1.29 -		Vector v= ( m - bo->getChildPos());
    1.30 +		Vector v= ( m - bodst->getChildPos());
    1.31  		if (v.x()<0) v.setX( v.x()-bbox.width() );
    1.32  		v.normalize();
    1.33  		v.scale (100);
    1.34 @@ -161,28 +161,33 @@
    1.35  		if (off==0)
    1.36  		{
    1.37  			// new parent is just a branch, link to it
    1.38 -			QRectF t=bo->getBBoxSizeWithChildren();
    1.39 +			QRectF t=bodst->getBBoxSizeWithChildren();
    1.40  			if (dsti->getLastBranch())
    1.41  				y=t.y() + t.height() ;
    1.42  			else
    1.43  				y=t.y();
    1.44  
    1.45 +			y=t.bottom();
    1.46 +			cout << "  y="<<y;		
    1.47 +			cout << "  t.h="<<t.height();
    1.48 +
    1.49  		} else
    1.50  		{
    1.51  			if (off<0)
    1.52  				// we want to link above dst
    1.53 -				y=bo->y() - height() + 5;
    1.54 +				y=bodst->y() - height() + 5;
    1.55  			else	
    1.56  				// we want to link below dst
    1.57  				// Bottom of sel should be 5 pixels above
    1.58  				// the bottom of the branch _below_ the target:
    1.59  				// Don't try to find that branch, guess 12 pixels
    1.60 -				y=bo->getChildPos().y()  -height() + 12; 
    1.61 +				y=bodst->getChildPos().y()  -height() + 12; 
    1.62  		}	
    1.63 -		if (bo->getOrientation()==LinkableMapObj::LeftOfCenter)
    1.64 -			move ( bo->getChildPos().x() - linkwidth, y );
    1.65 +		cout << "  pos="<<getAbsPos()<<" cPos="<<bodst->getChildPos()<<endl;
    1.66 +		if (bodst->getOrientation()==LinkableMapObj::LeftOfCenter)
    1.67 +			move ( bodst->getChildPos().x() - linkwidth, y );
    1.68  		else	
    1.69 -			move (bo->getChildPos().x() + linkwidth, y );
    1.70 +			move (bodst->getChildPos().x() + linkwidth, y );
    1.71  	}	
    1.72  
    1.73  	// updateLinkGeometry is called implicitly in move
     2.1 --- a/exports.cpp	Thu Dec 03 22:32:24 2009 +0000
     2.2 +++ b/exports.cpp	Mon Dec 07 21:56:46 2009 +0000
     2.3 @@ -192,10 +192,11 @@
     2.4  						ts << "\n\n";
     2.5  						break;
     2.6  					case 4:	// That's the item we need to know
     2.7 -						ts << (curIndent + "* " + colString+" "+ cur->getHeading());
     2.8 +						//ts << (curIndent + "* " + colString+" "+ cur->getHeading());
     2.9 +						ts << colString+" "+ cur->getHeading();
    2.10  						if (cur->isActiveStandardFlag ("hook-green"))
    2.11  							ts << " [DONE] ";
    2.12 -						else	if (cur->isActiveStandardFlag ("clock"))
    2.13 +						else	if (cur->isActiveStandardFlag ("wip"))
    2.14  							ts << " [WIP] ";
    2.15  						else	if (cur->isActiveStandardFlag ("cross-red"))
    2.16  							ts << " [NOT STARTED] ";
     3.1 Binary file flags/flag-wip.png has changed
     4.1 Binary file icons/find.png has changed
     5.1 --- a/mainwindow.cpp	Thu Dec 03 22:32:24 2009 +0000
     5.2 +++ b/mainwindow.cpp	Mon Dec 07 21:56:46 2009 +0000
     5.3 @@ -1203,12 +1203,16 @@
     5.4  	setupFlag (flag,tb,"questionmark",tr("Really?","Standardflag"));
     5.5  
     5.6  	flag->load(flagsPath+"flag-hook-green.png");
     5.7 -	flag->setGroup("standard-hook");
     5.8 -	setupFlag (flag,tb,"hook-green",tr("ok!","Standardflag"));
     5.9 +	flag->setGroup("standard-status");
    5.10 +	setupFlag (flag,tb,"hook-green",tr("Status - ok,done","Standardflag"));
    5.11 +
    5.12 +	flag->load(flagsPath+"flag-wip.png");
    5.13 +	flag->setGroup("standard-status");
    5.14 +	setupFlag (flag,tb,"wip",tr("Status - work in progress","Standardflag"));
    5.15  
    5.16  	flag->load(flagsPath+"flag-cross-red.png");
    5.17 -	flag->setGroup("standard-hook");
    5.18 -	setupFlag (flag,tb,"cross-red",tr("Not ok!","Standardflag"));
    5.19 +	flag->setGroup("standard-status");
    5.20 +	setupFlag (flag,tb,"cross-red",tr("Status - missing, not started","Standardflag"));
    5.21  	flag->unsetGroup();
    5.22  
    5.23  	flag->load(flagsPath+"flag-stopsign.png");
     6.1 --- a/mapeditor.cpp	Thu Dec 03 22:32:24 2009 +0000
     6.2 +++ b/mapeditor.cpp	Mon Dec 07 21:56:46 2009 +0000
     6.3 @@ -1,4 +1,4 @@
     6.4 -														  #include "mapeditor.h"
     6.5 +#include "mapeditor.h"
     6.6  
     6.7  #include <iostream>
     6.8  #include <cstdlib>
     6.9 @@ -286,7 +286,7 @@
    6.10  		zoomAnimation.stop();
    6.11  	if (settings.value ("/animation/use/",true).toBool() )
    6.12  	{
    6.13 -		//zoomAnimation=QtPropertyAnimation(this, "zoomFactor");
    6.14 +		//zoomAnimation=QPropertyAnimation(this, "zoomFactor");
    6.15  		zoomAnimation.setTargetObject (this);
    6.16  		zoomAnimation.setPropertyName ("zoomFactor");
    6.17  		zoomAnimation.setDuration(1000);
    6.18 @@ -1485,7 +1485,7 @@
    6.19  				}
    6.20  			} else
    6.21  			{
    6.22 -				// No destination, undo  temporary move	// FIXME-1 animation missing now?
    6.23 +				// No destination, undo  temporary move	
    6.24  
    6.25  				if (seli->depth()==1)
    6.26  				{
    6.27 @@ -1505,7 +1505,7 @@
    6.28  				}
    6.29  
    6.30  				// Draw the original link, before selection was moved around
    6.31 -				if (settings.value("/animation/use",false).toBool() && seli->depth()>1) 
    6.32 +				if (settings.value("/animation/use",true).toBool() && seli->depth()>1) 
    6.33  				{
    6.34  					lmosel->setRelPos();	// calc relPos first for starting point
    6.35  					
     7.1 --- a/mapeditor.h	Thu Dec 03 22:32:24 2009 +0000
     7.2 +++ b/mapeditor.h	Mon Dec 07 21:56:46 2009 +0000
     7.3 @@ -4,7 +4,7 @@
     7.4  #include <QGraphicsView>
     7.5  #include <QItemSelectionModel>
     7.6  
     7.7 -#include <QtPropertyAnimation>	//! Not yet officially in Qt!
     7.8 +#include <QtPropertyAnimation>	
     7.9  
    7.10  #include "attribute.h"
    7.11  #include "ornamentedobj.h"
     8.1 --- a/tex/vym.changelog	Thu Dec 03 22:32:24 2009 +0000
     8.2 +++ b/tex/vym.changelog	Mon Dec 07 21:56:46 2009 +0000
     8.3 @@ -1,8 +1,13 @@
     8.4  -------------------------------------------------------------------
     8.5 -Thu Dec  3 23:17:57 CET 2009 - vym@insilmaril.de
     8.6 +Thu Dec  7 23:17:57 CET 2009 - vym@insilmaril.de
     8.7  
     8.8  - Feature: Following xLinks is now possible by clicking in the 
     8.9             part of a branch near to beginning of branch (20 pixels)
    8.10 +- Feature: Added new flag for status "work in progress" 
    8.11 +           (between green hook and red cross)
    8.12 +- Bugfix: Animation of branches (default off in MapEditor)
    8.13 +- Bugfix: Segfault when closing map (due clearing selection in
    8.14 +          VymModel::clear()  )
    8.15  
    8.16  -------------------------------------------------------------------
    8.17  Thu Dec  3 17:26:59 CET 2009 - vym@insilmaril.de
     9.1 --- a/version.h	Thu Dec 03 22:32:24 2009 +0000
     9.2 +++ b/version.h	Mon Dec 07 21:56:46 2009 +0000
     9.3 @@ -7,7 +7,7 @@
     9.4  #define __VYM_VERSION "1.13.0"
     9.5  //#define __VYM_CODENAME "Codename: RC-1"
     9.6  #define __VYM_CODENAME "Codename: development version, not for production!"
     9.7 -#define __VYM_BUILD_DATE "2009-12-03"
     9.8 +#define __VYM_BUILD_DATE "2009-12-07"
     9.9  
    9.10  
    9.11  bool checkVersion(const QString &);
    10.1 --- a/vym.pro	Thu Dec 03 22:32:24 2009 +0000
    10.2 +++ b/vym.pro	Mon Dec 07 21:56:46 2009 +0000
    10.3 @@ -5,6 +5,7 @@
    10.4  CONFIG += x86 ppc
    10.5  CONFIG += qdbus
    10.6  
    10.7 +# Only needed with Qt < 4.6
    10.8  include (/data/qtanimationframework-2.3-opensource/src/gui-animation.pri)
    10.9  include (/data/qtanimationframework-2.3-opensource/src/corelib-animation.pri)
   10.10  include (/data/qtanimationframework-2.3-opensource/src/qtanimationframework.pri)
    11.1 --- a/vymmodel.cpp	Thu Dec 03 22:32:24 2009 +0000
    11.2 +++ b/vymmodel.cpp	Mon Dec 07 21:56:46 2009 +0000
    11.3 @@ -69,7 +69,6 @@
    11.4  
    11.5  void VymModel::clear() 
    11.6  {
    11.7 -	selModel->clearSelection();
    11.8  	while (rootItem->childCount() >0)
    11.9  		deleteItem (rootItem->getChildNum(0) );
   11.10  }