# HG changeset patch # User insilmaril # Date 1235565850 0 # Node ID d045ba89798e6d2545918bcf6025a70ebc2f22ac # Parent 39b806972b03799809178fe12a26864e6debe587 Bugfix: Enabled multiple mapcenters for export to OpenOffice.org diff -r 39b806972b03 -r d045ba89798e demos/lifeforms.vym Binary file demos/lifeforms.vym has changed diff -r 39b806972b03 -r d045ba89798e exportoofiledialog.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/exportoofiledialog.cpp Wed Feb 25 12:44:10 2009 +0000 @@ -0,0 +1,95 @@ +#include + +#include "exportoofiledialog.h" + +ExportOOFileDialog::ExportOOFileDialog():QFileDialog() +{ + init(); +} + +ExportOOFileDialog::ExportOOFileDialog (QWidget * parent, const QString &caption ):QFileDialog(parent, caption) +{ + init(); +} + +bool ExportOOFileDialog::foundConfig() +{ + return !filters.isEmpty(); +} + + +QString ExportOOFileDialog::selectedConfig() +{ + QStringList::Iterator itpath=configPaths.begin(); + QStringList::Iterator itf=filters.begin(); + while (itf != filters.end()) + { + if (*itf==selectedFilter()) return *itpath; + itpath++; + itf++; + } + qWarning ("ExportOOFileDialog::selectedConfig No filter found!"); + return ""; +} + +void ExportOOFileDialog::newConfigPath(const QString &s) +{ + lastFilter=s; +} + +QString ExportOOFileDialog::selectedFile() +{ + return QFileDialog::selectedFile(); +} + + +void ExportOOFileDialog::show() +{ + setFilters (filters); + QFileDialog::show(); +} + +void ExportOOFileDialog::init() +{ + setMode( QFileDialog::AnyFile ); + QDir d; + d.setPath (vymBaseDir.path()+"/exports"); + scanExportConfigs(d); + d.setPath (d.homeDirPath()+"/.vym/exports"); + scanExportConfigs(d); + + connect ( + this,SIGNAL (filterSelected(const QString&)), + this, SLOT( newConfigPath(const QString &))); +} + +void ExportOOFileDialog::addFilter(const QString &f) +{ + lastFilter=f; + filters.append (f); +} + +void ExportOOFileDialog::scanExportConfigs(QDir dir) +{ + // Scan existing export configurations + SimpleSettings set; + QFile f; + if (dir.exists()) + { + // Traverse files + dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks); + + QFileInfoList list = dir.entryInfoList(); + for (int i = 0; i < list.size(); ++i) { + QFileInfo fi = list.at(i); + + if (fi.fileName().endsWith(".conf") ) + { + configPaths.append (fi.absFilePath()); + set.clear(); + set.readSettings (fi.absFilePath()); + addFilter (set.readEntry(QString("Name")) + " (*.odp)"); + } + } + } +} diff -r 39b806972b03 -r d045ba89798e exportoofiledialog.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/exportoofiledialog.h Wed Feb 25 12:44:10 2009 +0000 @@ -0,0 +1,42 @@ +#ifndef EXPORTOOFILEDIALOG +#define EXPORTOOFILEDIALOG + +#include +#include + +#include "options.h" +#include "settings.h" + +extern Options options; +extern QDir vymBaseDir; + +/*! \brief Dialog to select output file and format for Open Office documents + +This is an overloaded QFileDialog, which allows to select templates by setting a type. +*/ + +class ExportOOFileDialog:public QFileDialog +{ + Q_OBJECT +public: + ExportOOFileDialog(); + + ExportOOFileDialog (QWidget * parent , const QString &caption=QString()); + bool foundConfig(); + QString selectedConfig(); + QString selectedFile(); + void show(); + +private slots: + void newConfigPath (const QString&f); + +private: + void init(); + void addFilter(const QString &); + void scanExportConfigs(QDir ); + QStringList configPaths; + QStringList filters; + QString lastFilter; + +}; +#endif diff -r 39b806972b03 -r d045ba89798e exports.cpp --- a/exports.cpp Tue Dec 09 16:44:46 2008 +0000 +++ b/exports.cpp Wed Feb 25 12:44:10 2009 +0000 @@ -1,87 +1,114 @@ #include "exports.h" +#include "file.h" +#include "linkablemapobj.h" +#include "misc.h" +#include "mainwindow.h" +#include "warningdialog.h" +#include "xsltproc.h" -#include "linkablemapobj.h" +extern Main *mainWindow; +extern QDir vymBaseDir; +extern QString vymName; - -Export::Export() +ExportBase::ExportBase() { indentPerDepth=" "; + bool ok; + tmpDir.setPath (makeTmpDir(ok,"vym-export")); + if (!tmpDir.exists() || !ok) + QMessageBox::critical( 0, QObject::tr( "Error" ), + QObject::tr("Couldn't access temporary directory\n")); + cancelFlag=false; } -bool Export::setOutputDir(QString dirname) +ExportBase::~ExportBase() { - outdir.setPath (dirname); - if ( outdir.exists() ) - { - // FIXME - // ask for confirmation - // then delete outdir - return true; - } else - { - // try to create directory - //return outdir.mkdir (outdir.absPath()); - // FIXME - return true; - } + // Cleanup tmpdir + removeDir (tmpDir); } -void Export::setPath (const QString &p) +void ExportBase::setDir(const QDir &d) { - filepath=p; + outDir=d; } -void Export::setMapCenter(MapCenterObj *mc) +void ExportBase::setFile (const QString &p) { - mapCenter=mc; + outputFile=p; } -void Export::exportMap() +QString ExportBase::getFile () { - QFile file (filepath); - if ( !file.open( IO_WriteOnly ) ) - { - // FIXME - cout << "Export::exportMap couldn't open "<first(); - while (bo) - { - // Make indentstring - for (i=0;igetDepth();i++) actIndent+= indentPerDepth; - - // Write heading - // write (actIndent + getSectionString(bo) + bo->getHeading()+ "\n"); - if (bo->getDepth()==1) - ts << (getSectionString(bo) + bo->getHeading()+ "\n"); - else - ts << (actIndent + " - " + bo->getHeading()+ "\n"); - - // If necessary, write note - if (!bo->getNote().isEmpty()) - { - ts << ("-------------------Begin of Note-----------------\n"); - ts << (bo->getNote()); - ts << ("\n"); - ts << ("-------------------End of Note-------------------\n"); - } - - bo=bo->next(); - actIndent=""; - } - file.close(); + return outputFile; } -QString Export::getSectionString(BranchObj *bostart) +void ExportBase::setModel(VymModel *m) { + model=m; +} + +void ExportBase::setCaption (const QString &s) +{ + caption=s; +} + +void ExportBase::addFilter(const QString &s) +{ + filter=s; +} + +bool ExportBase::execDialog() +{ + //MapEditor *me=model.getMapEditor(); FIXME needed? + // if (model->mapCenters.count() && me) + { + QFileDialog *fd=new QFileDialog( 0, caption); + fd->setFilter (filter); + fd->setCaption(caption); + fd->setMode( QFileDialog::AnyFile ); + fd->setDir (outDir); + fd->show(); + + if ( fd->exec() == QDialog::Accepted ) + { + if (QFile (fd->selectedFile()).exists() ) + { + QMessageBox mb( vymName, + QObject::tr("The file %1 exists already.\nDo you want to overwrite it?").arg(fd->selectedFile()), + QMessageBox::Warning, + QMessageBox::Yes | QMessageBox::Default, + QMessageBox::Cancel | QMessageBox::Escape, + Qt::NoButton ); + mb.setButtonText( QMessageBox::Yes, QObject::tr("Overwrite") ); + mb.setButtonText( QMessageBox::No, QObject::tr("Cancel")); + ExportBase ex; + switch( mb.exec() ) + { + case QMessageBox::Yes: + // save + break;; + case QMessageBox::Cancel: + cancelFlag=true; + return false; + break; + } + } + outputFile=fd->selectedFile(); + cancelFlag=false; + return true; + } + } + return false; +} + +bool ExportBase::canceled() +{ + return cancelFlag; +} + +QString ExportBase::getSectionString(BranchObj *bostart) +{ + // Make prefix like "2.5.3" for "bo:2,bo:5,bo:3" QString r; BranchObj *bo=bostart; int depth=bo->getDepth(); @@ -97,36 +124,460 @@ return r + " "; } -void Export::exportAsHTML() +//////////////////////////////////////////////////////////////////////// +ExportASCII::ExportASCII() { - // FIXME just testing... + filter="TXT (*.txt)"; + caption=vymName+ " -" +QObject::tr("Export as ASCII")+" "+QObject::tr("(still experimental)"); +} + +void ExportASCII::doExport() +{ + QFile file (outputFile); + if ( !file.open( QIODevice::WriteOnly ) ) + { + qWarning ("ExportBase::exportXML couldn't open "+outputFile); + return; + } + QTextStream ts( &file ); // use LANG decoding here... + // Main loop over all branches QString s; - QString actIndent(""); + QString curIndent; int i; BranchObj *bo; - bo=mapCenter->first(); + bo=model->first(); while (bo) { // Make indentstring - for (i=0;igetDepth();i++) actIndent+= indentPerDepth; + curIndent=""; + for (i=0;igetDepth()-1;i++) curIndent+= indentPerDepth; - // Write heading - write (actIndent + getSectionString(bo) + bo->getHeading()+ "\n"); - - // If necessary, write note - if (!bo->getNote().isEmpty()) + if (!bo->hasHiddenExportParent() ) { - write (bo->getNote()); + switch (bo->getDepth()) + { + case 0: + ts << underline (bo->getHeading(),QString("=")); + ts << "\n"; + break; + case 1: + ts << "\n"; + ts << (underline (getSectionString(bo) + bo->getHeading(), QString("-") ) ); + ts << "\n"; + break; + case 2: + ts << "\n"; + ts << (curIndent + "* " + bo->getHeading()); + ts << "\n"; + break; + case 3: + ts << (curIndent + "- " + bo->getHeading()); + ts << "\n"; + break; + default: + ts << (curIndent + "- " + bo->getHeading()); + ts << "\n"; + break; + } + + // If necessary, write note + if (!bo->getNote().isEmpty()) + { + curIndent +=" | "; + s=bo->getNoteASCII( curIndent, 80); + ts << s; + } + } + bo=model->next(bo); + } + file.close(); +} + +QString ExportASCII::underline (const QString &text, const QString &line) +{ + QString r=text + "\n"; + for (int j=0;jfirst(); + while (bo) + { + if (!bo->hasHiddenExportParent() ) + { + // If necessary, write note + if (!bo->getNote().isEmpty()) + { + s =bo->getNoteASCII(); + s=s.replace ("\n","\n"+curIndent); + ts << ("\""+s+"\","); + } else + ts <<"\"\","; + + // Make indentstring + for (i=0;igetDepth();i++) curIndent+= "\"\","; + + // Write heading + ts << curIndent << "\"" << bo->getHeading()<<"\""<next(); - actIndent=""; + bo=model->next(bo); + curIndent=""; + } + file.close(); +} + +//////////////////////////////////////////////////////////////////////// +void ExportKDEBookmarks::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")); + 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()+"/.kde/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)); + } + } + } + +} + +//////////////////////////////////////////////////////////////////////// +void ExportFirefoxBookmarks::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("Firefox")); + dia.setCaption(QObject::tr("Warning: Overwriting %1 bookmarks").arg("Firefox")); + dia.setShowAgainName("/vym/warnings/overwriteImportBookmarks"); + if (dia.exec()==QDialog::Accepted) + { + me->exportXML(tmpDir.path(),false); + +/* + XSLTProc p; + p.setInputFile (tmpDir.path()+"/"+me->getMapName()+".xml"); + p.setOutputFile (tmpDir.home().path()+"/.kde/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->addArgument(ub); + + if ( !proc->start() ) + { + QMessageBox::warning(0, + QObject::tr("Warning"), + QObject::tr("Couldn't find script %1\nto notifiy Browsers of changed bookmarks.").arg(ub)); + } + +*/ + + } } } -void Export::write(QString s) +//////////////////////////////////////////////////////////////////////// +void ExportTaskjuggler::doExport() { - cout << s; + MapEditor *me=model->getMapEditor(); + if (me) + { + me->exportXML(tmpDir.path(),false); + + XSLTProc p; + p.setInputFile (tmpDir.path()+"/"+me->getMapName()+".xml"); + p.setOutputFile (outputFile); + p.setXSLFile (vymBaseDir.path()+"/styles/vym2taskjuggler.xsl"); + p.process(); + } + } +//////////////////////////////////////////////////////////////////////// +void ExportLaTeX::doExport() +{ + // Exports a map to a LaTex file. + // This file needs to be included + // or inported into a LaTex document + // it will not add a preamble, or anything + // that makes a full LaTex document. + QFile file (outputFile); + if ( !file.open( QIODevice::WriteOnly ) ) { + QMessageBox::critical (0,QObject::tr("Critical Export Error"),QObject::tr("Could not write %1").arg(outputFile)); + mainWindow->statusMessage(QString(QObject::tr("Export failed."))); + return; + } + QTextStream ts( &file ); // use LANG decoding here... + ts.setEncoding (QTextStream::UnicodeUTF8); // Force UTF8 + + // Main loop over all branches + QString s; + // QString curIndent(""); + // int i; + BranchObj *bo; + bo=model->first(); + while (bo) { + if (!bo->hasHiddenExportParent() ) + { + if (bo->getDepth()==0); + else if (bo->getDepth()==1) { + ts << ("\\chapter{" + bo->getHeading()+ "}\n"); + } + else if (bo->getDepth()==2) { + ts << ("\\section{" + bo->getHeading()+ "}\n"); + } + else if (bo->getDepth()==3) { + ts << ("\\subsection{" + bo->getHeading()+ "}\n"); + } + else if (bo->getDepth()==4) { + ts << ("\\subsubsection{" + bo->getHeading()+ "}\n"); + } + else { + ts << ("\\paragraph*{" + bo->getHeading()+ "}\n"); + } + + // If necessary, write note + if (!bo->getNote().isEmpty()) { + ts << (bo->getNoteASCII()); + ts << ("\n"); + } + } + bo=model->next(bo); + } + file.close(); +} + +//////////////////////////////////////////////////////////////////////// +ExportOO::ExportOO() +{ + useSections=false; +} + +ExportOO::~ExportOO() +{ +} + +QString ExportOO::buildList (BranchObj *current) +{ + QString r; + BranchObj *bo; + + uint i=0; + bo=current->getFirstBranch(); + if (bo) + { + if (!bo->hasHiddenExportParent() ) + { + // Start list + r+="\n"; + while (bo) + { + r+=""; + r+=quotemeta(bo->getHeading()); + // If necessary, write note + if (!bo->getNote().isEmpty()) + r+=bo->getNoteOpenDoc(); + r+=""; + r+=buildList (bo); // recursivly add deeper branches + r+="\n"; + i++; + bo=current->getBranchNum(i); + } + r+="\n"; + } + } + return r; +} + + +void ExportOO::exportPresentation() +{ + QString allPages; + + MapCenterObj *firstMCO=(MapCenterObj*)model->first(); + if (!firstMCO) + { + QMessageBox::critical (0,QObject::tr("Critical Export Error"),QObject::tr("No objects in map!")); + return; + } + + // Insert new content + // FIXME add extra title in mapinfo for vym 1.13.x + content.replace ("",quotemeta(firstMCO->getHeading())); + content.replace ("",quotemeta(model->getAuthor())); + + QString onePage; + QString list; + + BranchObj *sectionBO; + int i=0; + BranchObj *pagesBO; + int j=0; + + int mapcenters=model->countMapCenters(); + + // useSections already has been set in setConfigFile + if (mapcenters>1) + sectionBO=firstMCO; + else + sectionBO=firstMCO->getFirstBranch(); + + // Walk sections + while (sectionBO && !sectionBO->hasHiddenExportParent() ) + { + if (useSections) + { + // Add page with section title + onePage=sectionTemplate; + onePage.replace ("", quotemeta(sectionBO->getHeading() ) ); + allPages+=onePage; + pagesBO=sectionBO->getFirstBranch(); + } else + { + //i=-2; // only use inner loop to + // turn mainbranches into pages + //sectionBO=firstMCO; + pagesBO=sectionBO; + } + + j=0; + while (pagesBO && !pagesBO->hasHiddenExportParent() ) + { + // Add page with list of items + onePage=pageTemplate; + onePage.replace ("", quotemeta (pagesBO->getHeading() ) ); + list=buildList (pagesBO); + onePage.replace ("", list); + allPages+=onePage; + if (pagesBO!=sectionBO) + { + j++; + pagesBO=((BranchObj*)pagesBO->getParObj())->getBranchNum(j); + } else + pagesBO=NULL; // We are already iterating over the sectionBOs + } + i++; + if (mapcenters>1 ) + sectionBO=model->getMapCenterNum (i); + else + sectionBO=firstMCO->getBranchNum (i); + } + + content.replace ("",allPages); + + // Write modified content + QFile f (contentFile); + if ( !f.open( QIODevice::WriteOnly ) ) + { + QMessageBox::critical (0,QObject::tr("Critical Export Error"),QObject::tr("Could not write %1").arg(contentFile)); + mainWindow->statusMessage(QString(QObject::tr("Export failed."))); + return; + } + + QTextStream t( &f ); + t << content; + f.close(); + + // zip tmpdir to destination + zipDir (tmpDir,outputFile); +} + +bool ExportOO::setConfigFile (const QString &cf) +{ + configFile=cf; + int i=cf.findRev ("/"); + if (i>=0) configDir=cf.left(i); + SimpleSettings set; + set.readSettings(configFile); + + // set paths + templateDir=configDir+"/"+set.readEntry ("Template"); + + QDir d (templateDir); + if (!d.exists()) + { + QMessageBox::critical (0,QObject::tr("Critical Export Error"),QObject::tr("Check \"%1\" in\n%2").arg("Template="+set.readEntry ("Template")).arg(configFile)); + return false; + + } + + contentTemplateFile=templateDir+"content-template.xml"; + contentFile=tmpDir.path()+"/content.xml"; + pageTemplateFile=templateDir+"page-template.xml"; + sectionTemplateFile=templateDir+"section-template.xml"; + + if (model->countMapCenters()>1 ||set.readEntry("useSections").contains("yes")) + useSections=true; + + // Copy template to tmpdir + system ("cp -r "+templateDir+"* "+tmpDir.path()); + + // Read content-template + if (!loadStringFromDisk (contentTemplateFile,content)) + { + QMessageBox::critical (0,QObject::tr("Critical Export Error"),QObject::tr("Could not read %1").arg(contentTemplateFile)); + return false; + } + + // Read page-template + if (!loadStringFromDisk (pageTemplateFile,pageTemplate)) + { + QMessageBox::critical (0,QObject::tr("Critical Export Error"),QObject::tr("Could not read %1").arg(pageTemplateFile)); + return false; + } + + // Read section-template + if (useSections && !loadStringFromDisk (sectionTemplateFile,sectionTemplate)) + { + QMessageBox::critical (0,QObject::tr("Critical Export Error"),QObject::tr("Could not read %1").arg(sectionTemplateFile)); + return false; + } + return true; +} + diff -r 39b806972b03 -r d045ba89798e exports/template-orange-blue/section-template.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/exports/template-orange-blue/section-template.xml Wed Feb 25 12:44:10 2009 +0000 @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff -r 39b806972b03 -r d045ba89798e tex/vym.changelog --- a/tex/vym.changelog Tue Dec 09 16:44:46 2008 +0000 +++ b/tex/vym.changelog Wed Feb 25 12:44:10 2009 +0000 @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 25 13:43:28 CET 2009 - uwedr@suse.de + +- Bugfix: Enabled multiple mapcenters for export to OpenOffice.org + ------------------------------------------------------------------- Mon Dec 8 20:26:41 CET 2008 - uwedr@suse.de diff -r 39b806972b03 -r d045ba89798e version.h --- a/version.h Tue Dec 09 16:44:46 2008 +0000 +++ b/version.h Wed Feb 25 12:44:10 2009 +0000 @@ -4,10 +4,10 @@ #include #define __VYM_NAME "VYM" -#define __VYM_VERSION "1.12.2c" +#define __VYM_VERSION "1.12.2d" #define __VYM_CODENAME "Maintenance Update " //#define __VYM_CODENAME "Codename: development version" -#define __VYM_BUILD_DATE "2008-12-08" +#define __VYM_BUILD_DATE "2009-02-25" bool checkVersion(const QString &); diff -r 39b806972b03 -r d045ba89798e vymmodel.cpp --- a/vymmodel.cpp Tue Dec 09 16:44:46 2008 +0000 +++ b/vymmodel.cpp Wed Feb 25 12:44:10 2009 +0000 @@ -120,6 +120,20 @@ return NULL; } +MapCenterObj *VymModel::getMapCenterNum (int i) +{ + cout << "MCO i="<