Fixed wrong positioning after saving a zoomed view
authorinsilmaril
Tue, 21 Aug 2007 10:00:21 +0000
changeset 585a8e9eae855f4
parent 584 95f1af9b525a
child 586 dad3e4c36e7f
Fixed wrong positioning after saving a zoomed view
mainwindow.cpp
tex/vym.changelog
version.h
xml-vym.cpp
     1.1 --- a/mainwindow.cpp	Thu Aug 09 18:34:08 2007 +0000
     1.2 +++ b/mainwindow.cpp	Tue Aug 21 10:00:21 2007 +0000
     1.3 @@ -1132,6 +1132,7 @@
     1.4  
     1.5  	fo->load(flagsPath+"flag-smiley-sad.png");
     1.6  	fo->setGroup("standard-smiley");
     1.7 +	setupFlag (fo,tb,avis,"smiley-sad",tr("Bad","Standardflag"));
     1.8  
     1.9  	fo->load(flagsPath+"flag-smiley-omg.png");
    1.10  	fo->setGroup("standard-smiley");
     2.1 --- a/tex/vym.changelog	Thu Aug 09 18:34:08 2007 +0000
     2.2 +++ b/tex/vym.changelog	Tue Aug 21 10:00:21 2007 +0000
     2.3 @@ -1,7 +1,9 @@
     2.4 --------------------------------------------------------------------
     2.5 -Thu Aug  9 20:26:02 CEST 2007 - uwedr
     2.6 +Mon Aug 20 17:09:28 CEST 2007 - uwe
     2.7  
     2.8  - Version: 1.10.0 Release Candidate
     2.9 +- Bugfix: Added missing standard flag (one of the smileys got lost)
    2.10 +- Bugfix: Wrong parsing of relative positions after load of 
    2.11 +          previously zoomed map
    2.12  
    2.13  -------------------------------------------------------------------
    2.14  Tue Jul 31 22:09:01 CEST 2007 - uwe
     3.1 --- a/version.h	Thu Aug 09 18:34:08 2007 +0000
     3.2 +++ b/version.h	Tue Aug 21 10:00:21 2007 +0000
     3.3 @@ -7,7 +7,7 @@
     3.4  #define __VYM_VERSION "1.10.0"
     3.5  #define __VYM_CODENAME "Codename: 1.10.0-RC-1"
     3.6  //#define __VYM_CODENAME "Codename: development version"
     3.7 -#define __VYM_BUILD_DATE "August 9, 2007"
     3.8 +#define __VYM_BUILD_DATE "August 20, 2007"
     3.9  
    3.10  
    3.11  bool checkVersion(const QString &);
     4.1 --- a/xml-vym.cpp	Thu Aug 09 18:34:08 2007 +0000
     4.2 +++ b/xml-vym.cpp	Tue Aug 21 10:00:21 2007 +0000
     4.3 @@ -455,13 +455,13 @@
     4.4  	if (lastOO)
     4.5  	{
     4.6  		bool okx,oky;
     4.7 -		int x,y;
     4.8 +		float x,y;
     4.9  		if (!a.value( "relPosX").isEmpty() ) 
    4.10  		{
    4.11  			if (!a.value( "relPosY").isEmpty() ) 
    4.12  			{
    4.13 -				x=a.value("relPosX").toInt (&okx, 10);
    4.14 -				y=a.value("relPosY").toInt (&oky, 10);
    4.15 +				x=a.value("relPosX").toFloat (&okx);
    4.16 +				y=a.value("relPosY").toFloat (&oky);
    4.17  				if (okx && oky  )
    4.18  				{
    4.19  					lastOO->setUseRelPos (true);
    4.20 @@ -475,8 +475,8 @@
    4.21  		{
    4.22  			if (!a.value( "absPosY").isEmpty() ) 
    4.23  			{
    4.24 -				x=a.value("absPosX").toInt (&okx, 10);
    4.25 -				y=a.value("absPosY").toInt (&oky, 10);
    4.26 +				x=a.value("absPosX").toFloat (&okx);
    4.27 +				y=a.value("absPosY").toFloat (&oky);
    4.28  				if (okx && oky  )
    4.29  					lastOO->move(x,y);
    4.30  				else
    4.31 @@ -579,8 +579,8 @@
    4.32  		if (!a.value( "relPosY").isEmpty() ) 
    4.33  		{
    4.34  			// read relPos
    4.35 -			x=a.value("relPosX").toInt (&okx, 10);
    4.36 -			y=a.value("relPosY").toInt (&oky, 10);
    4.37 +			x=a.value("relPosX").toFloat (&okx);
    4.38 +			y=a.value("relPosY").toFloat (&oky);
    4.39  			if (okx && oky) 
    4.40  				
    4.41  				{