1.1 Binary file demos/todo.vym has changed

     2.1 --- a/exports.cpp	Thu Aug 31 11:55:33 2006 +0000
     2.2 +++ b/exports.cpp	Thu Aug 31 12:51:20 2006 +0000
     2.3 @@ -20,7 +20,10 @@
     2.4  {
     2.5  	indentPerDepth="  ";
     2.6  	// Create tmpdir
     2.7 -	tmpDir.setPath (makeUniqueDir("/tmp/vym-XXXXXX"));
     2.8 +	// FIXME not neededtmpDir.setPath (makeUniqueDir("/tmp/vym-XXXXXX"));
     2.9 +	if (!tmpDir.cd ("tmp"))
    2.10 +		qWarning ("Could not access temporary directory for export");
    2.11 +		// FIXME there's more needed here...
    2.12  }
    2.13  
    2.14  ExportBase::~ExportBase()

     3.1 --- a/file.cpp	Thu Aug 31 11:55:33 2006 +0000
     3.2 +++ b/file.cpp	Thu Aug 31 12:51:20 2006 +0000
     3.3 @@ -65,11 +65,12 @@
     3.4  	return d;
     3.5  }
     3.6  
     3.7 -QString makeUniqueDir (QString s)
     3.8 +QString makeUniqueDir (bool &ok,QString s)
     3.9  {
    3.10  	// Create unique directory e.g. s="/tmp/vym-XXXXXX"
    3.11  
    3.12  	// Convert QString to string first
    3.13 +	ok=true;
    3.14  	char *p;
    3.15  	int bytes=s.length();
    3.16  	p=(char*) malloc (bytes+1);
    3.17 @@ -78,6 +79,7 @@
    3.18  		p[i]=s.at(i).latin1();
    3.19  	p[bytes]=0;	
    3.20  	QString r=mkdtemp (p);
    3.21 +	if (r.isEmpty()) ok=false;
    3.22  	free (p);
    3.23  	return r;
    3.24  }
    3.25 @@ -335,6 +337,7 @@
    3.26  {
    3.27  	for (int i=0;i<imageFilters.count()+1;i++)
    3.28  		if (imageFilters.at(i)==filter) return imageTypes.at(i);
    3.29 +	return QString();	
    3.30  }
    3.31  
    3.32  

     4.1 --- a/file.h	Thu Aug 31 11:55:33 2006 +0000
     4.2 +++ b/file.h	Thu Aug 31 12:51:20 2006 +0000
     4.3 @@ -11,7 +11,7 @@
     4.4  /////////////////////////////////////////////////////////////////////////////
     4.5  QString maskPath (QString );
     4.6  QString convertToRel (const QString &,const QString &);
     4.7 -QString makeUniqueDir (QString);
     4.8 +QString makeUniqueDir (bool &,QString);
     4.9  void removeDir(QDir);
    4.10  void makeSubDirs (const QString &);
    4.11  ErrorCode zipDir (const QDir &,const QString&);

     5.1 --- a/imports.cpp	Thu Aug 31 11:55:33 2006 +0000
     5.2 +++ b/imports.cpp	Thu Aug 31 12:51:20 2006 +0000
     5.3 @@ -1,4 +1,4 @@
     5.4 -#include <qmessagebox.h>
     5.5 +#include <QMessageBox>
     5.6  //Added by qt3to4:
     5.7  #include <QTextStream>
     5.8  
     5.9 @@ -15,7 +15,10 @@
    5.10  ImportBase::ImportBase()
    5.11  {
    5.12  	// Create tmpdir
    5.13 -	tmpDir.setPath (makeUniqueDir("/tmp/vym-XXXXXX"));
    5.14 +	// FIXME not neededtmpDir.setPath (makeUniqueDir("/tmp/vym-XXXXXX"));
    5.15 +	if (!tmpDir.cd ("tmp"))
    5.16 +		qWarning ("Could not access temporary directory for export");
    5.17 +		// FIXME
    5.18  }
    5.19  
    5.20  

     6.1 --- a/mainwindow.cpp	Thu Aug 31 11:55:33 2006 +0000
     6.2 +++ b/mainwindow.cpp	Thu Aug 31 12:51:20 2006 +0000
     6.3 @@ -162,7 +162,13 @@
     6.4  
     6.5  
     6.6  	// Create unique temporary directory
     6.7 -	tmpVymDir=makeUniqueDir ("/tmp/vym-XXXXXX");
     6.8 +	bool ok;
     6.9 +	tmpVymDir=makeUniqueDir (ok,"/tmp/vym-XXXXXX");
    6.10 +	if (!ok)
    6.11 +	{
    6.12 +		qWarning ("Mainwindow: Could not create temporary directory, failed to start vym");
    6.13 +		exit (1);
    6.14 +	}
    6.15  
    6.16  	// Create direcctory for clipboard
    6.17  	clipboardDir=tmpVymDir+"/clipboard";

     7.1 --- a/mapeditor.cpp	Thu Aug 31 11:55:33 2006 +0000
     7.2 +++ b/mapeditor.cpp	Thu Aug 31 12:51:20 2006 +0000
     7.3 @@ -3711,6 +3711,9 @@
     7.4  		adjustCanvasSize();
     7.5  		canvas()->update();
     7.6  		movingObj=NULL;		
     7.7 +
     7.8 +		// Just make sure, that actions are still ok,e.g. the move branch up/down buttons...
     7.9 +		updateActions();
    7.10  	} else 
    7.11  		// maybe we moved View: set old cursor
    7.12  		setCursor (Qt::ArrowCursor);

     8.1 --- a/tex/vym.changelog	Thu Aug 31 11:55:33 2006 +0000
     8.2 +++ b/tex/vym.changelog	Thu Aug 31 12:51:20 2006 +0000
     8.3 @@ -2,6 +2,8 @@
     8.4  Thu Aug 31 13:54:30 CEST 2006 - uwedr
     8.5  
     8.6  - Bugfix: More undo/redo commands
     8.7 +- Bugfix: Actions updated after moving a branch now
     8.8 +- Bugfix: vym refuses to start if vymTmpDir can't be created
     8.9  
    8.10  -------------------------------------------------------------------
    8.11  Wed Aug 30 14:14:56 CEST 2006 - uwedr