1.1 --- a/mapeditor.cpp	Thu Mar 19 11:48:33 2009 +0000
     1.2 +++ b/mapeditor.cpp	Mon Mar 30 07:50:51 2009 +0000
     1.3 @@ -301,7 +301,6 @@
     1.4  		mapAttr+= attribut("author",model->getAuthor()) +
     1.5  				  attribut("comment",model->getComment()) +
     1.6  			      attribut("date",model->getDate()) +
     1.7 -			      attribut("date",model->getDate()) +
     1.8  				  attribut("countBranches", QString().number(model->countBranches())) +
     1.9  
    1.10  		          attribut("backgroundColor", mapScene->backgroundBrush().color().name() ) +

     2.1 --- a/tex/vym.changelog	Thu Mar 19 11:48:33 2009 +0000
     2.2 +++ b/tex/vym.changelog	Mon Mar 30 07:50:51 2009 +0000
     2.3 @@ -1,3 +1,9 @@
     2.4 +-------------------------------------------------------------------
     2.5 +Mon Mar 30 09:07:19 CEST 2009 - uwe
     2.6 +
     2.7 +- Version: 1.12.2g
     2.8 +- Bugfix: (Regression in 1.12.2f) Export Bookmarks to KDE 3 
     2.9 +
    2.10  -------------------------------------------------------------------
    2.11  Tue Mar 17 15:30:56 CET 2009 - uwedr@suse.de
    2.12  

     3.1 --- a/version.h	Thu Mar 19 11:48:33 2009 +0000
     3.2 +++ b/version.h	Mon Mar 30 07:50:51 2009 +0000
     3.3 @@ -4,10 +4,10 @@
     3.4  #include <QString>
     3.5  
     3.6  #define __VYM_NAME "VYM"
     3.7 -#define __VYM_VERSION "1.12.2f"
     3.8 +#define __VYM_VERSION "1.12.2g"
     3.9  #define __VYM_CODENAME "Maintenance Update "
    3.10  //#define __VYM_CODENAME "Codename: development version"
    3.11 -#define __VYM_BUILD_DATE "2009-03-18"
    3.12 +#define __VYM_BUILD_DATE "2009-03-30"
    3.13  
    3.14  
    3.15  bool checkVersion(const QString &);

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/xsltproc.cpp	Mon Mar 30 07:50:51 2009 +0000
     4.3 @@ -0,0 +1,95 @@
     4.4 +#include "xsltproc.h"
     4.5 +
     4.6 +#include <iostream>
     4.7 +#include <qmessagebox.h>
     4.8 +
     4.9 +#include "process.h"
    4.10 +
    4.11 +
    4.12 +extern bool debug;
    4.13 +
    4.14 +XSLTProc::XSLTProc ()
    4.15 +{
    4.16 +	xsltprocessor="xsltproc";
    4.17 +	showOutput=false;
    4.18 +	dia=new ShowTextDialog;
    4.19 +}
    4.20 +
    4.21 +XSLTProc::~XSLTProc ()
    4.22 +{
    4.23 +	delete (dia);
    4.24 +}
    4.25 +
    4.26 +void XSLTProc::addStringParam (const QString & k, const QString &v)
    4.27 +{
    4.28 +	stringParamKey.append (k);
    4.29 +	stringParamVal.append (v);
    4.30 +}
    4.31 +
    4.32 +void XSLTProc::setOutputFile    (const QString &s)
    4.33 +{
    4.34 +	outputFile=s;
    4.35 +}
    4.36 +
    4.37 +void XSLTProc::setXSLFile(const QString &s)
    4.38 +{
    4.39 +	xslFile=s;
    4.40 +}
    4.41 +
    4.42 +void XSLTProc::setInputFile     (const QString &s)
    4.43 +{
    4.44 +	inputFile=s;
    4.45 +}
    4.46 +
    4.47 +void XSLTProc::addOutput (const QString &s)
    4.48 +{
    4.49 +	dia->append (s);
    4.50 +}
    4.51 +
    4.52 +void XSLTProc::process()
    4.53 +{
    4.54 +	ShowTextDialog dia;
    4.55 +	QStringList args;
    4.56 +	Process *xsltProc=new Process ();
    4.57 +
    4.58 +	QStringList::Iterator itk;
    4.59 +	QStringList::Iterator itv=stringParamVal.begin();
    4.60 +
    4.61 +	for ( itk = stringParamKey.begin(); itk != stringParamKey.end(); ++itk ) 
    4.62 +	{
    4.63 +		args << "--stringparam";
    4.64 +		args << *itk;
    4.65 +		args << *itv;
    4.66 +		++itv;
    4.67 +    }
    4.68 +	
    4.69 +	args << "--output";
    4.70 +	args << outputFile;
    4.71 +	args << xslFile;
    4.72 +	args << inputFile;
    4.73 +	QString com=xsltprocessor+" "+args.join(" "); 
    4.74 +	if (debug) cout <<"xsltproc executing:\n"<<qPrintable(com)<<endl;
    4.75 +	dia.append ("vym is executing: \n" + com );	
    4.76 +	xsltProc->start(xsltprocessor,args);
    4.77 +	if (!xsltProc->waitForStarted() )
    4.78 +	{
    4.79 +		QMessageBox::critical( 0, QObject::tr( "Critical Error" ),
    4.80 +					   QObject::tr("Could not start %1").arg(xsltprocessor) );
    4.81 +	} else
    4.82 +	{
    4.83 +		if (!xsltProc->waitForFinished())
    4.84 +		{
    4.85 +			QMessageBox::critical( 0, QObject::tr( "Critical Error" ),
    4.86 +			   QObject::tr("%1 didn't exit normally").arg(xsltprocessor) +
    4.87 +			   xsltProc->getErrout() );
    4.88 +			if (xsltProc->exitStatus()>0) showOutput=true;
    4.89 +		}	   
    4.90 +			
    4.91 +	}	
    4.92 +	dia.append ("\n");
    4.93 +	dia.append (xsltProc->getErrout());
    4.94 +	dia.append (xsltProc->getStdout());
    4.95 +	
    4.96 +	if (showOutput ||debug) dia.exec();
    4.97 +}
    4.98 +