From 08f00517996028362c59f5d3c60a4de75a009e3e Mon Sep 17 00:00:00 2001 From: Mark Roszko Date: Wed, 8 Oct 2014 01:50:56 -0400 Subject: [PATCH 1/4] Rename module to footprint in menu,toolbars, window, etc that are in code --- pcbnew/footprint_wizard_frame.cpp | 2 +- pcbnew/loadcmp.cpp | 2 +- pcbnew/menubar_modedit.cpp | 30 +++++++++++++++--------------- pcbnew/menubar_pcbframe.cpp | 18 +++++++++--------- pcbnew/modedit_onclick.cpp | 12 ++++++------ pcbnew/moduleframe.cpp | 8 ++++---- pcbnew/modules.cpp | 2 +- pcbnew/tool_modedit.cpp | 30 +++++++++++++++--------------- pcbnew/tool_pcb.cpp | 6 +++--- 9 files changed, 55 insertions(+), 55 deletions(-) diff --git a/pcbnew/footprint_wizard_frame.cpp b/pcbnew/footprint_wizard_frame.cpp index 1ae891a257..69d2863aca 100644 --- a/pcbnew/footprint_wizard_frame.cpp +++ b/pcbnew/footprint_wizard_frame.cpp @@ -620,7 +620,7 @@ void FOOTPRINT_WIZARD_FRAME::ReCreateHToolbar() m_mainToolBar->AddSeparator(); m_mainToolBar->AddTool( ID_FOOTPRINT_WIZARD_DONE, wxEmptyString, KiBitmap( export_footprint_names_xpm ), - _( "Insert footprint in board" ) ); + _( "Add footprint to board" ) ); } // after adding the buttons to the toolbar, must call Realize() to diff --git a/pcbnew/loadcmp.cpp b/pcbnew/loadcmp.cpp index cc740ba166..92ce88082a 100644 --- a/pcbnew/loadcmp.cpp +++ b/pcbnew/loadcmp.cpp @@ -164,7 +164,7 @@ MODULE* PCB_BASE_FRAME::LoadModuleFromLibrary( const wxString& aLibrary, static wxString lastComponentName; // Ask for a component name or key words - DIALOG_GET_COMPONENT dlg( this, HistoryList, _( "Load Module" ), aUseFootprintViewer ); + DIALOG_GET_COMPONENT dlg( this, HistoryList, _( "Load Footprint" ), aUseFootprintViewer ); dlg.SetComponentName( lastComponentName ); diff --git a/pcbnew/menubar_modedit.cpp b/pcbnew/menubar_modedit.cpp index 418cc5c342..fc73ba49b0 100644 --- a/pcbnew/menubar_modedit.cpp +++ b/pcbnew/menubar_modedit.cpp @@ -69,7 +69,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() // New module AddMenuItem( fileMenu, ID_MODEDIT_NEW_MODULE, - _( "&New Module" ), _( "Create new module" ), + _( "&New Footprint" ), _( "Create new footprint" ), KiBitmap( new_footprint_xpm ) ); // Open submenu @@ -77,26 +77,26 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() // from File AddMenuItem( openSubmenu, ID_MODEDIT_IMPORT_PART, - _( "&Import Module From File" ), + _( "&Import Footprint From File" ), _( "Import footprint from an existing file" ), KiBitmap( import_module_xpm ) ); // from Library AddMenuItem( openSubmenu, ID_MODEDIT_LOAD_MODULE, - _( "Load Module From Current Li&brary" ), - _( "Open a footprint module from library" ), + _( "Load Footprint From Current Li&brary" ), + _( "Open a footprint from library" ), KiBitmap( module_xpm ) ); // from current Board AddMenuItem( openSubmenu, ID_MODEDIT_LOAD_MODULE_FROM_BOARD, - _( "Load Module From &Current Board" ), - _( "Load a footprint module from the current board" ), + _( "Load Footprint From &Current Board" ), + _( "Load a footprint from the current board" ), KiBitmap( load_module_board_xpm ) ); /* Append openSubmenu to fileMenu */ AddMenuItem( fileMenu, openSubmenu, -1, - _( "&Load Module" ), - _( "Load footprint module" ), + _( "&Load Footprint" ), + _( "Load footprint" ), KiBitmap( open_document_xpm ) ); fileMenu->AppendSeparator(); @@ -107,23 +107,23 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() KiBitmap( copy_library_xpm ) ); // Save module - text = AddHotkeyName( _( "&Save Module in Active Library" ), + text = AddHotkeyName( _( "&Save Footprint in Active Library" ), g_Module_Editor_Hokeys_Descr, HK_SAVE_MODULE ); AddMenuItem( fileMenu, ID_MODEDIT_SAVE_LIBMODULE, text, - _( "Save module in active library" ), + _( "Save footprint in active library" ), KiBitmap( save_library_xpm ) ); // Save module in new lib AddMenuItem( fileMenu, ID_MODEDIT_CREATE_NEW_LIB_AND_SAVE_CURRENT_PART, - _( "S&ave Module in New Library" ), + _( "S&ave Footprint in New Library" ), _( "Create a new library and save current module into it" ), KiBitmap( new_library_xpm ) ); // Export module AddMenuItem( fileMenu, ID_MODEDIT_EXPORT_PART, - _( "&Export Module" ), - _( "Save current loaded module into file" ), + _( "&Export Footprint" ), + _( "Save currently loaded footprint into file" ), KiBitmap( export_module_xpm ) ); // Import DXF File @@ -137,7 +137,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() // Print AddMenuItem( fileMenu, wxID_PRINT, _( "&Print" ), - _( "Print current module" ), + _( "Print current footprint" ), KiBitmap( plot_xpm ) ); // Separator @@ -175,7 +175,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() // Properties AddMenuItem( editMenu, ID_MODEDIT_EDIT_MODULE_PROPERTIES, _( "Edit &Properties" ), - _( "Edit module properties" ), + _( "Edit footprint properties" ), KiBitmap( module_options_xpm ) ); // Dimensions submenu diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp index 9f1e6777b1..76c67252c0 100644 --- a/pcbnew/menubar_pcbframe.cpp +++ b/pcbnew/menubar_pcbframe.cpp @@ -134,8 +134,8 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() //----- Fabrication Outputs submenu ----------------------------------------- wxMenu* fabricationOutputsMenu = new wxMenu; AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_POS_MODULES_FILE, - _( "&Modules Position (.pos) File" ), - _( "Generate modules position file for pick and place" ), + _( "&Footprint Position (.pos) File" ), + _( "Generate footprint position file for pick and place" ), KiBitmap( post_compo_xpm ) ); AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_DRILL_FILE, @@ -144,8 +144,8 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() KiBitmap( post_drill_xpm ) ); AddMenuItem( fabricationOutputsMenu, ID_GEN_EXPORT_FILE_MODULE_REPORT, - _( "&Module (.rpt) Report" ), - _( "Create a report of all modules on the current board" ), + _( "&Footprint (.rpt) Report" ), + _( "Create a report of all footprints on the current board" ), KiBitmap( tools_xpm ) ); AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_D356_FILE, @@ -279,7 +279,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() AddMenuItem( editMenu, ID_PCB_GLOBAL_DELETE, _( "&Global Deletions" ), - _( "Delete tracks, modules, texts... on board" ), + _( "Delete tracks, footprints, texts... on board" ), KiBitmap( general_deletions_xpm ) ); AddMenuItem( editMenu, ID_MENU_PCB_CLEAN, @@ -293,8 +293,8 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() KiBitmap( swap_layer_xpm ) ); AddMenuItem( editMenu, ID_MENU_PCB_RESET_TEXTMODULE_FIELDS_SIZES, - _( "&Reset Module Field Sizes" ), - _( "Reset text size and width of all module fields to current defaults" ), + _( "&Reset Footprint Field Sizes" ), + _( "Reset text size and width of all footprint fields to current defaults" ), KiBitmap( reset_text_xpm ) ); //----- View menu ----------------------------------------------------------- @@ -365,10 +365,10 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() //----- Place Menu ---------------------------------------------------------- wxMenu* placeMenu = new wxMenu; - text = AddHotkeyName( _( "&Module" ), g_Pcbnew_Editor_Hokeys_Descr, + text = AddHotkeyName( _( "&Footprint" ), g_Pcbnew_Editor_Hokeys_Descr, HK_ADD_MODULE ); AddMenuItem( placeMenu, ID_PCB_MODULE_BUTT, text, - _( "Add modules" ), KiBitmap( module_xpm ) ); + _( "Add footprints" ), KiBitmap( module_xpm ) ); text = AddHotkeyName( _( "&Track" ), g_Pcbnew_Editor_Hokeys_Descr, HK_ADD_NEW_TRACK, IS_COMMENT ); diff --git a/pcbnew/modedit_onclick.cpp b/pcbnew/modedit_onclick.cpp index 70374ca976..a6b2e0d6f7 100644 --- a/pcbnew/modedit_onclick.cpp +++ b/pcbnew/modedit_onclick.cpp @@ -262,10 +262,10 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen KiBitmap( rotate_module_ccw_xpm ) ); AddMenuItem( transform_choice, ID_MODEDIT_MODULE_MIRROR, _( "Mirror" ), KiBitmap( mirror_footprint_axisY_xpm ) ); - msg = AddHotkeyName( _( "Edit Module" ), g_Module_Editor_Hokeys_Descr, HK_EDIT_ITEM ); + msg = AddHotkeyName( _( "Edit Footprint" ), g_Module_Editor_Hokeys_Descr, HK_EDIT_ITEM ); AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_MODULE_PRMS, msg, KiBitmap( edit_module_xpm ) ); AddMenuItem( PopMenu, transform_choice, ID_MODEDIT_TRANSFORM_MODULE, - _( "Transform Module" ), KiBitmap( edit_xpm ) ); + _( "Transform Footprint" ), KiBitmap( edit_xpm ) ); break; } @@ -297,25 +297,25 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen case PCB_MODULE_TEXT_T: if( !flags ) { - msg = AddHotkeyName( _("Move Text Mod." ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Move Text" ), g_Module_Editor_Hokeys_Descr, HK_MOVE_ITEM ); AddMenuItem( PopMenu, ID_POPUP_PCB_MOVE_TEXTMODULE_REQUEST, msg, KiBitmap( move_field_xpm ) ); } - msg = AddHotkeyName( _("Rotate Text Mod." ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Rotate Text" ), g_Module_Editor_Hokeys_Descr, HK_ROTATE_ITEM ); AddMenuItem( PopMenu, ID_POPUP_PCB_ROTATE_TEXTMODULE, msg, KiBitmap( rotate_field_xpm ) ); if( !flags ) { - msg = AddHotkeyName( _("Edit Text Mod." ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Edit Text" ), g_Module_Editor_Hokeys_Descr, HK_EDIT_ITEM ); AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_TEXTMODULE, msg, KiBitmap( edit_text_xpm ) ); if( ( static_cast( item ) )->GetType() == TEXTE_MODULE::TEXT_is_DIVERS ) { - msg = AddHotkeyName( _("Delete Text Mod." ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Delete Text" ), g_Module_Editor_Hokeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_PCB_DELETE_TEXTMODULE, msg, KiBitmap( delete_text_xpm ) ); diff --git a/pcbnew/moduleframe.cpp b/pcbnew/moduleframe.cpp index bae419949c..bd05f70a8a 100644 --- a/pcbnew/moduleframe.cpp +++ b/pcbnew/moduleframe.cpp @@ -461,7 +461,7 @@ void FOOTPRINT_EDIT_FRAME::OnCloseWindow( wxCloseEvent& Event ) { if( GetScreen()->IsModify() ) { - int ii = DisplayExitDialog( this, _( "Save the changes in the module before closing?" ) ); + int ii = DisplayExitDialog( this, _( "Save the changes to the footprint before closing?" ) ); switch( ii ) { @@ -482,7 +482,7 @@ void FOOTPRINT_EDIT_FRAME::OnCloseWindow( wxCloseEvent& Event ) } else { - DisplayError( this, _( "Library is not set, the module could not be saved." ) ); + DisplayError( this, _( "Library is not set, the footprint could not be saved." ) ); } // fall through: cancel the close because of an error @@ -672,7 +672,7 @@ void FOOTPRINT_EDIT_FRAME::OnModify() void FOOTPRINT_EDIT_FRAME::updateTitle() { - wxString title = _( "Module Editor " ); + wxString title = _( "Footprint Editor " ); wxString nickname = GetCurrentLib(); @@ -688,7 +688,7 @@ void FOOTPRINT_EDIT_FRAME::updateTitle() bool writable = Prj().PcbFootprintLibs()->IsFootprintLibWritable( nickname ); // no exception was thrown, this means libPath is valid, but it may be read only. - title = _( "Module Editor (active library: " ) + nickname + wxT( ")" ); + title = _( "Footprint Editor (active library: " ) + nickname + wxT( ")" ); if( !writable ) title += _( " [Read Only]" ); diff --git a/pcbnew/modules.cpp b/pcbnew/modules.cpp index 60139f5761..0f55e5155f 100644 --- a/pcbnew/modules.cpp +++ b/pcbnew/modules.cpp @@ -262,7 +262,7 @@ bool PCB_EDIT_FRAME::Delete_Module( MODULE* aModule, wxDC* aDC, bool aAskBeforeD /* Confirm module delete. */ if( aAskBeforeDeleting ) { - msg.Printf( _( "Delete Module %s (value %s) ?" ), + msg.Printf( _( "Delete Footprint %s (value %s) ?" ), GetChars( aModule->GetReference() ), GetChars( aModule->GetValue() ) ); diff --git a/pcbnew/tool_modedit.cpp b/pcbnew/tool_modedit.cpp index d4fe6c2351..d5eac2b874 100644 --- a/pcbnew/tool_modedit.cpp +++ b/pcbnew/tool_modedit.cpp @@ -61,14 +61,14 @@ void FOOTPRINT_EDIT_FRAME::ReCreateHToolbar() _( "Select active library" ) ); m_mainToolBar->AddTool( ID_MODEDIT_SAVE_LIBMODULE, wxEmptyString, KiBitmap( save_library_xpm ), - _( "Save module in active library" ) ); + _( "Save footprint in active library" ) ); m_mainToolBar->AddTool( ID_MODEDIT_CREATE_NEW_LIB_AND_SAVE_CURRENT_PART, wxEmptyString, KiBitmap( new_library_xpm ), - _( "Create new library and save current module" ) ); + _( "Create new library and save current footprint" ) ); m_mainToolBar->AddTool( ID_OPEN_MODULE_VIEWER, wxEmptyString, KiBitmap( modview_icon_xpm ), - _( "Open module viewer" ) ); + _( "Open footprint viewer" ) ); m_mainToolBar->AddSeparator(); m_mainToolBar->AddTool( ID_MODEDIT_DELETE_PART, wxEmptyString, KiBitmap( delete_xpm ), @@ -76,38 +76,38 @@ void FOOTPRINT_EDIT_FRAME::ReCreateHToolbar() m_mainToolBar->AddSeparator(); m_mainToolBar->AddTool( ID_MODEDIT_NEW_MODULE, wxEmptyString, KiBitmap( new_footprint_xpm ), - _( "New module" ) ); + _( "New footprint" ) ); #ifdef KICAD_SCRIPTING m_mainToolBar->AddTool( ID_MODEDIT_NEW_MODULE_FROM_WIZARD, wxEmptyString, KiBitmap( module_wizard_xpm ), - _( "New module from footprint wizard" ) ); + _( "New footprint using wizard" ) ); #endif m_mainToolBar->AddTool( ID_MODEDIT_LOAD_MODULE, wxEmptyString, KiBitmap( load_module_lib_xpm ), - _( "Load module from library" ) ); + _( "Load footprint from library" ) ); m_mainToolBar->AddSeparator(); m_mainToolBar->AddTool( ID_MODEDIT_LOAD_MODULE_FROM_BOARD, wxEmptyString, KiBitmap( load_module_board_xpm ), - _( "Load module from current board" ) ); + _( "Load footprint from current board" ) ); m_mainToolBar->AddTool( ID_MODEDIT_UPDATE_MODULE_IN_BOARD, wxEmptyString, KiBitmap( update_module_board_xpm ), - _( "Update module in current board" ) ); + _( "Update footprint in current board" ) ); m_mainToolBar->AddTool( ID_MODEDIT_INSERT_MODULE_IN_BOARD, wxEmptyString, KiBitmap( insert_module_board_xpm ), - _( "Insert module into current board" ) ); + _( "Insert footprint into current board" ) ); m_mainToolBar->AddSeparator(); m_mainToolBar->AddTool( ID_MODEDIT_IMPORT_PART, wxEmptyString, KiBitmap( import_module_xpm ), - _( "Import module" ) ); + _( "Import footprint" ) ); m_mainToolBar->AddTool( ID_MODEDIT_EXPORT_PART, wxEmptyString, KiBitmap( export_module_xpm ), - _( "Export module" ) ); + _( "Export footprint" ) ); m_mainToolBar->AddSeparator(); @@ -119,11 +119,11 @@ void FOOTPRINT_EDIT_FRAME::ReCreateHToolbar() m_mainToolBar->AddSeparator(); m_mainToolBar->AddTool( ID_MODEDIT_EDIT_MODULE_PROPERTIES, wxEmptyString, KiBitmap( module_options_xpm ), - _( "Module properties" ) ); + _( "Footprint properties" ) ); m_mainToolBar->AddSeparator(); m_mainToolBar->AddTool( wxID_PRINT, wxEmptyString, KiBitmap( print_button_xpm ), - _( "Print module" ) ); + _( "Print footprint" ) ); m_mainToolBar->AddSeparator(); msg = AddHotkeyName( _( "Zoom in" ), g_Module_Editor_Hokeys_Descr, HK_ZOOM_IN, IS_COMMENT ); @@ -146,7 +146,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateHToolbar() m_mainToolBar->AddSeparator(); m_mainToolBar->AddTool( ID_MODEDIT_CHECK, wxEmptyString, KiBitmap( module_check_xpm ), - _( "Check module" ) ); + _( "Check footprint" ) ); // after adding the buttons to the toolbar, must call Realize() to reflect the changes m_mainToolBar->Realize(); @@ -184,7 +184,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateVToolbar() m_drawToolBar->AddSeparator(); m_drawToolBar->AddTool( ID_MODEDIT_ANCHOR_TOOL, wxEmptyString, KiBitmap( anchor_xpm ), - _( "Place the footprint module reference anchor" ), + _( "Place the footprint reference anchor" ), wxITEM_CHECK ); m_drawToolBar->AddSeparator(); diff --git a/pcbnew/tool_pcb.cpp b/pcbnew/tool_pcb.cpp index 8c11346ada..e9f93716db 100644 --- a/pcbnew/tool_pcb.cpp +++ b/pcbnew/tool_pcb.cpp @@ -237,11 +237,11 @@ void PCB_EDIT_FRAME::ReCreateHToolbar() m_mainToolBar->AddSeparator(); m_mainToolBar->AddTool( ID_OPEN_MODULE_EDITOR, wxEmptyString, KiBitmap( module_editor_xpm ), - _( "Open module editor" ) ); + _( "Open footprint editor" ) ); m_mainToolBar->AddTool( ID_OPEN_MODULE_VIEWER, wxEmptyString, KiBitmap( modview_icon_xpm ), - _( "Open module viewer" ) ); + _( "Open footprint viewer" ) ); m_mainToolBar->AddSeparator(); msg = AddHotkeyName( HELP_UNDO, g_Board_Editor_Hokeys_Descr, HK_UNDO, IS_COMMENT ); @@ -297,7 +297,7 @@ void PCB_EDIT_FRAME::ReCreateHToolbar() m_mainToolBar->AddSeparator(); m_mainToolBar->AddTool( ID_TOOLBARH_PCB_MODE_MODULE, wxEmptyString, KiBitmap( mode_module_xpm ), - _( "Mode footprint: manual and automatic move and place modules" ), + _( "Mode footprint: manual and automatic movement and placement" ), wxITEM_CHECK ); m_mainToolBar->AddTool( ID_TOOLBARH_PCB_MODE_TRACKS, wxEmptyString, KiBitmap( mode_track_xpm ), _( "Mode track: autorouting" ), wxITEM_CHECK ); From bfdc13df61e0fcd807caff7139f15db2ea49f548 Mon Sep 17 00:00:00 2001 From: Mark Roszko Date: Wed, 8 Oct 2014 01:54:52 -0400 Subject: [PATCH 2/4] Update footprint property editor (activated from board editor) to use "Footprint". --- .../dialog_edit_module_for_BoardEditor_base.cpp | 6 +++--- .../dialog_edit_module_for_BoardEditor_base.fbp | 10 +++++----- .../dialogs/dialog_edit_module_for_BoardEditor_base.h | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp index ee0a156d12..ecd0b04eff 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2013) +// C++ code generated with wxFormBuilder (version Jun 6 2014) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -128,10 +128,10 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare m_PropRightSizer = new wxBoxSizer( wxVERTICAL ); - m_buttonExchange = new wxButton( m_PanelProperties, ID_MODULE_PROPERTIES_EXCHANGE, _("Change Module(s)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_buttonExchange = new wxButton( m_PanelProperties, ID_MODULE_PROPERTIES_EXCHANGE, _("Change Footprint(s)"), wxDefaultPosition, wxDefaultSize, 0 ); m_PropRightSizer->Add( m_buttonExchange, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); - m_buttonModuleEditor = new wxButton( m_PanelProperties, ID_GOTO_MODULE_EDITOR, _("Module Editor"), wxDefaultPosition, wxDefaultSize, 0 ); + m_buttonModuleEditor = new wxButton( m_PanelProperties, ID_GOTO_MODULE_EDITOR, _("Footprint Editor"), wxDefaultPosition, wxDefaultSize, 0 ); m_PropRightSizer->Add( m_buttonModuleEditor, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); wxBoxSizer* bSizerAttrib; diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp index 032726aa21..8413a47ab2 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -44,10 +44,10 @@ DIALOG_MODULE_BOARD_EDITOR_BASE - 499,591 + 499,630 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h - Module Properties + Footprint Properties @@ -2000,7 +2000,7 @@ 0 0 ID_MODULE_PROPERTIES_EXCHANGE - Change Module(s) + Change Footprint(s) 0 @@ -2088,7 +2088,7 @@ 0 0 ID_GOTO_MODULE_EDITOR - Module Editor + Footprint Editor 0 diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h index 3a12366e63..335a04ed32 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2013) +// C++ code generated with wxFormBuilder (version Jun 6 2014) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -138,7 +138,7 @@ class DIALOG_MODULE_BOARD_EDITOR_BASE : public DIALOG_SHIM public: wxStaticBoxSizer* m_Sizer3DValues; - DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Module Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 499,591 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 499,630 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_MODULE_BOARD_EDITOR_BASE(); }; From fcbfaac7c971db962ba2b7b9488b7431ca0670de Mon Sep 17 00:00:00 2001 From: Mark Roszko Date: Wed, 8 Oct 2014 01:58:59 -0400 Subject: [PATCH 3/4] Update footprint editor property dialog to use "Footprint" instead of "Module" --- pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp | 2 +- pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp | 6 +++--- pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp index 4431dc3b64..6e404ab13c 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2013) +// C++ code generated with wxFormBuilder (version Jun 6 2014) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp index 098cd0381c..11bfde271e 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -44,10 +44,10 @@ DIALOG_MODULE_MODULE_EDITOR_BASE - 486,462 + 486,510 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h - Module Properties + Footprint Properties diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h index 17e741b5d0..f617580944 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2013) +// C++ code generated with wxFormBuilder (version Jun 6 2014) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -117,7 +117,7 @@ class DIALOG_MODULE_MODULE_EDITOR_BASE : public DIALOG_SHIM public: - DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Module Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 486,462 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 486,510 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_MODULE_MODULE_EDITOR_BASE(); }; From fbc4abc55ae2883549695b60a531c33725b4725e Mon Sep 17 00:00:00 2001 From: Mark Roszko Date: Wed, 8 Oct 2014 02:26:26 -0400 Subject: [PATCH 4/4] 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 ) );