bugfixes for copy/paste of vymlink and hidden floatimages
authorinsilmaril
Tue Aug 30 14:09:19 2005 +0000 (2005-08-30)
changeset 158a33a2bdd8299
parent 157 677e702c5863
child 159 e44baadd4958
bugfixes for copy/paste of vymlink and hidden floatimages
branchobj.cpp
demos/todo.vym
misc.cpp
tex/vym.changelog
version.h
     1.1 --- a/branchobj.cpp	Fri Aug 19 07:42:32 2005 +0000
     1.2 +++ b/branchobj.cpp	Tue Aug 30 14:09:19 2005 +0000
     1.3 @@ -652,7 +652,11 @@
     1.4  	// Search float images
     1.5  	FloatImageObj *foi;
     1.6      for (foi=floatimage.first(); foi; foi=floatimage.next() )
     1.7 -		if (foi->inBBox(p) && (foi != excludeLMO) && foi->getParObj()!= excludeLMO) return foi;
     1.8 +		if (foi->inBBox(p) && 
     1.9 +			(foi != excludeLMO) && 
    1.10 +			foi->getParObj()!= excludeLMO &&
    1.11 +			foi->isVisibleObj() 
    1.12 +		) return foi;
    1.13  
    1.14      return NULL;
    1.15  }
     2.1 Binary file demos/todo.vym has changed
     3.1 --- a/misc.cpp	Fri Aug 19 07:42:32 2005 +0000
     3.2 +++ b/misc.cpp	Tue Aug 30 14:09:19 2005 +0000
     3.3 @@ -81,35 +81,45 @@
     3.4  	QString s=src;
     3.5  	QString d=dst;
     3.6  	int i;
     3.7 -	// Find relative path from src to dst
     3.8  
     3.9 -	// Remove the first "/"
    3.10 -	if (s.section ("/",0,0).isEmpty()) 
    3.11 +	if (s==d) 
    3.12  	{
    3.13 -		s=s.right (s.length()-1);
    3.14 -		d=d.right (d.length()-1);
    3.15 -	}
    3.16 -	
    3.17 -	// remove identical left parts
    3.18 -	while (s.section("/",0,0) == d.section("/",0,0) ) 
    3.19 +		// Special case, we just need the name of the file,
    3.20 +		// not the complete path
    3.21 +		i=d.findRev ("/");
    3.22 +		d=d.right (d.length()-i-1);
    3.23 +	} else
    3.24  	{
    3.25 -		i=s.find ("/");
    3.26 -		s=s.right (s.length()-i-1);
    3.27 -		d=d.right (d.length()-i-1);
    3.28 -	}
    3.29 +		// Find relative path from src to dst
    3.30  
    3.31 -	int srcsep=s.contains("/");
    3.32 -	int dstsep=d.contains("/");
    3.33 -	if (srcsep >=  dstsep )
    3.34 -	{
    3.35 -		// find path to go up first and then back to dst
    3.36 -		i=1;
    3.37 -		while (i<=srcsep) 
    3.38 +		// Remove the first "/"
    3.39 +		if (s.section ("/",0,0).isEmpty()) 
    3.40  		{
    3.41 -			d="../"+d;
    3.42 -			i++;
    3.43 -		}	
    3.44 -	}
    3.45 +			s=s.right (s.length()-1);
    3.46 +			d=d.right (d.length()-1);
    3.47 +		}
    3.48 +		
    3.49 +		// remove identical left parts
    3.50 +		while (s.section("/",0,0) == d.section("/",0,0) ) 
    3.51 +		{
    3.52 +			i=s.find ("/");
    3.53 +			s=s.right (s.length()-i-1);
    3.54 +			d=d.right (d.length()-i-1);
    3.55 +		}
    3.56 +
    3.57 +		int srcsep=s.contains("/");
    3.58 +		int dstsep=d.contains("/");
    3.59 +		if (srcsep >=  dstsep )
    3.60 +		{
    3.61 +			// find path to go up first and then back to dst
    3.62 +			i=1;
    3.63 +			while (i<=srcsep) 
    3.64 +			{
    3.65 +				d="../"+d;
    3.66 +				i++;
    3.67 +			}	
    3.68 +		}
    3.69 +	}	
    3.70  	return d;
    3.71  }
    3.72  
     4.1 --- a/tex/vym.changelog	Fri Aug 19 07:42:32 2005 +0000
     4.2 +++ b/tex/vym.changelog	Tue Aug 30 14:09:19 2005 +0000
     4.3 @@ -1,5 +1,14 @@
     4.4  -------------------------------------------------------------------
     4.5 -Fri Aug 19 09:12:49 CEST 2005 - uwe
     4.6 +Tue Aug 30 13:38:31 CEST 2005 - uwedr
     4.7 +
     4.8 +- Bugfix: Fixed pasting vymlinks: Pasting a branch to a target in
     4.9 +  another map caused vym to go in an endless loop, if the vymlink of the
    4.10 +  branch pointed to the new map.
    4.11 +- Bugfix: Invisible floatimages (which have a scrolled parent) can
    4.12 +  no longer can be selected  
    4.13 +
    4.14 +-------------------------------------------------------------------
    4.15 +Fri Aug 19 09:12:49 CEST 2005 - uwedr
    4.16  
    4.17  - Feature: added debian subdirectory created by Steffen Joeris
    4.18  - Feature: added license to new aboutwindow
    4.19 @@ -10,7 +19,7 @@
    4.20  - Bugfix: Fixed link handling in aboutdialog.
    4.21  
    4.22  -------------------------------------------------------------------
    4.23 -Tue Aug 16 12:25:09 CEST 2005 - uwe
    4.24 +Tue Aug 16 12:25:09 CEST 2005 - uwedr
    4.25  
    4.26  - Feature: Added keyboard shortcut to reset zoom factor
    4.27  - Bugfix: Added "..." to menu entries leading to another dialog
    4.28 @@ -18,7 +27,7 @@
    4.29  - Bugfix: A branch moved from left side to right had wrong orienation
    4.30  
    4.31  -------------------------------------------------------------------
    4.32 -Tue Aug  2 09:59:24 CEST 2005 - uwe
    4.33 +Tue Aug  2 09:59:24 CEST 2005 - uwedr
    4.34  
    4.35  -  Bugfix: Heading sizes now correct after moving e.g. mainbranch to 
    4.36     a branch
     5.1 --- a/version.h	Fri Aug 19 07:42:32 2005 +0000
     5.2 +++ b/version.h	Tue Aug 30 14:09:19 2005 +0000
     5.3 @@ -2,6 +2,6 @@
     5.4  #define VERSION_H
     5.5  
     5.6  #define __VYM_VERSION__ "1.7.3"
     5.7 -#define __BUILD_DATE__ "August 19, 2005"
     5.8 +#define __BUILD_DATE__ "August 30, 2005"
     5.9  
    5.10  #endif