diff -r c6945404eb48 -r 1ced9d88d82d exportxhtmldialog.ui.h
--- a/exportxhtmldialog.ui.h	Wed Feb 01 16:39:06 2006 +0000
+++ b/exportxhtmldialog.ui.h	Wed Feb 15 12:54:55 2006 +0000
@@ -12,10 +12,9 @@
 
 void ExportXHTMLDialog::init()
 {
-	dia=new ShowTextDialog ();
-	xsltprocessor="xsltproc";
 	filepath="";
 	settingsChanged=false;
+	scriptProc=new Process;
 }
 
 void ExportXHTMLDialog::readSettings()
@@ -93,7 +92,6 @@
 
 void ExportXHTMLDialog::destroy()
 {
-	delete (dia);
 }
 
 void ExportXHTMLDialog::dirChanged()
@@ -296,7 +294,7 @@
 	else
 	{
 		if (!css_dst.open( IO_WriteOnly))
-			QMessageBox::warning( 0, tr( "Warning" ), tr("Could not open!").arg(dir+"vym.css"));
+			QMessageBox::warning( 0, tr( "Warning" ), tr("Could not open %1").arg(dir+"vym.css"));
 		else
 		{	
 		
@@ -311,52 +309,18 @@
 
 	if (!prescript.isEmpty()) runScript (prescript,dir+mapname+".xml");
 	
-	Process *xsltProc=new Process ();
-	xsltProc->clearArguments();
-	xsltProc->addArgument (xsltprocessor);	
 	if (useImage)
-	{
-		xsltProc->addArgument ("--stringparam");
-		xsltProc->addArgument ("imagemap");
-		xsltProc->addArgument ("images/"+mapname+".png");
-	}	
+		p.addStringParam ("imagemap","images/"+mapname+".png");
 	if (useTextColor)
-	{
-		xsltProc->addArgument ("--stringparam");
-		xsltProc->addArgument ("use.textcolor");
-		xsltProc->addArgument ("1");
-	}	
-	xsltProc->addArgument ("--stringparam");
-	xsltProc->addArgument ("mapname");
-	xsltProc->addArgument (mapname+".vym");
+		p.addStringParam ("use.textcolor","1");
+	p.addStringParam ("mapname",mapname+".vym");
 	
-	xsltProc->addArgument ("--output");
-	xsltProc->addArgument (dir+mapname+".html");
-	xsltProc->addArgument (xsl);
-	xsltProc->addArgument (dir+mapname+".xml");
-	dia->append ("vym is executing: \n" + xsltProc->arguments().join(" ") );	
-	if (!xsltProc->start() )
-	{
-		QMessageBox::critical( 0, tr( "Critical Error" ),
-					   tr("Could not start %1").arg(xsltprocessor) );
-	} else
-	{
-		xsltProc->waitFinished();
-		if (!xsltProc->normalExit() )
-			QMessageBox::critical( 0, tr( "Critical Error" ),
-			   tr("%1 didn't exit normally").arg(xsltprocessor) +
-			   xsltProc->getErrout() );
-		else
-			if (xsltProc->exitStatus()>0) showOutput=true;
-			
-	}	
-	dia->append ("\n");
-	dia->append (xsltProc->getErrout());
-	dia->append (xsltProc->getStdout());
-	
+	p.setOutputFile (dir+mapname+".html");
+	p.setInputFile (dir+mapname+".xml");
+	p.process();
+
 	if (!postscript.isEmpty()) runScript (postscript,dir+mapname+".html");
 
-	if (showOutput) dia->exec();
 }
 
 void ExportXHTMLDialog::setFilePath(const QString &s)
@@ -390,14 +354,13 @@
 	spath.replace ("%f",fpath);
 	QStringList args=QStringList::split (' ',spath,false);
 		
-	Process *scriptProc=new Process ();
 	scriptProc->clearArguments();
 	scriptProc->setArguments (args);	
-	dia->append ("vym is executing: \n" + scriptProc->arguments().join(" ") );	
+	p.addOutput ("vym is executing: \n" + scriptProc->arguments().join(" ") );	
 	if (!scriptProc->start() )
 	{
 		QMessageBox::critical( 0, tr( "Critical Error" ),
-					   tr("Couldn't start %1").arg(spath) );
+					   tr("Could not start %1").arg(spath) );
 	} else
 	{
 		scriptProc->waitFinished();
@@ -409,7 +372,7 @@
 			if (scriptProc->exitStatus()>0) showOutput=true;
 			
 	}	
-	dia->append ("\n");
-	dia->append (scriptProc->getErrout());
-	dia->append (scriptProc->getStdout());
+	p.addOutput ("\n");
+	p.addOutput (scriptProc->getErrout());
+	p.addOutput (scriptProc->getStdout());
 }