1.11.1 fixed undo/redo sorting of branches
authorinsilmaril
Tue Nov 06 13:54:41 2007 +0000 (2007-11-06)
changeset 615497f19b3c1fe
parent 614 040f32294895
child 616 16d63fc9ae42
1.11.1 fixed undo/redo sorting of branches
demos/vym-projectplan.vym
mainwindow.cpp
mapeditor.cpp
tex/vym.changelog
version.h
     1.1 Binary file demos/vym-projectplan.vym has changed
     2.1 --- a/mainwindow.cpp	Wed Oct 24 14:41:34 2007 +0000
     2.2 +++ b/mainwindow.cpp	Tue Nov 06 13:54:41 2007 +0000
     2.3 @@ -2030,6 +2030,7 @@
     2.4  						return;
     2.5  						break;
     2.6  				}
     2.7 +				me->setZipped (saveZipped);
     2.8  			}
     2.9  
    2.10  			if (saveZipped)
     3.1 --- a/mapeditor.cpp	Wed Oct 24 14:41:34 2007 +0000
     3.2 +++ b/mapeditor.cpp	Tue Nov 06 13:54:41 2007 +0000
     3.3 @@ -1315,6 +1315,19 @@
     3.4  				setFrameType (s);
     3.5  		}
     3.6  	/////////////////////////////////////////////////////////////////////
     3.7 +	} else if (com=="sortChildren")
     3.8 +	{
     3.9 +		if (xelection.isEmpty() )
    3.10 +		{
    3.11 +			parser.setError (Aborted,"Nothing selected");
    3.12 +		} else if (! selb )
    3.13 +		{				  
    3.14 +			parser.setError (Aborted,"Type of selection is not a branch");
    3.15 +		} else if (parser.checkParCount(0))
    3.16 +		{
    3.17 +			sortChildren();
    3.18 +		}
    3.19 +	/////////////////////////////////////////////////////////////////////
    3.20  	} else if (com=="toggleFlag")
    3.21  	{
    3.22  		if (xelection.isEmpty() )
    3.23 @@ -2337,8 +2350,8 @@
    3.24  	{
    3.25  		if(bo->countBranches()>1)
    3.26  		{
    3.27 +			saveStateChangingPart(bo,bo, "sortChildren ()",QString("Sort children of %1").arg(getName(bo)));
    3.28  			bo->sortChildren();
    3.29 -			saveStateChangingPart(bo,bo, "sortChildren ()",QString("Sort children of %1").arg(getName(bo)));
    3.30  			mapCenter->reposition();
    3.31  			ensureSelectionVisible();
    3.32  		}
     4.1 --- a/tex/vym.changelog	Wed Oct 24 14:41:34 2007 +0000
     4.2 +++ b/tex/vym.changelog	Tue Nov 06 13:54:41 2007 +0000
     4.3 @@ -1,3 +1,14 @@
     4.4 +-------------------------------------------------------------------
     4.5 +Tue Nov  6 14:36:38 CET 2007 - uwedr@suse.de
     4.6 +
     4.7 +- Version: 1.11.1
     4.8 +- Bugfix: sort branches has undo/redo now 
     4.9 +
    4.10 +-------------------------------------------------------------------
    4.11 +Fri Oct 26 11:22:20 CEST 2007 - uwedr@suse.de
    4.12 +
    4.13 +- Bugfix: zip state is changed now, when a .xml is save as .vym 
    4.14 +
    4.15  -------------------------------------------------------------------
    4.16  Wed Oct 24 14:11:36 CEST 2007 - uwedr@suse.de
    4.17  
     5.1 --- a/version.h	Wed Oct 24 14:41:34 2007 +0000
     5.2 +++ b/version.h	Tue Nov 06 13:54:41 2007 +0000
     5.3 @@ -4,10 +4,10 @@
     5.4  #include <QString>
     5.5  
     5.6  #define __VYM_NAME "VYM"
     5.7 -#define __VYM_VERSION "1.11.0"
     5.8 +#define __VYM_VERSION "1.11.1"
     5.9  //#define __VYM_CODENAME "Codename: 1.10.0-RC-3"
    5.10  #define __VYM_CODENAME "Codename: development version"
    5.11 -#define __VYM_BUILD_DATE "2007-10-24"
    5.12 +#define __VYM_BUILD_DATE "2007-11-06"
    5.13  
    5.14  
    5.15  bool checkVersion(const QString &);