From f301b196ab5cac6beb07b35b4b6d355db3cce849 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 31 Aug 2012 21:19:48 +0200 Subject: [PATCH] Modedit: very minor enhancements. --- pcbnew/menubar_modedit.cpp | 9 +++++++-- pcbnew/modedit.cpp | 15 +++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/pcbnew/menubar_modedit.cpp b/pcbnew/menubar_modedit.cpp index 731a584390..712a494482 100644 --- a/pcbnew/menubar_modedit.cpp +++ b/pcbnew/menubar_modedit.cpp @@ -59,6 +59,12 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() // Menu File: wxMenu* fileMenu = new wxMenu; + // Active library selection + AddMenuItem( fileMenu, ID_MODEDIT_SELECT_CURRENT_LIB, _("Current Library"), + _( "Select active library" ), + KiBitmap( open_library_xpm ) ); + fileMenu->AppendSeparator(); + // New module AddMenuItem( fileMenu, ID_MODEDIT_NEW_MODULE, _( "&New Module" ), _( "Create new module" ), @@ -90,6 +96,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() _( "&Load Module" ), _( "Load a footprint module" ), KiBitmap( open_document_xpm ) ); + fileMenu->AppendSeparator(); // Save module AddMenuItem( fileMenu, ID_MODEDIT_SAVE_LIBMODULE, @@ -108,8 +115,6 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() _( "&Export Module" ), _( "Save the current loaded module to a file" ), KiBitmap( export_module_xpm ) ); - - // Separator fileMenu->AppendSeparator(); // Print diff --git a/pcbnew/modedit.cpp b/pcbnew/modedit.cpp index 78272ccc1d..2dc3a7ede8 100644 --- a/pcbnew/modedit.cpp +++ b/pcbnew/modedit.cpp @@ -195,6 +195,9 @@ void FOOTPRINT_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) case ID_POPUP_MODEDIT_EDIT_LAYER_CURRENT_EDGE: case ID_POPUP_MODEDIT_EDIT_LAYER_ALL_EDGE: case ID_POPUP_MODEDIT_ENTER_EDGE_WIDTH: + case ID_POPUP_PCB_DELETE_EDGE: + case ID_POPUP_PCB_DELETE_TEXTMODULE: + case ID_POPUP_PCB_DELETE_PAD: case ID_POPUP_DELETE_BLOCK: case ID_POPUP_PLACE_BLOCK: case ID_POPUP_ZOOM_BLOCK: @@ -285,7 +288,7 @@ void FOOTPRINT_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) } break; } - + case ID_MODEDIT_NEW_MODULE_FROM_WIZARD: { Clear_Pcb( true ); @@ -293,12 +296,12 @@ void FOOTPRINT_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) SetCurItem( NULL ); GetScreen()->SetCrossHairPosition( wxPoint( 0, 0 ) ); - + wxSemaphore semaphore( 0, 1 ); FOOTPRINT_WIZARD_FRAME *wizard = new FOOTPRINT_WIZARD_FRAME( this, &semaphore ); wizard->Show( true ); wizard->Zoom_Automatique( false ); - + while( semaphore.TryWait() == wxSEMA_BUSY ) // Wait for viewer closing event { wxYield(); @@ -306,7 +309,7 @@ void FOOTPRINT_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) } MODULE* module = wizard->GetBuiltFootprint(); - + if( module ) // i.e. if create module command not aborted { /* Here we should make a copy of the object before adding to board*/ @@ -322,8 +325,8 @@ void FOOTPRINT_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) if( GetBoard()->m_Modules ) GetBoard()->m_Modules->ClearFlags(); - - + + } wizard->Destroy();