diff -r 263988fee2a7 -r b525fdd445c4 mainwindow.cpp
--- a/mainwindow.cpp	Wed Jun 20 10:51:45 2007 +0000
+++ b/mainwindow.cpp	Wed Jun 20 10:51:45 2007 +0000
@@ -8,7 +8,6 @@
 #include "branchpropwindow.h"
 #include "exportoofiledialog.h"
 #include "exports.h"
-#include "exportxhtmldialog.h"
 #include "file.h"
 #include "flagrowobj.h"
 #include "historywindow.h"
@@ -2293,7 +2292,7 @@
 		currentMapEditor()->importDir();	
 }
 
-void Main::fileExportXML()
+void Main::fileExportXML()	//FIXME not scriptable yet
 {
 	if (currentMapEditor())
 	{
@@ -2304,41 +2303,13 @@
 }
 
 
-void Main::fileExportXHTML()
+void Main::fileExportXHTML()	
 {
 	MapEditor *me=currentMapEditor();
-	QString dir;
-	if (me)
-	{
-		ExportXHTMLDialog dia(this);
-		dia.setFilePath (me->getFilePath() );
-		dia.setMapName (me->getMapName() );
-		dia.readSettings();
-		
-		if (dia.exec()==QDialog::Accepted)
-		{
-			QString dir=dia.getDir();
-			// Check, if warnings should be used before overwriting
-			// the output directory
-			WarningDialog warn;
-			warn.showCancelButton (true);
-			warn.setText(QString(
-				"The directory %1 is not empty.\n"
-				"Do you risk to overwrite some of its contents?").arg(dir));
-			warn.setCaption("Warning: Directory not empty");
-			warn.setShowAgainName("mainwindow/overwrite-dir-xhtml");
-			if (warn.exec()==QDialog::Accepted)
-			{
-				me->exportXML (dia.getDir() );
-				dia.doExport(me->getMapName() );
-				if (dia.hasChanged())
-					me->setChanged();
-			}	
-		}
-	}	
+	if (me) me->exportXHTML();
 }
 
-void Main::fileExportImage()
+void Main::fileExportImage()	
 {
 	MapEditor *me=currentMapEditor();
 	if (me) me->exportImage();
@@ -2350,7 +2321,7 @@
 	if (me) me->exportASCII();
 }
 
-void Main::fileExportCSV()
+void Main::fileExportCSV()	//FIXME not scriptable yet
 {
 	MapEditor *me=currentMapEditor();
 	if (me)
@@ -2369,7 +2340,7 @@
 	}
 }
 
-void Main::fileExportLaTeX()
+void Main::fileExportLaTeX()	//FIXME not scriptable yet
 {
 	MapEditor *me=currentMapEditor();
 	if (me)
@@ -2388,7 +2359,7 @@
 	}
 }
 
-void Main::fileExportKDEBookmarks()
+void Main::fileExportKDEBookmarks()	//FIXME not scriptable yet
 {
 	ExportKDEBookmarks ex;
 	MapEditor *me=currentMapEditor();
@@ -2399,7 +2370,7 @@
 	}	
 }
 
-void Main::fileExportTaskjuggler()
+void Main::fileExportTaskjuggler()	//FIXME not scriptable yet
 {
 	ExportTaskjuggler ex;
 	MapEditor *me=currentMapEditor();
@@ -2418,7 +2389,7 @@
 	}	
 }
 
-void Main::fileExportOOPresentation()
+void Main::fileExportOOPresentation()	//FIXME not scriptable yet
 {
 	ExportOOFileDialog *fd=new ExportOOFileDialog( this,vymName+" - "+tr("Export to")+" Open Office");
 	// TODO add preview in dialog