# HG changeset patch
# User insilmaril
# Date 1182337539 0
# Node ID 0ccc00c05a22b46139f66fe5491a648c065c56be
# Parent  24691cdacc0222b4ef94c37ad4f2cc6bb37e2b0d
scripted exports (continued)

diff -r 24691cdacc02 -r 0ccc00c05a22 flags/flag-url-16x16.png
Binary file flags/flag-url-16x16.png has changed
diff -r 24691cdacc02 -r 0ccc00c05a22 mapeditor.cpp
--- a/mapeditor.cpp	Wed Jun 20 10:51:46 2007 +0000
+++ b/mapeditor.cpp	Wed Jun 20 11:05:39 2007 +0000
@@ -716,7 +716,7 @@
 			parser.setError (Aborted,"Could not read filename");
 		} else
 		{
-			exportXHTML (fname);
+			exportXHTML (fname,false);
 		}
 	/////////////////////////////////////////////////////////////////////
 	} else if (com=="importDir")
@@ -1794,17 +1794,16 @@
 	}
 }
 
-void MapEditor::exportXHTML (const QString &dir)
+void MapEditor::exportXHTML (const QString &dir, bool askForName)
 {
 			ExportXHTMLDialog dia(this);
 			dia.setFilePath (filePath );
 			dia.setMapName (mapName );
 			dia.readSettings();
-			dia.setDir(dir);
 
 			bool ok=true;
 			
-			if (dir=="")
+			if (askForName)
 			{
 				if (dia.exec()!=QDialog::Accepted) 
 					ok=false;
diff -r 24691cdacc02 -r 0ccc00c05a22 mapeditor.h
--- a/mapeditor.h	Wed Jun 20 10:51:46 2007 +0000
+++ b/mapeditor.h	Wed Jun 20 11:05:39 2007 +0000
@@ -135,14 +135,24 @@
 	void setHideTmpMode (BranchObj::HideTmpMode);	// temporary hide stuff
 	BranchObj::HideTmpMode getHideTmpMode();		// temporary hide stuff
 public:
-	void setExportMode (bool);			//!< Set or unset temporary hiding of objects during export
-	void exportASCII (QString fname="",bool askForName=true);  	//!< Export as ASCII
+	/*! Set or unset temporary hiding of objects during export  */
+	void setExportMode (bool);
+
+	/*! Export as ASCII text to file */
+	void exportASCII (QString fname="",bool askForName=true);  
 
 	/*! Save as image */
     void exportImage (QString fname="",bool askForName=true,QString format="PNG");
-    void exportOOPresentation(const QString &,const QString &);	//!< Export as OpenOfficeOrg presentation
-    void exportXHTML(const QString& dir="");//!< Export as XHTML to directory
-    void exportXML(const QString& dir="");	//!< Export as XML to directory
+
+    /*! Export as OpenOfficeOrg presentation */
+    void exportOOPresentation(const QString &,const QString &);	
+
+	/*! Export as XHTML to directory */
+    void exportXHTML(const QString& dir="", bool askForName=true);	
+
+	/*! Export as XTML to directory */
+    void exportXML(const QString& dir="");
+
     void clear();						//!< Clear map
     void copy();						//!< Copy to clipboard
     void redo();						//!< Redo last action