diff -r e2a80d9b5858 -r b8c547f0fc58 mainwindow.cpp --- a/mainwindow.cpp Thu Jul 06 15:39:54 2006 +0000 +++ b/mainwindow.cpp Thu Jul 27 14:07:11 2006 +0000 @@ -131,7 +131,6 @@ extern QMenu* branchLinksContextMenuEdit; extern QMenu* branchLinksContextMenuFollow; extern QMenu* floatimageContextMenu; -extern QMenu* saveImageFormatMenu; extern QMenu* canvasContextMenu; extern QMenu* fileLastMapsMenu; extern QMenu* fileImportMenu; @@ -144,6 +143,7 @@ extern QDir vymBaseDir; extern QDir lastImageDir; +extern QDir lastFileDir; extern QString iconPath; extern QString flagsPath; @@ -1553,14 +1553,9 @@ // Context menu for floatimage floatimageContextMenu =new QMenu (this); - saveImageFormatMenu=floatimageContextMenu->addMenu (tr("Save image")); - - foreach (QByteArray format, QImageWriter::supportedImageFormats()) - { - QString text = tr("%1...").arg(QString(format).toUpper()); - a= new QAction (text,this); - saveImageFormatMenu->addAction ( a ); - } + a= new QAction (tr ("Save image"),this); + connect (a, SIGNAL (triggered()), this, SLOT (editSaveImage())); + floatimageContextMenu->addAction (a); floatimageContextMenu->addSeparator(); actionEditCopy->addTo( floatimageContextMenu ); @@ -1920,8 +1915,7 @@ void Main::fileLoad(const LoadMode &lmode) { Q3FileDialog *fd=new Q3FileDialog( this); - if (!lastFileDir.isEmpty()) - fd->setDir (lastFileDir); + fd->setDir (lastFileDir); fd->setMode (Q3FileDialog::ExistingFiles); fd->addFilter ("XML (*.xml)"); fd->addFilter ("VYM map (*.vym *.vyp)"); @@ -2188,8 +2182,7 @@ ImportMM im; Q3FileDialog *fd=new Q3FileDialog( this); - if (!lastFileDir.isEmpty()) - fd->setDir (lastFileDir); + fd->setDir (lastFileDir); fd->setMode (Q3FileDialog::ExistingFiles); fd->addFilter ("Mind Manager (*.mmap)"); fd->setCaption(tr("Import")+" "+"Mind Manager"); @@ -2360,14 +2353,22 @@ //fd->setPreviewMode( QFileDialog::Contents ); fd->setCaption(__VYM " - " +tr("Export to")+" Open Office"); fd->setDir (QDir().current()); - fd->show(); - - if ( fd->exec() == QDialog::Accepted ) + if (fd->foundConfig()) { - QString fn=fd->selectedFile(); - //lastImageDir=fn.left(fn.findRev ("/")); - if (currentMapEditor()) - currentMapEditor()->exportOOPresentation(fn,fd->selectedConfig()); + fd->show(); + + if ( fd->exec() == QDialog::Accepted ) + { + QString fn=fd->selectedFile(); + //lastImageDir=fn.left(fn.findRev ("/")); + if (currentMapEditor()) + currentMapEditor()->exportOOPresentation(fn,fd->selectedConfig()); + } + } else + { + QMessageBox::warning(0, + tr("Warning"), + tr("Couldn't find configuration for export to Open Office\n")); } } @@ -2795,10 +2796,10 @@ currentMapEditor()->loadFloatImage(); } -void Main::editSaveImage(int item) +void Main::editSaveImage() { if (currentMapEditor()) - currentMapEditor()->saveFloatImage(item); + currentMapEditor()->saveFloatImage(); } void Main::editFollowXLink(QAction *a)