# HG changeset patch
# User insilmaril
# Date 1194357281 0
# Node ID 497f19b3c1fec82c321547c48cff5be5c2110f28
# Parent  040f32294895b8e2ad06c1d7aef2540b8337de12
1.11.1 fixed undo/redo sorting of branches

diff -r 040f32294895 -r 497f19b3c1fe demos/vym-projectplan.vym
Binary file demos/vym-projectplan.vym has changed
diff -r 040f32294895 -r 497f19b3c1fe mainwindow.cpp
--- a/mainwindow.cpp	Wed Oct 24 14:41:34 2007 +0000
+++ b/mainwindow.cpp	Tue Nov 06 13:54:41 2007 +0000
@@ -2030,6 +2030,7 @@
 						return;
 						break;
 				}
+				me->setZipped (saveZipped);
 			}
 
 			if (saveZipped)
diff -r 040f32294895 -r 497f19b3c1fe mapeditor.cpp
--- a/mapeditor.cpp	Wed Oct 24 14:41:34 2007 +0000
+++ b/mapeditor.cpp	Tue Nov 06 13:54:41 2007 +0000
@@ -1315,6 +1315,19 @@
 				setFrameType (s);
 		}
 	/////////////////////////////////////////////////////////////////////
+	} else if (com=="sortChildren")
+	{
+		if (xelection.isEmpty() )
+		{
+			parser.setError (Aborted,"Nothing selected");
+		} else if (! selb )
+		{				  
+			parser.setError (Aborted,"Type of selection is not a branch");
+		} else if (parser.checkParCount(0))
+		{
+			sortChildren();
+		}
+	/////////////////////////////////////////////////////////////////////
 	} else if (com=="toggleFlag")
 	{
 		if (xelection.isEmpty() )
@@ -2337,8 +2350,8 @@
 	{
 		if(bo->countBranches()>1)
 		{
+			saveStateChangingPart(bo,bo, "sortChildren ()",QString("Sort children of %1").arg(getName(bo)));
 			bo->sortChildren();
-			saveStateChangingPart(bo,bo, "sortChildren ()",QString("Sort children of %1").arg(getName(bo)));
 			mapCenter->reposition();
 			ensureSelectionVisible();
 		}
diff -r 040f32294895 -r 497f19b3c1fe tex/vym.changelog
--- a/tex/vym.changelog	Wed Oct 24 14:41:34 2007 +0000
+++ b/tex/vym.changelog	Tue Nov 06 13:54:41 2007 +0000
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Nov  6 14:36:38 CET 2007 - uwedr@suse.de
+
+- Version: 1.11.1
+- Bugfix: sort branches has undo/redo now 
+
+-------------------------------------------------------------------
+Fri Oct 26 11:22:20 CEST 2007 - uwedr@suse.de
+
+- Bugfix: zip state is changed now, when a .xml is save as .vym 
+
 -------------------------------------------------------------------
 Wed Oct 24 14:11:36 CEST 2007 - uwedr@suse.de
 
diff -r 040f32294895 -r 497f19b3c1fe version.h
--- a/version.h	Wed Oct 24 14:41:34 2007 +0000
+++ b/version.h	Tue Nov 06 13:54:41 2007 +0000
@@ -4,10 +4,10 @@
 #include <QString>
 
 #define __VYM_NAME "VYM"
-#define __VYM_VERSION "1.11.0"
+#define __VYM_VERSION "1.11.1"
 //#define __VYM_CODENAME "Codename: 1.10.0-RC-3"
 #define __VYM_CODENAME "Codename: development version"
-#define __VYM_BUILD_DATE "2007-10-24"
+#define __VYM_BUILD_DATE "2007-11-06"
 
 
 bool checkVersion(const QString &);