# HG changeset patch
# User insilmaril
# Date 1149078458 0
# Node ID df4fdaa07527ef57354977a5f2fafbf568527762
# Parent  94cd6a4515932f9a72ecbb4015af43de02beb7cc
1.7.18

diff -r 94cd6a451593 -r df4fdaa07527 branchobj.h
--- a/branchobj.h	Wed May 31 12:27:38 2006 +0000
+++ b/branchobj.h	Wed May 31 12:27:38 2006 +0000
@@ -52,6 +52,7 @@
 	BranchObj* getLastIterator();		// to interrupt and resume next iteration
 	void setLastIterator (BranchObj*);	// needed by next() 
 
+	virtual void positionContents();
     virtual void move (double x,double y);
     virtual void move (QPoint);
     virtual void moveBy (double x,double y);
diff -r 94cd6a451593 -r df4fdaa07527 floatimageobj.cpp
--- a/floatimageobj.cpp	Wed May 31 12:27:38 2006 +0000
+++ b/floatimageobj.cpp	Wed May 31 12:27:38 2006 +0000
@@ -95,6 +95,7 @@
 		positionBBox();
 		filename=fn;
 		filetype=QPixmap::imageFormat (fn);
+		setOriginalFilename (fn);
 		return true;
 	} else
 		return false;
@@ -109,6 +110,10 @@
 void FloatImageObj::setOriginalFilename(const QString & fn)
 {
 	originalFilename=fn;
+
+	// Set short name, too. Search from behind:
+	int i=originalFilename.findRev("/");
+	if (i>=0) originalFilename=originalFilename.remove (0,i+1);
 }
 
 QString FloatImageObj::getOriginalFilename()
@@ -183,6 +188,8 @@
 
 	// And really save the image
 	icon->save (tmpdir + "/" + url, filetype);
+ 
+	QString nameAttr=attribut ("orgName",originalFilename);
 
     return singleElement ("floatimage",  
 		getOrnAttr() 
@@ -191,6 +198,7 @@
 		+exportAttr  
 		+zAttr  
 		+attribut ("href",QString ("file:")+url)
+		+nameAttr
 	);	
 }