diff -r 519970fe6c84 -r e211e2fc9d54 mainwindow.cpp --- a/mainwindow.cpp Tue Feb 21 16:18:23 2006 +0000 +++ b/mainwindow.cpp Tue Feb 21 16:18:23 2006 +0000 @@ -390,6 +390,10 @@ connect( a, SIGNAL( activated() ), this, SLOT( fileImportKDEBookmarks() ) ); a->addTo (importMenu); + a = new QAction( tr( "Import")+" "+tr("Mind Manager" ), QPixmap(), tr("Mind Manager"), 0, this, "importMM" ); + connect( a, SIGNAL( activated() ), this, SLOT( fileImportMM() ) ); + a->addTo (importMenu); + a = new QAction( tr( "Import directory structure (experimental)" ), QPixmap(), tr( "Import Dir"+QString("...") ), 0, this, "export" ); connect( a, SIGNAL( activated() ), this, SLOT( fileImportDir() ) ); a->addTo( importMenu); @@ -1123,7 +1127,9 @@ branchContextMenu->insertSeparator(); actionFormatIncludeImagesVer->addTo( branchContextMenu ); - // FIXME not implemented yet actionFormatIncludeImagesHor->addTo( branchContextMenu ); + if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false)) + // FIXME not implemented yet + actionFormatIncludeImagesHor->addTo( branchContextMenu ); actionFormatHideLinkUnselected->addTo( branchContextMenu ); // Context Menu for links in a branch menu @@ -1778,12 +1784,6 @@ fileSaveAs (CompleteMap); } -void Main::fileImportDir() -{ - if (currentMapEditor()) - currentMapEditor()->importDir(); -} - void Main::fileImportKDEBookmarks() { ImportKDEBookmarks im; @@ -1792,6 +1792,44 @@ currentMapEditor()->setFilePath (""); } +void Main::fileImportMM() +{ + ImportMM im; + + QFileDialog *fd=new QFileDialog( this); + if (!lastFileDir.isEmpty()) + fd->setDir (lastFileDir); + fd->setMode (QFileDialog::ExistingFiles); + fd->addFilter ("Mind Manager (*.mmap)"); + fd->setCaption(tr("Import")+" "+"Mind Manager"); + fd->show(); + + if ( fd->exec() == QDialog::Accepted ) + { + lastFileDir=fd->dirPath(); + QStringList flist = fd->selectedFiles(); + QStringList::Iterator it = flist.begin(); + while( it != flist.end() ) + { + im.setFile (*it); + if (im.transform() && + success==fileLoad (im.getTransformedFile(),NewMap) && + currentMapEditor() ) + currentMapEditor()->setFilePath (""); + + ++it; + } + } + delete (fd); + +} + +void Main::fileImportDir() +{ + if (currentMapEditor()) + currentMapEditor()->importDir(); +} + void Main::fileExportXML() { if (currentMapEditor())