1.1 --- a/mainwindow.cpp	Wed Aug 30 12:16:25 2006 +0000
     1.2 +++ b/mainwindow.cpp	Thu Aug 31 11:55:33 2006 +0000
     1.3 @@ -122,7 +122,6 @@
     1.4  extern QAction* actionSettingsAutoselectHeading;
     1.5  extern QAction* actionSettingsAutoselectHeading;
     1.6  extern QAction* actionSettingsAutoselectText;
     1.7 -extern QAction* actionSettingsPasteNewHeading;
     1.8  extern QAction* actionSettingsUseDelKey;
     1.9  extern QAction* actionSettingsUseFlagGroups;
    1.10  extern QAction* actionSettingsUseHideExport;
    1.11 @@ -263,7 +262,6 @@
    1.12  
    1.13  	settings.setValue( "/mapeditor/editmode/autoSelectHeading",actionSettingsAutoselectHeading->isOn() );
    1.14  	settings.setValue( "/mapeditor/editmode/autoSelectText",actionSettingsAutoselectText->isOn() );
    1.15 -	settings.setValue( "/mapeditor/editmode/pasteNewHeading",actionSettingsPasteNewHeading->isOn() );
    1.16  	settings.setValue( "/mapeditor/editmode/autoEdit",actionSettingsAutoedit->isOn() );
    1.17  	settings.setValue( "/mapeditor/editmode/useDelKey",actionSettingsUseDelKey->isOn() );
    1.18  	settings.setValue( "/mapeditor/editmode/useFlagGroups",actionSettingsUseFlagGroups->isOn() );
    1.19 @@ -321,6 +319,7 @@
    1.20  {
    1.21  	QMenu *fileMenu = menuBar()->addMenu ( tr ("&Map") );
    1.22      QToolBar *tb = addToolBar( tr ("&Map") );
    1.23 +	tb->setObjectName ("mapTB");
    1.24  
    1.25      QAction *a;
    1.26      a = new QAction(QPixmap( iconPath+"filenew.png"), tr( "&New..." ),this);
    1.27 @@ -452,6 +451,7 @@
    1.28  {
    1.29      QToolBar *tb = addToolBar( tr ("&Actions") );
    1.30      tb->setLabel( "Edit Actions" );
    1.31 +	tb->setObjectName ("actionsTB");
    1.32      QMenu *editMenu = menuBar()->addMenu( tr("&Edit") );
    1.33  
    1.34      QAction *a;
    1.35 @@ -864,6 +864,7 @@
    1.36      QMenu *formatMenu = menuBar()->addMenu (tr ("F&ormat"));
    1.37  
    1.38      QToolBar *tb = addToolBar( tr("Format Actions","Toolbars"));
    1.39 +	tb->setObjectName ("formatTB");
    1.40      QAction *a;
    1.41      QPixmap pix( 16,16);
    1.42      pix.fill (Qt::black);
    1.43 @@ -990,6 +991,7 @@
    1.44  {
    1.45      QToolBar *tb = addToolBar( tr("View Actions","Toolbars") );
    1.46      tb->setLabel( "View Actions" );
    1.47 +	tb->setObjectName ("viewTB");
    1.48      QMenu *viewMenu = menuBar()->addMenu ( tr( "&View" ));
    1.49  
    1.50      QAction *a;
    1.51 @@ -1056,6 +1058,7 @@
    1.52      //menuBar()->insertItem( tr( "&Mode (using modifiers)" ), menu );
    1.53  
    1.54      QToolBar *tb = addToolBar( tr ("Modes when using modifiers","Toolbars") );
    1.55 +	tb->setObjectName ("modesTB");
    1.56      QAction *a;
    1.57  	actionGroupModModes=new QActionGroup ( this);
    1.58  	actionGroupModModes->setExclusive (true);
    1.59 @@ -1123,13 +1126,12 @@
    1.60  
    1.61  	// Create Standard Flags
    1.62  	QToolBar *tb=addToolBar (tr ("Standard Flags","Standard Flag Toolbar"));
    1.63 -	//FIXMEtoolbars.add (tb);
    1.64 +	tb->setObjectName ("standardFlagTB");
    1.65  
    1.66  	standardFlagsDefault = new FlagRowObj ();
    1.67  	standardFlagsDefault->setVisibility (false);
    1.68  	standardFlagsDefault->setName ("standardFlagsDef");
    1.69  	standardFlagsDefault->setToolBar (tb);
    1.70 -	tb->setObjectName ("standardFlagTB");
    1.71  
    1.72  	fo->load(QPixmap(flagsPath+"flag-exclamationmark.png"));
    1.73  	fo->setName ("exclamationmark");
    1.74 @@ -1441,13 +1443,6 @@
    1.75  	settingsMenu->addAction (a);
    1.76  	actionSettingsAutoselectText=a;
    1.77  	
    1.78 -    a= new QAction(tr( "pasting into new branch" ), this );
    1.79 -    a->setStatusTip( tr( "Pasting into new branch" ));
    1.80 -	a->setToggleAction(true);
    1.81 -	a->setOn ( settings.value ("/mapeditor/editmode/newHeadingIsEmpty",true).toBool() );
    1.82 -	settingsMenu->addAction (a);
    1.83 -	actionSettingsPasteNewHeading=a;
    1.84 -	
    1.85      a= new QAction( tr( "Delete key" ), this);
    1.86      a->setStatusTip( tr( "Delete key for deleting branches" ));
    1.87  	a->setToggleAction(true);