# HG changeset patch
# User insilmaril
# Date 1179752725 0
# Node ID eea7fa7029687f08ff6d65d1849e989565efd914
# Parent  a3caa8bed260f5d79edc1f4166c35d10a47ef57d
Copy to new map, fixed pasting of images

diff -r a3caa8bed260 -r eea7fa702968 demos/todo.vym
Binary file demos/todo.vym has changed
diff -r a3caa8bed260 -r eea7fa702968 linkablemapobj.cpp
--- a/linkablemapobj.cpp	Thu May 17 20:19:07 2007 +0000
+++ b/linkablemapobj.cpp	Mon May 21 13:05:25 2007 +0000
@@ -141,10 +141,7 @@
 		relPos.setX (absPos.x() - parObj->getChildPos().x() );
 		relPos.setY (absPos.y() - parObj->getChildPos().y() );
 		parObj->calcBBoxSize();
-	}	else
-	{
-		qWarning ("LMO::setRelPos   No parent yet!");
-	}
+	}	
 }
 
 void LinkableMapObj::setRelPos(const QPointF &p)
@@ -154,9 +151,6 @@
 	{		
 		parObj->calcBBoxSize();
 		requestReposition();
-	}	else
-	{
-		qWarning ("LMO::setRelPos   No parent yet!");
 	}
 }
 
diff -r a3caa8bed260 -r eea7fa702968 mainwindow.cpp
--- a/mainwindow.cpp	Thu May 17 20:19:07 2007 +0000
+++ b/mainwindow.cpp	Mon May 21 13:05:25 2007 +0000
@@ -86,7 +86,7 @@
 
 	// Create direcctory for clipboard
 	clipboardDir=tmpVymDir+"/clipboard";
-	clipboardFile="part";
+	clipboardFile="part.xml";
 	QDir d(clipboardDir);
 	d.mkdir (clipboardDir,true);
 	makeSubDirs (clipboardDir);
@@ -262,7 +262,7 @@
 	fileMenu->addAction (a);
     connect( a, SIGNAL( triggered() ), this, SLOT( fileNew() ) );
 	
-    a = new QAction(QPixmap( iconPath+"filenew.png"), tr( "&Copy to new map","File menu" ),this);
+    a = new QAction(QPixmap( iconPath+"filenewcopy.png"), tr( "&Copy to new map","File menu" ),this);
 	a->setStatusTip ( tr( "Copy selection to mapcenter of a new map","Status tip File menu" ) );
 	a->setShortcut ( Qt::CTRL +Qt::SHIFT + Qt::Key_N );		//New map
 	fileMenu->addAction (a);
diff -r a3caa8bed260 -r eea7fa702968 mapeditor.cpp
--- a/mapeditor.cpp	Thu May 17 20:19:07 2007 +0000
+++ b/mapeditor.cpp	Mon May 21 13:05:25 2007 +0000
@@ -1306,7 +1306,11 @@
 		reader.setContentHandler( &handler );
 		reader.setErrorHandler( &handler );
 		handler.setMapEditor( this );
-		handler.setTmpDir (filePath.left(filePath.findRev("/",-1)));	// needed to load files with rel. path
+
+
+		// We need to set the tmpDir in order  to load files with rel. path
+		QString tmpdir= fname.left(fname.findRev("/",-1));	
+		handler.setTmpDir (tmpdir);
 		handler.setInputFile (file.name());
 		handler.setLoadMode (lmode);
 		bool ok = reader.parse( source );
@@ -1610,7 +1614,7 @@
 	if (sel)
 	{
 		// write to directory
-		QString saveFile=saveToDir (fileDir,clipboardFile+"-",true,QPointF(),sel ); // FIXME check FIO
+		QString saveFile=saveToDir (clipboardDir,clipboardFile+"-",true,QPointF(),sel ); // FIXME check FIO
 		QFile file;
 
 		file.setName ( clipboardDir + "/"+clipboardFile);
diff -r a3caa8bed260 -r eea7fa702968 version.h
--- a/version.h	Thu May 17 20:19:07 2007 +0000
+++ b/version.h	Mon May 21 13:05:25 2007 +0000
@@ -7,7 +7,7 @@
 #define __VYM_VERSION "1.8.72"
 //#define __VYM_CODENAME "Codename: 1.9.0-beta-1"
 #define __VYM_CODENAME "Codename: development version"
-#define __VYM_BUILD_DATE "May 16, 2007"
+#define __VYM_BUILD_DATE "May 21, 2007"
 
 
 bool checkVersion(const QString &);