diff -r 557239819c45 -r 70c41284cb48 mainwindow.cpp
--- a/mainwindow.cpp	Wed Aug 30 12:16:25 2006 +0000
+++ b/mainwindow.cpp	Thu Aug 31 11:55:33 2006 +0000
@@ -122,7 +122,6 @@
 extern QAction* actionSettingsAutoselectHeading;
 extern QAction* actionSettingsAutoselectHeading;
 extern QAction* actionSettingsAutoselectText;
-extern QAction* actionSettingsPasteNewHeading;
 extern QAction* actionSettingsUseDelKey;
 extern QAction* actionSettingsUseFlagGroups;
 extern QAction* actionSettingsUseHideExport;
@@ -263,7 +262,6 @@
 
 	settings.setValue( "/mapeditor/editmode/autoSelectHeading",actionSettingsAutoselectHeading->isOn() );
 	settings.setValue( "/mapeditor/editmode/autoSelectText",actionSettingsAutoselectText->isOn() );
-	settings.setValue( "/mapeditor/editmode/pasteNewHeading",actionSettingsPasteNewHeading->isOn() );
 	settings.setValue( "/mapeditor/editmode/autoEdit",actionSettingsAutoedit->isOn() );
 	settings.setValue( "/mapeditor/editmode/useDelKey",actionSettingsUseDelKey->isOn() );
 	settings.setValue( "/mapeditor/editmode/useFlagGroups",actionSettingsUseFlagGroups->isOn() );
@@ -321,6 +319,7 @@
 {
 	QMenu *fileMenu = menuBar()->addMenu ( tr ("&Map") );
     QToolBar *tb = addToolBar( tr ("&Map") );
+	tb->setObjectName ("mapTB");
 
     QAction *a;
     a = new QAction(QPixmap( iconPath+"filenew.png"), tr( "&New..." ),this);
@@ -452,6 +451,7 @@
 {
     QToolBar *tb = addToolBar( tr ("&Actions") );
     tb->setLabel( "Edit Actions" );
+	tb->setObjectName ("actionsTB");
     QMenu *editMenu = menuBar()->addMenu( tr("&Edit") );
 
     QAction *a;
@@ -864,6 +864,7 @@
     QMenu *formatMenu = menuBar()->addMenu (tr ("F&ormat"));
 
     QToolBar *tb = addToolBar( tr("Format Actions","Toolbars"));
+	tb->setObjectName ("formatTB");
     QAction *a;
     QPixmap pix( 16,16);
     pix.fill (Qt::black);
@@ -990,6 +991,7 @@
 {
     QToolBar *tb = addToolBar( tr("View Actions","Toolbars") );
     tb->setLabel( "View Actions" );
+	tb->setObjectName ("viewTB");
     QMenu *viewMenu = menuBar()->addMenu ( tr( "&View" ));
 
     QAction *a;
@@ -1056,6 +1058,7 @@
     //menuBar()->insertItem( tr( "&Mode (using modifiers)" ), menu );
 
     QToolBar *tb = addToolBar( tr ("Modes when using modifiers","Toolbars") );
+	tb->setObjectName ("modesTB");
     QAction *a;
 	actionGroupModModes=new QActionGroup ( this);
 	actionGroupModModes->setExclusive (true);
@@ -1123,13 +1126,12 @@
 
 	// Create Standard Flags
 	QToolBar *tb=addToolBar (tr ("Standard Flags","Standard Flag Toolbar"));
-	//FIXMEtoolbars.add (tb);
+	tb->setObjectName ("standardFlagTB");
 
 	standardFlagsDefault = new FlagRowObj ();
 	standardFlagsDefault->setVisibility (false);
 	standardFlagsDefault->setName ("standardFlagsDef");
 	standardFlagsDefault->setToolBar (tb);
-	tb->setObjectName ("standardFlagTB");
 
 	fo->load(QPixmap(flagsPath+"flag-exclamationmark.png"));
 	fo->setName ("exclamationmark");
@@ -1441,13 +1443,6 @@
 	settingsMenu->addAction (a);
 	actionSettingsAutoselectText=a;
 	
-    a= new QAction(tr( "pasting into new branch" ), this );
-    a->setStatusTip( tr( "Pasting into new branch" ));
-	a->setToggleAction(true);
-	a->setOn ( settings.value ("/mapeditor/editmode/newHeadingIsEmpty",true).toBool() );
-	settingsMenu->addAction (a);
-	actionSettingsPasteNewHeading=a;
-	
     a= new QAction( tr( "Delete key" ), this);
     a->setStatusTip( tr( "Delete key for deleting branches" ));
 	a->setToggleAction(true);