diff -r 626fd85b1f69 -r 5391ab620c95 mainwindow.cpp
--- a/mainwindow.cpp	Tue Sep 05 15:05:18 2006 +0000
+++ b/mainwindow.cpp	Wed Sep 06 12:47:06 2006 +0000
@@ -30,13 +30,13 @@
 #include "exportxhtmldialog.h"
 #include "file.h"
 #include "flagrowobj.h"
+#include "historywindow.h"
 #include "imports.h"
 #include "mapeditor.h"
 #include "misc.h"
 #include "options.h"
 #include "process.h"
 #include "settings.h"
-#include "showtextdialog.h"
 #include "texteditor.h"
 #include "version.h"
 
@@ -1850,8 +1850,14 @@
 		me->viewport()->setFocus();
 
 		// Create temporary directory for packing
-		char tmpdir1[]="/tmp/vym-XXXXXX";	
-		QString tmpMapDir=mkdtemp(tmpdir1);
+		bool ok;
+		QString tmpMapDir=makeUniqueDir (ok,"/tmp/vym-XXXXXX");
+		if (!ok)
+		{
+			QMessageBox::critical( 0, tr( "Critical Load Error" ),
+			   tr("Couldn't create temporary directory before load\n"));
+			return aborted; 
+		}
 
 		// Try to unzip file
 		err=unzipDir (tmpMapDir,fn);
@@ -1945,21 +1951,22 @@
 
 void Main::fileLoad(const LoadMode &lmode)
 {
-	Q3FileDialog *fd=new Q3FileDialog( this);
+	QStringList filters;
+	filters <<"XML (*.xml)"<<"VYM map (*.vym *.vyp)";
+	QFileDialog *fd=new QFileDialog( this);
 	fd->setDir (lastFileDir);
-	fd->setMode (Q3FileDialog::ExistingFiles);
-	fd->addFilter ("XML (*.xml)");
-	fd->addFilter ("VYM map (*.vym *.vyp)");
+	fd->setFileMode (QFileDialog::ExistingFiles);
+	fd->setFilters (filters);
 	switch (lmode)
 	{
 		case NewMap:
-			fd->setCaption(tr("Load vym map"));
+			fd->setCaption(__VYM " - " +tr("Load vym map"));
 			break;
 		case ImportAdd:
-			fd->setCaption(tr("Import: Add vym map to selection"));
+			fd->setCaption(__VYM " - " +tr("Import: Add vym map to selection"));
 			break;
 		case ImportReplace:
-			fd->setCaption(tr("Import: Replace selection with vym map"));
+			fd->setCaption(__VYM " - " +tr("Import: Replace selection with vym map"));
 			break;
 	}
 	fd->show();
@@ -1967,7 +1974,7 @@
 	QString fn;
 	if ( fd->exec() == QDialog::Accepted )
 	{
-		lastFileDir=fd->dirPath();
+		lastFileDir=fd->directory().path();
 	    QStringList flist = fd->selectedFiles();
 		QStringList::Iterator it = flist.begin();
 		while( it != flist.end() ) 
@@ -2052,9 +2059,16 @@
 
 			if (saveZipped)
 			{
-				char tmpdir1[]="/tmp/vym-XXXXXX";	
-				tmpMapDir=mkdtemp(tmpdir1);
-			
+				// Create temporary directory for packing
+				bool ok;
+				QString tmpMapDir=makeUniqueDir (ok,"/tmp/vym-XXXXXX");
+				if (!ok)
+				{
+					QMessageBox::critical( 0, tr( "Critical Load Error" ),
+					   tr("Couldn't create temporary directory before save\n"));
+					return; 
+				}
+
 				safeFilePath=me->getFilePath();
 				me->setFilePath (tmpMapDir+"/"+
 					me->getMapName()+ ".xml",
@@ -3201,7 +3215,9 @@
 
 void Main::testFunction()
 {
-	currentMapEditor()->testFunction();
+	HistoryWindow hw;
+	hw.exec();
+	//currentMapEditor()->testFunction();
 }
 
 void Main::helpDoc()