From db59c7011b02d24eb994e9a1432ffebdddfbafc9 Mon Sep 17 00:00:00 2001 From: Michael Kavanagh Date: Tue, 30 Jul 2019 22:44:03 +0100 Subject: [PATCH] Unify menubar delete action --- eeschema/libedit/menubar_libedit.cpp | 1 + eeschema/menubar.cpp | 5 ++--- pcbnew/menubar_footprint_editor.cpp | 3 ++- pcbnew/menubar_pcb_editor.cpp | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/eeschema/libedit/menubar_libedit.cpp b/eeschema/libedit/menubar_libedit.cpp index bac6514567..4d1dfa875d 100644 --- a/eeschema/libedit/menubar_libedit.cpp +++ b/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(); diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index 03e23f48da..be18973c47 100644 --- a/eeschema/menubar.cpp +++ b/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 ); diff --git a/pcbnew/menubar_footprint_editor.cpp b/pcbnew/menubar_footprint_editor.cpp index d60499e86c..b33509a478 100644 --- a/pcbnew/menubar_footprint_editor.cpp +++ b/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 ); diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp index f0c690c721..ab77405a40 100644 --- a/pcbnew/menubar_pcb_editor.cpp +++ b/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 );