1.1 --- a/aboutdialog.cpp	Wed Feb 01 16:39:06 2006 +0000
     1.2 +++ b/aboutdialog.cpp	Wed Feb 15 12:54:55 2006 +0000
     1.3 @@ -1,5 +1,3 @@
     1.4 -/* emacs: -*- Mode: C; c-style: "bsd"; c-basic-offset: 4; c-recognize-knr-p: nil; -*- */
     1.5 -
     1.6  #include <qmime.h>
     1.7  #include <qprocess.h>
     1.8  
     1.9 @@ -22,7 +20,8 @@
    1.10      credits=new AboutTextBrowser (this,"credits");
    1.11  
    1.12      credits->setText (
    1.13 -	"<h3><center><img src=\"vym_logo\">VYM - View Your Mind </h3>"
    1.14 +	"<center><img src=\"vym_128x128\"></center>"
    1.15 +	"<h3><center>VYM - View Your Mind </h3>"
    1.16  	"<p align=\"center\"> A tool to put the things you have got in your mind into a map.</p>"
    1.17  	"<p align=\"center\"> (c) by Uwe Drechsel (<a href=\"mailto:vym@InSilmaril.de\">vym@InSilmaril.de</a>)</p>"
    1.18  	"<p align=\"center\"> Version " __VYM_VERSION" - " __BUILD_DATE"</p>"

     2.1 --- a/exportxhtmldialog.ui.h	Wed Feb 01 16:39:06 2006 +0000
     2.2 +++ b/exportxhtmldialog.ui.h	Wed Feb 15 12:54:55 2006 +0000
     2.3 @@ -12,10 +12,9 @@
     2.4  
     2.5  void ExportXHTMLDialog::init()
     2.6  {
     2.7 -	dia=new ShowTextDialog ();
     2.8 -	xsltprocessor="xsltproc";
     2.9  	filepath="";
    2.10  	settingsChanged=false;
    2.11 +	scriptProc=new Process;
    2.12  }
    2.13  
    2.14  void ExportXHTMLDialog::readSettings()
    2.15 @@ -93,7 +92,6 @@
    2.16  
    2.17  void ExportXHTMLDialog::destroy()
    2.18  {
    2.19 -	delete (dia);
    2.20  }
    2.21  
    2.22  void ExportXHTMLDialog::dirChanged()
    2.23 @@ -296,7 +294,7 @@
    2.24  	else
    2.25  	{
    2.26  		if (!css_dst.open( IO_WriteOnly))
    2.27 -			QMessageBox::warning( 0, tr( "Warning" ), tr("Could not open!").arg(dir+"vym.css"));
    2.28 +			QMessageBox::warning( 0, tr( "Warning" ), tr("Could not open %1").arg(dir+"vym.css"));
    2.29  		else
    2.30  		{	
    2.31  		
    2.32 @@ -311,52 +309,18 @@
    2.33  
    2.34  	if (!prescript.isEmpty()) runScript (prescript,dir+mapname+".xml");
    2.35  	
    2.36 -	Process *xsltProc=new Process ();
    2.37 -	xsltProc->clearArguments();
    2.38 -	xsltProc->addArgument (xsltprocessor);	
    2.39  	if (useImage)
    2.40 -	{
    2.41 -		xsltProc->addArgument ("--stringparam");
    2.42 -		xsltProc->addArgument ("imagemap");
    2.43 -		xsltProc->addArgument ("images/"+mapname+".png");
    2.44 -	}	
    2.45 +		p.addStringParam ("imagemap","images/"+mapname+".png");
    2.46  	if (useTextColor)
    2.47 -	{
    2.48 -		xsltProc->addArgument ("--stringparam");
    2.49 -		xsltProc->addArgument ("use.textcolor");
    2.50 -		xsltProc->addArgument ("1");
    2.51 -	}	
    2.52 -	xsltProc->addArgument ("--stringparam");
    2.53 -	xsltProc->addArgument ("mapname");
    2.54 -	xsltProc->addArgument (mapname+".vym");
    2.55 +		p.addStringParam ("use.textcolor","1");
    2.56 +	p.addStringParam ("mapname",mapname+".vym");
    2.57  	
    2.58 -	xsltProc->addArgument ("--output");
    2.59 -	xsltProc->addArgument (dir+mapname+".html");
    2.60 -	xsltProc->addArgument (xsl);
    2.61 -	xsltProc->addArgument (dir+mapname+".xml");
    2.62 -	dia->append ("vym is executing: \n" + xsltProc->arguments().join(" ") );	
    2.63 -	if (!xsltProc->start() )
    2.64 -	{
    2.65 -		QMessageBox::critical( 0, tr( "Critical Error" ),
    2.66 -					   tr("Could not start %1").arg(xsltprocessor) );
    2.67 -	} else
    2.68 -	{
    2.69 -		xsltProc->waitFinished();
    2.70 -		if (!xsltProc->normalExit() )
    2.71 -			QMessageBox::critical( 0, tr( "Critical Error" ),
    2.72 -			   tr("%1 didn't exit normally").arg(xsltprocessor) +
    2.73 -			   xsltProc->getErrout() );
    2.74 -		else
    2.75 -			if (xsltProc->exitStatus()>0) showOutput=true;
    2.76 -			
    2.77 -	}	
    2.78 -	dia->append ("\n");
    2.79 -	dia->append (xsltProc->getErrout());
    2.80 -	dia->append (xsltProc->getStdout());
    2.81 -	
    2.82 +	p.setOutputFile (dir+mapname+".html");
    2.83 +	p.setInputFile (dir+mapname+".xml");
    2.84 +	p.process();
    2.85 +
    2.86  	if (!postscript.isEmpty()) runScript (postscript,dir+mapname+".html");
    2.87  
    2.88 -	if (showOutput) dia->exec();
    2.89  }
    2.90  
    2.91  void ExportXHTMLDialog::setFilePath(const QString &s)
    2.92 @@ -390,14 +354,13 @@
    2.93  	spath.replace ("%f",fpath);
    2.94  	QStringList args=QStringList::split (' ',spath,false);
    2.95  		
    2.96 -	Process *scriptProc=new Process ();
    2.97  	scriptProc->clearArguments();
    2.98  	scriptProc->setArguments (args);	
    2.99 -	dia->append ("vym is executing: \n" + scriptProc->arguments().join(" ") );	
   2.100 +	p.addOutput ("vym is executing: \n" + scriptProc->arguments().join(" ") );	
   2.101  	if (!scriptProc->start() )
   2.102  	{
   2.103  		QMessageBox::critical( 0, tr( "Critical Error" ),
   2.104 -					   tr("Couldn't start %1").arg(spath) );
   2.105 +					   tr("Could not start %1").arg(spath) );
   2.106  	} else
   2.107  	{
   2.108  		scriptProc->waitFinished();
   2.109 @@ -409,7 +372,7 @@
   2.110  			if (scriptProc->exitStatus()>0) showOutput=true;
   2.111  			
   2.112  	}	
   2.113 -	dia->append ("\n");
   2.114 -	dia->append (scriptProc->getErrout());
   2.115 -	dia->append (scriptProc->getStdout());
   2.116 +	p.addOutput ("\n");
   2.117 +	p.addOutput (scriptProc->getErrout());
   2.118 +	p.addOutput (scriptProc->getStdout());
   2.119  }