Rename module to footprint in menu,toolbars, window, etc that are in code (08f00517) · Commits · Elphel / kicad-source-mirror

pcbnew/footprint_wizard_frame.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

pcbnew/loadcmp.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 );

pcbnew/menubar_modedit.cpp

+15 −15

Original line number	Diff line number	Diff line
		@@ -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

pcbnew/menubar_pcbframe.cpp

+9 −9

Original line number	Diff line number	Diff line
		@@ -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 );

pcbnew/modedit_onclick.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -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<TEXTE_MODULE*>( 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 ) );

Admin message