Unify menubar delete action

eeschema/libedit/menubar_libedit.cpp

@@ -107,6 +107,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
     editMenu->AddItem( ACTIONS::cut,                 EE_CONDITIONS::NotEmpty );
     editMenu->AddItem( ACTIONS::copy,                EE_CONDITIONS::NotEmpty );
     editMenu->AddItem( ACTIONS::paste,               EE_CONDITIONS::Idle );
+    editMenu->AddItem( ACTIONS::doDelete,            EE_CONDITIONS::NotEmpty );
     editMenu->AddItem( ACTIONS::duplicate,           EE_CONDITIONS::NotEmpty );
 
     editMenu->AddSeparator();

eeschema/menubar.cpp

@@ -137,16 +137,15 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
     editMenu->AddItem( ACTIONS::cut,                        EE_CONDITIONS::NotEmpty );
     editMenu->AddItem( ACTIONS::copy,                       EE_CONDITIONS::NotEmpty );
     editMenu->AddItem( ACTIONS::paste,                      EE_CONDITIONS::Idle );
+    editMenu->AddItem( ACTIONS::doDelete,                   EE_CONDITIONS::NotEmpty );
     editMenu->AddItem( ACTIONS::duplicate,                  EE_CONDITIONS::NotEmpty );
 
-    editMenu->AddSeparator();
-    editMenu->AddItem( EE_ACTIONS::deleteTool,              EE_CONDITIONS::ShowAlways );
-
     editMenu->AddSeparator();
     editMenu->AddItem( ACTIONS::find,                       EE_CONDITIONS::ShowAlways );
     editMenu->AddItem( ACTIONS::findAndReplace,             EE_CONDITIONS::ShowAlways );
 
     editMenu->AddSeparator();
+    editMenu->AddItem( EE_ACTIONS::deleteTool,              EE_CONDITIONS::ShowAlways );
     editMenu->AddItem( EE_ACTIONS::editTextAndGraphics,     EE_CONDITIONS::ShowAlways );
     editMenu->AddItem( EE_ACTIONS::updateFieldsFromLibrary, EE_CONDITIONS::ShowAlways );
 

pcbnew/menubar_footprint_editor.cpp

@@ -131,7 +131,8 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
     editMenu->AddItem( ACTIONS::cut,                      SELECTION_CONDITIONS::NotEmpty );
     editMenu->AddItem( ACTIONS::copy,                     SELECTION_CONDITIONS::NotEmpty );
     editMenu->AddItem( ACTIONS::paste,                    noActiveToolCondition );
-    editMenu->AddItem( PCB_ACTIONS::deleteFootprint,      footprintTargettedCondition );
+    editMenu->AddItem( ACTIONS::doDelete,                 SELECTION_CONDITIONS::NotEmpty );
+    editMenu->AddItem( ACTIONS::duplicate,                SELECTION_CONDITIONS::NotEmpty );
 
     editMenu->AddSeparator();
     editMenu->AddItem( PCB_ACTIONS::footprintProperties,  haveFootprintCondition );

pcbnew/menubar_pcb_editor.cpp

@@ -218,9 +218,8 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
     editMenu->AddItem( ACTIONS::cut,                        SELECTION_CONDITIONS::NotEmpty );
     editMenu->AddItem( ACTIONS::copy,                       SELECTION_CONDITIONS::NotEmpty );
     editMenu->AddItem( ACTIONS::paste,                      noActiveToolCondition );
-
-    editMenu->AddSeparator();
-    editMenu->AddItem( PCB_ACTIONS::deleteTool,             SELECTION_CONDITIONS::ShowAlways );
+    editMenu->AddItem( ACTIONS::doDelete,                   SELECTION_CONDITIONS::NotEmpty );
+    editMenu->AddItem( ACTIONS::duplicate,                  SELECTION_CONDITIONS::NotEmpty );
 
     editMenu->AddSeparator();
     editMenu->AddItem( ACTIONS::find,                       SELECTION_CONDITIONS::ShowAlways );
@@ -236,6 +235,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
     editMenu->AddItem( PCB_ACTIONS::zoneUnfillAll,          SELECTION_CONDITIONS::ShowAlways );
 
     editMenu->AddSeparator();
+    editMenu->AddItem( PCB_ACTIONS::deleteTool,             SELECTION_CONDITIONS::ShowAlways );
     editMenu->AddItem( PCB_ACTIONS::globalDeletions,        SELECTION_CONDITIONS::ShowAlways );
     editMenu->AddItem( PCB_ACTIONS::cleanupTracksAndVias,   SELECTION_CONDITIONS::ShowAlways );