# HG changeset patch
# User insilmaril
# Date 1187690421 0
# Node ID a8e9eae855f45996cf1bc1270e123c89e7e2feed
# Parent  95f1af9b525a16365f020d639d09c59af7ff83e2
Fixed wrong positioning after saving a zoomed view

diff -r 95f1af9b525a -r a8e9eae855f4 mainwindow.cpp
--- a/mainwindow.cpp	Thu Aug 09 18:34:08 2007 +0000
+++ b/mainwindow.cpp	Tue Aug 21 10:00:21 2007 +0000
@@ -1132,6 +1132,7 @@
 
 	fo->load(flagsPath+"flag-smiley-sad.png");
 	fo->setGroup("standard-smiley");
+	setupFlag (fo,tb,avis,"smiley-sad",tr("Bad","Standardflag"));
 
 	fo->load(flagsPath+"flag-smiley-omg.png");
 	fo->setGroup("standard-smiley");
diff -r 95f1af9b525a -r a8e9eae855f4 tex/vym.changelog
--- a/tex/vym.changelog	Thu Aug 09 18:34:08 2007 +0000
+++ b/tex/vym.changelog	Tue Aug 21 10:00:21 2007 +0000
@@ -1,7 +1,9 @@
--------------------------------------------------------------------
-Thu Aug  9 20:26:02 CEST 2007 - uwedr
+Mon Aug 20 17:09:28 CEST 2007 - uwe
 
 - Version: 1.10.0 Release Candidate
+- Bugfix: Added missing standard flag (one of the smileys got lost)
+- Bugfix: Wrong parsing of relative positions after load of 
+          previously zoomed map
 
 -------------------------------------------------------------------
 Tue Jul 31 22:09:01 CEST 2007 - uwe
diff -r 95f1af9b525a -r a8e9eae855f4 version.h
--- a/version.h	Thu Aug 09 18:34:08 2007 +0000
+++ b/version.h	Tue Aug 21 10:00:21 2007 +0000
@@ -7,7 +7,7 @@
 #define __VYM_VERSION "1.10.0"
 #define __VYM_CODENAME "Codename: 1.10.0-RC-1"
 //#define __VYM_CODENAME "Codename: development version"
-#define __VYM_BUILD_DATE "August 9, 2007"
+#define __VYM_BUILD_DATE "August 20, 2007"
 
 
 bool checkVersion(const QString &);
diff -r 95f1af9b525a -r a8e9eae855f4 xml-vym.cpp
--- a/xml-vym.cpp	Thu Aug 09 18:34:08 2007 +0000
+++ b/xml-vym.cpp	Tue Aug 21 10:00:21 2007 +0000
@@ -455,13 +455,13 @@
 	if (lastOO)
 	{
 		bool okx,oky;
-		int x,y;
+		float x,y;
 		if (!a.value( "relPosX").isEmpty() ) 
 		{
 			if (!a.value( "relPosY").isEmpty() ) 
 			{
-				x=a.value("relPosX").toInt (&okx, 10);
-				y=a.value("relPosY").toInt (&oky, 10);
+				x=a.value("relPosX").toFloat (&okx);
+				y=a.value("relPosY").toFloat (&oky);
 				if (okx && oky  )
 				{
 					lastOO->setUseRelPos (true);
@@ -475,8 +475,8 @@
 		{
 			if (!a.value( "absPosY").isEmpty() ) 
 			{
-				x=a.value("absPosX").toInt (&okx, 10);
-				y=a.value("absPosY").toInt (&oky, 10);
+				x=a.value("absPosX").toFloat (&okx);
+				y=a.value("absPosY").toFloat (&oky);
 				if (okx && oky  )
 					lastOO->move(x,y);
 				else
@@ -579,8 +579,8 @@
 		if (!a.value( "relPosY").isEmpty() ) 
 		{
 			// read relPos
-			x=a.value("relPosX").toInt (&okx, 10);
-			y=a.value("relPosY").toInt (&oky, 10);
+			x=a.value("relPosX").toFloat (&okx);
+			y=a.value("relPosY").toFloat (&oky);
 			if (okx && oky) 
 				
 				{