# HG changeset patch
# User insilmaril
# Date 1157028680 0
# Node ID caba269c3757aa311ee805a63b8080a527547d00
# Parent  70c41284cb48536d53367ef12573954e9716b9dc
More undo/redo commands. Undo debug output still enabled

diff -r 70c41284cb48 -r caba269c3757 demos/todo.vym
Binary file demos/todo.vym has changed
diff -r 70c41284cb48 -r caba269c3757 exports.cpp
--- a/exports.cpp	Thu Aug 31 11:55:33 2006 +0000
+++ b/exports.cpp	Thu Aug 31 12:51:20 2006 +0000
@@ -20,7 +20,10 @@
 {
 	indentPerDepth="  ";
 	// Create tmpdir
-	tmpDir.setPath (makeUniqueDir("/tmp/vym-XXXXXX"));
+	// FIXME not neededtmpDir.setPath (makeUniqueDir("/tmp/vym-XXXXXX"));
+	if (!tmpDir.cd ("tmp"))
+		qWarning ("Could not access temporary directory for export");
+		// FIXME there's more needed here...
 }
 
 ExportBase::~ExportBase()
diff -r 70c41284cb48 -r caba269c3757 file.cpp
--- a/file.cpp	Thu Aug 31 11:55:33 2006 +0000
+++ b/file.cpp	Thu Aug 31 12:51:20 2006 +0000
@@ -65,11 +65,12 @@
 	return d;
 }
 
-QString makeUniqueDir (QString s)
+QString makeUniqueDir (bool &ok,QString s)
 {
 	// Create unique directory e.g. s="/tmp/vym-XXXXXX"
 
 	// Convert QString to string first
+	ok=true;
 	char *p;
 	int bytes=s.length();
 	p=(char*) malloc (bytes+1);
@@ -78,6 +79,7 @@
 		p[i]=s.at(i).latin1();
 	p[bytes]=0;	
 	QString r=mkdtemp (p);
+	if (r.isEmpty()) ok=false;
 	free (p);
 	return r;
 }
@@ -335,6 +337,7 @@
 {
 	for (int i=0;i<imageFilters.count()+1;i++)
 		if (imageFilters.at(i)==filter) return imageTypes.at(i);
+	return QString();	
 }
 
 
diff -r 70c41284cb48 -r caba269c3757 file.h
--- a/file.h	Thu Aug 31 11:55:33 2006 +0000
+++ b/file.h	Thu Aug 31 12:51:20 2006 +0000
@@ -11,7 +11,7 @@
 /////////////////////////////////////////////////////////////////////////////
 QString maskPath (QString );
 QString convertToRel (const QString &,const QString &);
-QString makeUniqueDir (QString);
+QString makeUniqueDir (bool &,QString);
 void removeDir(QDir);
 void makeSubDirs (const QString &);
 ErrorCode zipDir (const QDir &,const QString&);
diff -r 70c41284cb48 -r caba269c3757 imports.cpp
--- a/imports.cpp	Thu Aug 31 11:55:33 2006 +0000
+++ b/imports.cpp	Thu Aug 31 12:51:20 2006 +0000
@@ -1,4 +1,4 @@
-#include <qmessagebox.h>
+#include <QMessageBox>
 //Added by qt3to4:
 #include <QTextStream>
 
@@ -15,7 +15,10 @@
 ImportBase::ImportBase()
 {
 	// Create tmpdir
-	tmpDir.setPath (makeUniqueDir("/tmp/vym-XXXXXX"));
+	// FIXME not neededtmpDir.setPath (makeUniqueDir("/tmp/vym-XXXXXX"));
+	if (!tmpDir.cd ("tmp"))
+		qWarning ("Could not access temporary directory for export");
+		// FIXME
 }
 
 
diff -r 70c41284cb48 -r caba269c3757 mainwindow.cpp
--- a/mainwindow.cpp	Thu Aug 31 11:55:33 2006 +0000
+++ b/mainwindow.cpp	Thu Aug 31 12:51:20 2006 +0000
@@ -162,7 +162,13 @@
 
 
 	// Create unique temporary directory
-	tmpVymDir=makeUniqueDir ("/tmp/vym-XXXXXX");
+	bool ok;
+	tmpVymDir=makeUniqueDir (ok,"/tmp/vym-XXXXXX");
+	if (!ok)
+	{
+		qWarning ("Mainwindow: Could not create temporary directory, failed to start vym");
+		exit (1);
+	}
 
 	// Create direcctory for clipboard
 	clipboardDir=tmpVymDir+"/clipboard";
diff -r 70c41284cb48 -r caba269c3757 mapeditor.cpp
--- a/mapeditor.cpp	Thu Aug 31 11:55:33 2006 +0000
+++ b/mapeditor.cpp	Thu Aug 31 12:51:20 2006 +0000
@@ -3711,6 +3711,9 @@
 		adjustCanvasSize();
 		canvas()->update();
 		movingObj=NULL;		
+
+		// Just make sure, that actions are still ok,e.g. the move branch up/down buttons...
+		updateActions();
 	} else 
 		// maybe we moved View: set old cursor
 		setCursor (Qt::ArrowCursor);
diff -r 70c41284cb48 -r caba269c3757 tex/vym.changelog
--- a/tex/vym.changelog	Thu Aug 31 11:55:33 2006 +0000
+++ b/tex/vym.changelog	Thu Aug 31 12:51:20 2006 +0000
@@ -2,6 +2,8 @@
 Thu Aug 31 13:54:30 CEST 2006 - uwedr
 
 - Bugfix: More undo/redo commands
+- Bugfix: Actions updated after moving a branch now
+- Bugfix: vym refuses to start if vymTmpDir can't be created
 
 -------------------------------------------------------------------
 Wed Aug 30 14:14:56 CEST 2006 - uwedr