1.1 --- a/mainwindow.cpp	Mon Apr 24 10:05:09 2006 +0000
     1.2 +++ b/mainwindow.cpp	Mon May 08 13:26:08 2006 +0000
     1.3 @@ -357,6 +357,10 @@
     1.4  	connect( a, SIGNAL( activated() ), this, SLOT( fileImportKDEBookmarks() ) );
     1.5  	a->addTo (importMenu);
     1.6  
     1.7 +	a = new QAction( tr( "Import")+" "+tr("Firefox Bookmarks" ), QPixmap(), tr("Firefox Bookmarks"), 0, this, "importFirefoxBookmarks" );
     1.8 +	connect( a, SIGNAL( activated() ), this, SLOT( fileImportFirefoxBookmarks() ) );
     1.9 +	a->addTo (importMenu);
    1.10 +
    1.11  	a = new QAction( tr( "Import")+" Mind Manager" , QPixmap(), "Mind Manager...", 0, this, "importMM" );
    1.12  	connect( a, SIGNAL( activated() ), this, SLOT( fileImportMM() ) );
    1.13  	a->addTo (importMenu);
    1.14 @@ -437,7 +441,6 @@
    1.15  	a->setEnabled (false);
    1.16      a->addTo( tb );
    1.17      a->addTo( menu );
    1.18 -	actionListBranches.append(a);
    1.19  	actionEditMoveUp=a;
    1.20  
    1.21      a = new QAction( tr( "Move branch down" ), QPixmap( iconPath+"down.png"), tr( "Move down" ), Key_PageDown, this, "editMoveDown" );
    1.22 @@ -445,7 +448,6 @@
    1.23  	a->setEnabled (false);
    1.24      a->addTo( tb );
    1.25      a->addTo( menu );
    1.26 -	actionListBranches.append(a);
    1.27  	actionEditMoveDown=a;
    1.28  	
    1.29  
    1.30 @@ -673,7 +675,7 @@
    1.31  void Main::setupFormatActions()
    1.32  {
    1.33      QPopupMenu *menu = new QPopupMenu( this );
    1.34 -    menuBar()->insertItem( tr( "&Format" ), menu );
    1.35 +    menuBar()->insertItem( tr( "F&ormat" ), menu );
    1.36  
    1.37      QToolBar *tb = new QToolBar( this );
    1.38      QAction *a;
    1.39 @@ -790,7 +792,7 @@
    1.40      a->addTo( menu );
    1.41  
    1.42  
    1.43 -    a = new QAction( tr( "Toggle Note Editor" ), QPixmap(flagsPath+"flag-note.png"), tr( "Toggle Note Editor" ), CTRL + Key_E , this, "noteEditor" );
    1.44 +    a = new QAction( tr( "Show Note Editor" ), QPixmap(flagsPath+"flag-note.png"), tr( "Show Note Editor" ), CTRL + Key_E , this, "noteEditor" );
    1.45      connect( a, SIGNAL( activated() ), this, SLOT(windowToggleNoteEditor() ) );
    1.46  	a->setToggleAction(true);
    1.47  	if (textEditor->showWithMain())
    1.48 @@ -801,7 +803,7 @@
    1.49      a->addTo( menu );
    1.50  	actionViewToggleNoteEditor=a;
    1.51  
    1.52 -    a = new QAction( tr( "Toggle history window" ), QPixmap(), tr( "Toggle history window" ), CTRL + Key_H , this, "historyWindow" );
    1.53 +    a = new QAction( tr( "Show history window" ), QPixmap(), tr( "Show history window" ), CTRL + Key_H , this, "historyWindow" );
    1.54      connect( a, SIGNAL( activated() ), this, SLOT(windowToggleHistory() ) );
    1.55  	a->setToggleAction(false);
    1.56      a->addTo( menu );
    1.57 @@ -1231,8 +1233,7 @@
    1.58  
    1.59  	a = new QAction( tr( "Export as")+" "+tr("KDE Bookmarks" ), QPixmap(), tr("KDE Bookmarks"), 0, this, "importKDEBookmarks" );
    1.60  	connect( a, SIGNAL( activated() ), this, SLOT( fileExportKDEBookmarks() ) );
    1.61 -//FIXME later!
    1.62 -//	a->addTo (exportMenu);
    1.63 +	a->addTo (exportMenu);
    1.64  
    1.65      a = new QAction( tr( "Export as")+" Taskjuggler"+" "+tr("(still experimental)" ), QPixmap(), "Taskjuggler...", 0, this, "exportTJ" );
    1.66      connect( a, SIGNAL( activated() ), this, SLOT( fileExportTaskjuggler() ) );
    1.67 @@ -1833,6 +1834,14 @@
    1.68  		currentMapEditor()->setFilePath ("");
    1.69  }
    1.70  
    1.71 +void Main::fileImportFirefoxBookmarks()
    1.72 +{
    1.73 +	ImportFirefoxBookmarks im;
    1.74 +	im.transform();
    1.75 +	if (success==fileLoad (im.getTransformedFile(),NewMap) && currentMapEditor() )
    1.76 +		currentMapEditor()->setFilePath ("");
    1.77 +}
    1.78 +
    1.79  void Main::fileImportMM()
    1.80  {
    1.81  	ImportMM im;