From fbc4abc55ae2883549695b60a531c33725b4725e Mon Sep 17 00:00:00 2001 From: Mark Roszko Date: Wed, 8 Oct 2014 02:26:26 -0400 Subject: [PATCH] Update module to footprint in the little info bar at bottom of window Fix text in Get and Move Footprint Dialog Fix right click in board editor options --- pcbnew/class_module.cpp | 2 +- pcbnew/modules.cpp | 2 +- pcbnew/onrightclick.cpp | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pcbnew/class_module.cpp b/pcbnew/class_module.cpp index 6c9d860b9a..7bf8af178f 100644 --- a/pcbnew/class_module.cpp +++ b/pcbnew/class_module.cpp @@ -602,7 +602,7 @@ void MODULE::GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) } aList.push_back( MSG_PANEL_ITEM( _( "Attrib" ), msg, BROWN ) ); - aList.push_back( MSG_PANEL_ITEM( _( "Module" ), FROM_UTF8( m_fpid.Format().c_str() ), BLUE ) ); + aList.push_back( MSG_PANEL_ITEM( _( "Footprint" ), FROM_UTF8( m_fpid.Format().c_str() ), BLUE ) ); msg = _( "No 3D shape" ); // Search the first active 3D shape in list diff --git a/pcbnew/modules.cpp b/pcbnew/modules.cpp index 0f55e5155f..0c6efb96e6 100644 --- a/pcbnew/modules.cpp +++ b/pcbnew/modules.cpp @@ -64,7 +64,7 @@ MODULE* PCB_BASE_FRAME::GetModuleByName() wxString moduleName; MODULE* module = NULL; - wxTextEntryDialog dlg( this, _( "Name:" ), _( "Search footprint" ), moduleName ); + wxTextEntryDialog dlg( this, _( "Reference:" ), _( "Search for footprint" ), moduleName ); if( dlg.ShowModal() != wxID_OK ) return NULL; //Aborted by user diff --git a/pcbnew/onrightclick.cpp b/pcbnew/onrightclick.cpp index 91b1b7cbc5..bafbffe37f 100644 --- a/pcbnew/onrightclick.cpp +++ b/pcbnew/onrightclick.cpp @@ -153,14 +153,14 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu ) if( !( (MODULE*) item )->IsLocked() ) { - msg = AddHotkeyName( _("Lock Module" ), g_Board_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Lock Footprint" ), g_Board_Editor_Hokeys_Descr, HK_LOCK_UNLOCK_FOOTPRINT ); AddMenuItem( aPopMenu, ID_POPUP_PCB_AUTOPLACE_FIXE_MODULE, msg, KiBitmap( locked_xpm ) ); } else { - msg = AddHotkeyName( _( "Unlock Module" ), g_Board_Editor_Hokeys_Descr, + msg = AddHotkeyName( _( "Unlock Footprint" ), g_Board_Editor_Hokeys_Descr, HK_LOCK_UNLOCK_FOOTPRINT ); AddMenuItem( aPopMenu, ID_POPUP_PCB_AUTOPLACE_FREE_MODULE, msg, KiBitmap( unlocked_xpm ) ); @@ -168,14 +168,14 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu ) if( !flags ) aPopMenu->Append( ID_POPUP_PCB_AUTOPLACE_CURRENT_MODULE, - _( "Automatically Place Module" ) ); + _( "Automatically Place Footprint" ) ); } if( m_mainToolBar->GetToolToggled( ID_TOOLBARH_PCB_MODE_TRACKS ) ) { if( !flags ) aPopMenu->Append( ID_POPUP_PCB_AUTOROUTE_MODULE, - _( "Automatically Route Module" ) ); + _( "Automatically Route Footprint" ) ); } break; @@ -413,7 +413,7 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu ) _( "Select Layer Pair" ), KiBitmap( select_layer_pair_xpm ) ); commands->AppendSeparator(); commands->Append( ID_POPUP_PCB_AUTOROUTE_ALL_MODULES, - _( "Automatically Route All Modules" ) ); + _( "Automatically Route All Footprints" ) ); commands->AppendSeparator(); commands->Append( ID_POPUP_PCB_AUTOROUTE_RESET_UNROUTED, _( "Reset Unrouted" ) ); aPopMenu->AppendSeparator(); @@ -758,10 +758,10 @@ void PCB_EDIT_FRAME::createPopUpMenuForFootprints( MODULE* aModule, wxMenu* menu AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_EDIT_MODULE_PRMS, msg, KiBitmap( edit_module_xpm ) ); AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_EDIT_MODULE_WITH_MODEDIT, - _( "Edit with Module Editor" ), + _( "Edit with Footprint Editor" ), KiBitmap( module_editor_xpm ) ); sub_menu_footprint->AppendSeparator(); - msg = AddHotkeyName( _( "Delete Module" ), + msg = AddHotkeyName( _( "Delete Footprint" ), g_Board_Editor_Hokeys_Descr, HK_DELETE ); AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_DELETE_MODULE, msg, KiBitmap( delete_module_xpm ) );