diff -r 6ae1c6f1b7eb -r 549bb67a8ab2 mainwindow.cpp
--- a/mainwindow.cpp	Mon May 08 13:25:46 2006 +0000
+++ b/mainwindow.cpp	Mon May 08 13:25:46 2006 +0000
@@ -357,6 +357,10 @@
 	connect( a, SIGNAL( activated() ), this, SLOT( fileImportKDEBookmarks() ) );
 	a->addTo (importMenu);
 
+	a = new QAction( tr( "Import")+" "+tr("Firefox Bookmarks" ), QPixmap(), tr("Firefox Bookmarks"), 0, this, "importFirefoxBookmarks" );
+	connect( a, SIGNAL( activated() ), this, SLOT( fileImportFirefoxBookmarks() ) );
+	a->addTo (importMenu);
+
 	a = new QAction( tr( "Import")+" Mind Manager" , QPixmap(), "Mind Manager...", 0, this, "importMM" );
 	connect( a, SIGNAL( activated() ), this, SLOT( fileImportMM() ) );
 	a->addTo (importMenu);
@@ -437,7 +441,6 @@
 	a->setEnabled (false);
     a->addTo( tb );
     a->addTo( menu );
-	actionListBranches.append(a);
 	actionEditMoveUp=a;
 
     a = new QAction( tr( "Move branch down" ), QPixmap( iconPath+"down.png"), tr( "Move down" ), Key_PageDown, this, "editMoveDown" );
@@ -445,7 +448,6 @@
 	a->setEnabled (false);
     a->addTo( tb );
     a->addTo( menu );
-	actionListBranches.append(a);
 	actionEditMoveDown=a;
 	
 
@@ -673,7 +675,7 @@
 void Main::setupFormatActions()
 {
     QPopupMenu *menu = new QPopupMenu( this );
-    menuBar()->insertItem( tr( "&Format" ), menu );
+    menuBar()->insertItem( tr( "F&ormat" ), menu );
 
     QToolBar *tb = new QToolBar( this );
     QAction *a;
@@ -790,7 +792,7 @@
     a->addTo( menu );
 
 
-    a = new QAction( tr( "Toggle Note Editor" ), QPixmap(flagsPath+"flag-note.png"), tr( "Toggle Note Editor" ), CTRL + Key_E , this, "noteEditor" );
+    a = new QAction( tr( "Show Note Editor" ), QPixmap(flagsPath+"flag-note.png"), tr( "Show Note Editor" ), CTRL + Key_E , this, "noteEditor" );
     connect( a, SIGNAL( activated() ), this, SLOT(windowToggleNoteEditor() ) );
 	a->setToggleAction(true);
 	if (textEditor->showWithMain())
@@ -801,7 +803,7 @@
     a->addTo( menu );
 	actionViewToggleNoteEditor=a;
 
-    a = new QAction( tr( "Toggle history window" ), QPixmap(), tr( "Toggle history window" ), CTRL + Key_H , this, "historyWindow" );
+    a = new QAction( tr( "Show history window" ), QPixmap(), tr( "Show history window" ), CTRL + Key_H , this, "historyWindow" );
     connect( a, SIGNAL( activated() ), this, SLOT(windowToggleHistory() ) );
 	a->setToggleAction(false);
     a->addTo( menu );
@@ -1231,8 +1233,7 @@
 
 	a = new QAction( tr( "Export as")+" "+tr("KDE Bookmarks" ), QPixmap(), tr("KDE Bookmarks"), 0, this, "importKDEBookmarks" );
 	connect( a, SIGNAL( activated() ), this, SLOT( fileExportKDEBookmarks() ) );
-//FIXME later!
-//	a->addTo (exportMenu);
+	a->addTo (exportMenu);
 
     a = new QAction( tr( "Export as")+" Taskjuggler"+" "+tr("(still experimental)" ), QPixmap(), "Taskjuggler...", 0, this, "exportTJ" );
     connect( a, SIGNAL( activated() ), this, SLOT( fileExportTaskjuggler() ) );
@@ -1833,6 +1834,14 @@
 		currentMapEditor()->setFilePath ("");
 }
 
+void Main::fileImportFirefoxBookmarks()
+{
+	ImportFirefoxBookmarks im;
+	im.transform();
+	if (success==fileLoad (im.getTransformedFile(),NewMap) && currentMapEditor() )
+		currentMapEditor()->setFilePath ("");
+}
+
 void Main::fileImportMM()
 {
 	ImportMM im;