# HG changeset patch
# User insilmaril
# Date 1238399451 0
# Node ID e4d3a9313d04f5524f467fd37cbc572a2dd8f2c7
# Parent  85683324f94a0e24c0acf86509babc99816a44f6
Fixed export to KDE3 bookmarks

diff -r 85683324f94a -r e4d3a9313d04 mapeditor.cpp
--- a/mapeditor.cpp	Thu Mar 19 11:48:33 2009 +0000
+++ b/mapeditor.cpp	Mon Mar 30 07:50:51 2009 +0000
@@ -301,7 +301,6 @@
 		mapAttr+= attribut("author",model->getAuthor()) +
 				  attribut("comment",model->getComment()) +
 			      attribut("date",model->getDate()) +
-			      attribut("date",model->getDate()) +
 				  attribut("countBranches", QString().number(model->countBranches())) +
 
 		          attribut("backgroundColor", mapScene->backgroundBrush().color().name() ) +
diff -r 85683324f94a -r e4d3a9313d04 tex/vym.changelog
--- a/tex/vym.changelog	Thu Mar 19 11:48:33 2009 +0000
+++ b/tex/vym.changelog	Mon Mar 30 07:50:51 2009 +0000
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar 30 09:07:19 CEST 2009 - uwe
+
+- Version: 1.12.2g
+- Bugfix: (Regression in 1.12.2f) Export Bookmarks to KDE 3 
+
 -------------------------------------------------------------------
 Tue Mar 17 15:30:56 CET 2009 - uwedr@suse.de
 
diff -r 85683324f94a -r e4d3a9313d04 version.h
--- a/version.h	Thu Mar 19 11:48:33 2009 +0000
+++ b/version.h	Mon Mar 30 07:50:51 2009 +0000
@@ -4,10 +4,10 @@
 #include <QString>
 
 #define __VYM_NAME "VYM"
-#define __VYM_VERSION "1.12.2f"
+#define __VYM_VERSION "1.12.2g"
 #define __VYM_CODENAME "Maintenance Update "
 //#define __VYM_CODENAME "Codename: development version"
-#define __VYM_BUILD_DATE "2009-03-18"
+#define __VYM_BUILD_DATE "2009-03-30"
 
 
 bool checkVersion(const QString &);
diff -r 85683324f94a -r e4d3a9313d04 xsltproc.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xsltproc.cpp	Mon Mar 30 07:50:51 2009 +0000
@@ -0,0 +1,95 @@
+#include "xsltproc.h"
+
+#include <iostream>
+#include <qmessagebox.h>
+
+#include "process.h"
+
+
+extern bool debug;
+
+XSLTProc::XSLTProc ()
+{
+	xsltprocessor="xsltproc";
+	showOutput=false;
+	dia=new ShowTextDialog;
+}
+
+XSLTProc::~XSLTProc ()
+{
+	delete (dia);
+}
+
+void XSLTProc::addStringParam (const QString & k, const QString &v)
+{
+	stringParamKey.append (k);
+	stringParamVal.append (v);
+}
+
+void XSLTProc::setOutputFile    (const QString &s)
+{
+	outputFile=s;
+}
+
+void XSLTProc::setXSLFile(const QString &s)
+{
+	xslFile=s;
+}
+
+void XSLTProc::setInputFile     (const QString &s)
+{
+	inputFile=s;
+}
+
+void XSLTProc::addOutput (const QString &s)
+{
+	dia->append (s);
+}
+
+void XSLTProc::process()
+{
+	ShowTextDialog dia;
+	QStringList args;
+	Process *xsltProc=new Process ();
+
+	QStringList::Iterator itk;
+	QStringList::Iterator itv=stringParamVal.begin();
+
+	for ( itk = stringParamKey.begin(); itk != stringParamKey.end(); ++itk ) 
+	{
+		args << "--stringparam";
+		args << *itk;
+		args << *itv;
+		++itv;
+    }
+	
+	args << "--output";
+	args << outputFile;
+	args << xslFile;
+	args << inputFile;
+	QString com=xsltprocessor+" "+args.join(" "); 
+	if (debug) cout <<"xsltproc executing:\n"<<qPrintable(com)<<endl;
+	dia.append ("vym is executing: \n" + com );	
+	xsltProc->start(xsltprocessor,args);
+	if (!xsltProc->waitForStarted() )
+	{
+		QMessageBox::critical( 0, QObject::tr( "Critical Error" ),
+					   QObject::tr("Could not start %1").arg(xsltprocessor) );
+	} else
+	{
+		if (!xsltProc->waitForFinished())
+		{
+			QMessageBox::critical( 0, QObject::tr( "Critical Error" ),
+			   QObject::tr("%1 didn't exit normally").arg(xsltprocessor) +
+			   xsltProc->getErrout() );
+			if (xsltProc->exitStatus()>0) showOutput=true;
+		}	   
+			
+	}	
+	dia.append ("\n");
+	dia.append (xsltProc->getErrout());
+	dia.append (xsltProc->getStdout());
+	
+	if (showOutput ||debug) dia.exec();
+}
+