diff -r bd98be838da9 -r 85683324f94a exports.cpp --- a/exports.cpp Mon Mar 16 15:40:49 2009 +0000 +++ b/exports.cpp Thu Mar 19 11:48:33 2009 +0000 @@ -249,7 +249,7 @@ } //////////////////////////////////////////////////////////////////////// -void ExportKDEBookmarks::doExport() +void ExportKDE3Bookmarks::doExport() { MapEditor *me=model->getMapEditor(); if (me) @@ -257,7 +257,7 @@ WarningDialog dia; dia.showCancelButton (true); dia.setText(QObject::tr("Exporting the %1 bookmarks will overwrite\nyour existing bookmarks file.").arg("KDE")); - dia.setCaption(QObject::tr("Warning: Overwriting %1 bookmarks").arg("KDE")); + dia.setCaption(QObject::tr("Warning: Overwriting %1 bookmarks").arg("KDE 3")); dia.setShowAgainName("/exports/KDE/overwriteKDEBookmarks"); if (dia.exec()==QDialog::Accepted) { @@ -280,6 +280,40 @@ } } } +} + +//////////////////////////////////////////////////////////////////////// +void ExportKDE4Bookmarks::doExport() +{ + MapEditor *me=model->getMapEditor(); + if (me) + { + WarningDialog dia; + dia.showCancelButton (true); + dia.setText(QObject::tr("Exporting the %1 bookmarks will overwrite\nyour existing bookmarks file.").arg("KDE")); + dia.setCaption(QObject::tr("Warning: Overwriting %1 bookmarks").arg("KDE 4")); + dia.setShowAgainName("/exports/KDE/overwriteKDEBookmarks"); + if (dia.exec()==QDialog::Accepted) + { + me->exportXML(tmpDir.path(),false); + + XSLTProc p; + p.setInputFile (tmpDir.path()+"/"+me->getMapName()+".xml"); + p.setOutputFile (tmpDir.home().path()+"/.kde4/share/apps/konqueror/bookmarks.xml"); + p.setXSLFile (vymBaseDir.path()+"/styles/vym2kdebookmarks.xsl"); + p.process(); + + QString ub=vymBaseDir.path()+"/scripts/update-bookmarks"; + QProcess *proc= new QProcess ; + proc->start( ub); + if (!proc->waitForStarted()) + { + QMessageBox::warning(0, + QObject::tr("Warning"), + QObject::tr("Couldn't find script %1\nto notifiy Browsers of changed bookmarks.").arg(ub)); + } + } + } }