# HG changeset patch
# User insilmaril
# Date 1125410959 0
# Node ID a33a2bdd82993efb15ea5ff7f57c9d33730dec9d
# Parent  677e702c586326e4af8d96df1609f15004f290b5
bugfixes for copy/paste of vymlink and hidden floatimages

diff -r 677e702c5863 -r a33a2bdd8299 branchobj.cpp
--- a/branchobj.cpp	Fri Aug 19 07:42:32 2005 +0000
+++ b/branchobj.cpp	Tue Aug 30 14:09:19 2005 +0000
@@ -652,7 +652,11 @@
 	// Search float images
 	FloatImageObj *foi;
     for (foi=floatimage.first(); foi; foi=floatimage.next() )
-		if (foi->inBBox(p) && (foi != excludeLMO) && foi->getParObj()!= excludeLMO) return foi;
+		if (foi->inBBox(p) && 
+			(foi != excludeLMO) && 
+			foi->getParObj()!= excludeLMO &&
+			foi->isVisibleObj() 
+		) return foi;
 
     return NULL;
 }
diff -r 677e702c5863 -r a33a2bdd8299 demos/todo.vym
Binary file demos/todo.vym has changed
diff -r 677e702c5863 -r a33a2bdd8299 misc.cpp
--- a/misc.cpp	Fri Aug 19 07:42:32 2005 +0000
+++ b/misc.cpp	Tue Aug 30 14:09:19 2005 +0000
@@ -81,35 +81,45 @@
 	QString s=src;
 	QString d=dst;
 	int i;
-	// Find relative path from src to dst
 
-	// Remove the first "/"
-	if (s.section ("/",0,0).isEmpty()) 
+	if (s==d) 
 	{
-		s=s.right (s.length()-1);
-		d=d.right (d.length()-1);
-	}
-	
-	// remove identical left parts
-	while (s.section("/",0,0) == d.section("/",0,0) ) 
+		// Special case, we just need the name of the file,
+		// not the complete path
+		i=d.findRev ("/");
+		d=d.right (d.length()-i-1);
+	} else
 	{
-		i=s.find ("/");
-		s=s.right (s.length()-i-1);
-		d=d.right (d.length()-i-1);
-	}
+		// Find relative path from src to dst
 
-	int srcsep=s.contains("/");
-	int dstsep=d.contains("/");
-	if (srcsep >=  dstsep )
-	{
-		// find path to go up first and then back to dst
-		i=1;
-		while (i<=srcsep) 
+		// Remove the first "/"
+		if (s.section ("/",0,0).isEmpty()) 
 		{
-			d="../"+d;
-			i++;
-		}	
-	}
+			s=s.right (s.length()-1);
+			d=d.right (d.length()-1);
+		}
+		
+		// remove identical left parts
+		while (s.section("/",0,0) == d.section("/",0,0) ) 
+		{
+			i=s.find ("/");
+			s=s.right (s.length()-i-1);
+			d=d.right (d.length()-i-1);
+		}
+
+		int srcsep=s.contains("/");
+		int dstsep=d.contains("/");
+		if (srcsep >=  dstsep )
+		{
+			// find path to go up first and then back to dst
+			i=1;
+			while (i<=srcsep) 
+			{
+				d="../"+d;
+				i++;
+			}	
+		}
+	}	
 	return d;
 }
 
diff -r 677e702c5863 -r a33a2bdd8299 tex/vym.changelog
--- a/tex/vym.changelog	Fri Aug 19 07:42:32 2005 +0000
+++ b/tex/vym.changelog	Tue Aug 30 14:09:19 2005 +0000
@@ -1,5 +1,14 @@
 -------------------------------------------------------------------
-Fri Aug 19 09:12:49 CEST 2005 - uwe
+Tue Aug 30 13:38:31 CEST 2005 - uwedr
+
+- Bugfix: Fixed pasting vymlinks: Pasting a branch to a target in
+  another map caused vym to go in an endless loop, if the vymlink of the
+  branch pointed to the new map.
+- Bugfix: Invisible floatimages (which have a scrolled parent) can
+  no longer can be selected  
+
+-------------------------------------------------------------------
+Fri Aug 19 09:12:49 CEST 2005 - uwedr
 
 - Feature: added debian subdirectory created by Steffen Joeris
 - Feature: added license to new aboutwindow
@@ -10,7 +19,7 @@
 - Bugfix: Fixed link handling in aboutdialog.
 
 -------------------------------------------------------------------
-Tue Aug 16 12:25:09 CEST 2005 - uwe
+Tue Aug 16 12:25:09 CEST 2005 - uwedr
 
 - Feature: Added keyboard shortcut to reset zoom factor
 - Bugfix: Added "..." to menu entries leading to another dialog
@@ -18,7 +27,7 @@
 - Bugfix: A branch moved from left side to right had wrong orienation
 
 -------------------------------------------------------------------
-Tue Aug  2 09:59:24 CEST 2005 - uwe
+Tue Aug  2 09:59:24 CEST 2005 - uwedr
 
 -  Bugfix: Heading sizes now correct after moving e.g. mainbranch to 
    a branch
diff -r 677e702c5863 -r a33a2bdd8299 version.h
--- a/version.h	Fri Aug 19 07:42:32 2005 +0000
+++ b/version.h	Tue Aug 30 14:09:19 2005 +0000
@@ -2,6 +2,6 @@
 #define VERSION_H
 
 #define __VYM_VERSION__ "1.7.3"
-#define __BUILD_DATE__ "August 19, 2005"
+#define __BUILD_DATE__ "August 30, 2005"
 
 #endif