1.1 Binary file demos/todo.vym has changed

     2.1 --- a/linkablemapobj.cpp	Thu May 17 20:19:07 2007 +0000
     2.2 +++ b/linkablemapobj.cpp	Mon May 21 13:05:25 2007 +0000
     2.3 @@ -141,10 +141,7 @@
     2.4  		relPos.setX (absPos.x() - parObj->getChildPos().x() );
     2.5  		relPos.setY (absPos.y() - parObj->getChildPos().y() );
     2.6  		parObj->calcBBoxSize();
     2.7 -	}	else
     2.8 -	{
     2.9 -		qWarning ("LMO::setRelPos   No parent yet!");
    2.10 -	}
    2.11 +	}	
    2.12  }
    2.13  
    2.14  void LinkableMapObj::setRelPos(const QPointF &p)
    2.15 @@ -154,9 +151,6 @@
    2.16  	{		
    2.17  		parObj->calcBBoxSize();
    2.18  		requestReposition();
    2.19 -	}	else
    2.20 -	{
    2.21 -		qWarning ("LMO::setRelPos   No parent yet!");
    2.22  	}
    2.23  }
    2.24  

     3.1 --- a/mainwindow.cpp	Thu May 17 20:19:07 2007 +0000
     3.2 +++ b/mainwindow.cpp	Mon May 21 13:05:25 2007 +0000
     3.3 @@ -86,7 +86,7 @@
     3.4  
     3.5  	// Create direcctory for clipboard
     3.6  	clipboardDir=tmpVymDir+"/clipboard";
     3.7 -	clipboardFile="part";
     3.8 +	clipboardFile="part.xml";
     3.9  	QDir d(clipboardDir);
    3.10  	d.mkdir (clipboardDir,true);
    3.11  	makeSubDirs (clipboardDir);
    3.12 @@ -262,7 +262,7 @@
    3.13  	fileMenu->addAction (a);
    3.14      connect( a, SIGNAL( triggered() ), this, SLOT( fileNew() ) );
    3.15  	
    3.16 -    a = new QAction(QPixmap( iconPath+"filenew.png"), tr( "&Copy to new map","File menu" ),this);
    3.17 +    a = new QAction(QPixmap( iconPath+"filenewcopy.png"), tr( "&Copy to new map","File menu" ),this);
    3.18  	a->setStatusTip ( tr( "Copy selection to mapcenter of a new map","Status tip File menu" ) );
    3.19  	a->setShortcut ( Qt::CTRL +Qt::SHIFT + Qt::Key_N );		//New map
    3.20  	fileMenu->addAction (a);

     4.1 --- a/mapeditor.cpp	Thu May 17 20:19:07 2007 +0000
     4.2 +++ b/mapeditor.cpp	Mon May 21 13:05:25 2007 +0000
     4.3 @@ -1306,7 +1306,11 @@
     4.4  		reader.setContentHandler( &handler );
     4.5  		reader.setErrorHandler( &handler );
     4.6  		handler.setMapEditor( this );
     4.7 -		handler.setTmpDir (filePath.left(filePath.findRev("/",-1)));	// needed to load files with rel. path
     4.8 +
     4.9 +
    4.10 +		// We need to set the tmpDir in order  to load files with rel. path
    4.11 +		QString tmpdir= fname.left(fname.findRev("/",-1));	
    4.12 +		handler.setTmpDir (tmpdir);
    4.13  		handler.setInputFile (file.name());
    4.14  		handler.setLoadMode (lmode);
    4.15  		bool ok = reader.parse( source );
    4.16 @@ -1610,7 +1614,7 @@
    4.17  	if (sel)
    4.18  	{
    4.19  		// write to directory
    4.20 -		QString saveFile=saveToDir (fileDir,clipboardFile+"-",true,QPointF(),sel ); // FIXME check FIO
    4.21 +		QString saveFile=saveToDir (clipboardDir,clipboardFile+"-",true,QPointF(),sel ); // FIXME check FIO
    4.22  		QFile file;
    4.23  
    4.24  		file.setName ( clipboardDir + "/"+clipboardFile);

     5.1 --- a/version.h	Thu May 17 20:19:07 2007 +0000
     5.2 +++ b/version.h	Mon May 21 13:05:25 2007 +0000
     5.3 @@ -7,7 +7,7 @@
     5.4  #define __VYM_VERSION "1.8.72"
     5.5  //#define __VYM_CODENAME "Codename: 1.9.0-beta-1"
     5.6  #define __VYM_CODENAME "Codename: development version"
     5.7 -#define __VYM_BUILD_DATE "May 16, 2007"
     5.8 +#define __VYM_BUILD_DATE "May 21, 2007"
     5.9  
    5.10  
    5.11  bool checkVersion(const QString &);