diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index 7529542521..9df8ba8beb 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -420,6 +420,10 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) _( "Export drawings to clipboard" ), KiBitmap( copy_xpm ) ); + AddMenuItem( aParentMenu, ID_GET_NETLIST, _( "Export &Netlist..." ), + _( "Export netlist file" ), + KiBitmap( netlist_xpm ) ); + AddMenuItem( aParentMenu, submenuExport, ID_GEN_EXPORT_FILE, _( "E&xport" ), _( "Export files" ), KiBitmap( export_xpm ) ); @@ -525,7 +529,7 @@ void prepareToolsMenu( wxMenu* aParentMenu ) AddMenuItem( aParentMenu, ID_UPDATE_PCB_FROM_SCH, - text, _( "Updates PCB design with current schematic (forward annotation)." ), + text, _( "Update PCB design with current schematic." ), KiBitmap( update_pcb_from_sch_xpm ) ); // Run Pcbnew @@ -563,17 +567,7 @@ void prepareToolsMenu( wxMenu* aParentMenu ) HELP_ANNOTATE, KiBitmap( annotate_xpm ) ); - AddMenuItem( aParentMenu, ID_GET_NETLIST, _( "Generate &Netlist File..." ), - _( "Generate netlist file" ), - KiBitmap( netlist_xpm ) ); - - AddMenuItem( aParentMenu, ID_GET_TOOLS, _( "Generate Bill of &Materials..." ), - HELP_GENERATE_BOM, - KiBitmap( bom_xpm ) ); - - AddMenuItem( aParentMenu, - ID_BUS_MANAGER, - _( "Bus &Definitions" ), + AddMenuItem( aParentMenu, ID_BUS_MANAGER, _( "Bus &Definitions..." ), HELP_BUS_MANAGER, KiBitmap( bus_definition_tool_xpm ) ); @@ -584,6 +578,10 @@ void prepareToolsMenu( wxMenu* aParentMenu ) _( "Assign PCB footprints to schematic symbols" ), KiBitmap( cvpcb_xpm ) ); + AddMenuItem( aParentMenu, ID_GET_TOOLS, _( "Generate Bill of &Materials..." ), + HELP_GENERATE_BOM, + KiBitmap( bom_xpm ) ); + aParentMenu->AppendSeparator(); #ifdef KICAD_SPICE diff --git a/eeschema/tool_sch.cpp b/eeschema/tool_sch.cpp index eaeaef06ad..57854c6e4c 100644 --- a/eeschema/tool_sch.cpp +++ b/eeschema/tool_sch.cpp @@ -75,8 +75,6 @@ void SCH_EDIT_FRAME::ReCreateHToolbar() m_mainToolBar->AddTool( ID_SHEET_SET, wxEmptyString, KiScaledBitmap( sheetset_xpm, this ), _( "Edit Page settings" ) ); - KiScaledSeparator( m_mainToolBar, this ); - m_mainToolBar->AddTool( wxID_PRINT, wxEmptyString, KiScaledBitmap( print_button_xpm, this ), _( "Print schematic" ) ); @@ -162,9 +160,6 @@ void SCH_EDIT_FRAME::ReCreateHToolbar() m_mainToolBar->AddTool( ID_RUN_CVPCB, wxEmptyString, KiScaledBitmap( cvpcb_xpm, this ), _( "Assign PCB footprints to schematic symbols" ) ); - m_mainToolBar->AddTool( ID_GET_NETLIST, wxEmptyString, KiScaledBitmap( netlist_xpm, this ), - _( "Generate netlist" ) ); - m_mainToolBar->AddTool( ID_OPEN_CMP_TABLE, wxEmptyString, KiScaledBitmap( spreadsheet_xpm, this ), _( "Edit symbol fields" ) ); diff --git a/pcbnew/dialogs/dialog_netlist.cpp b/pcbnew/dialogs/dialog_netlist.cpp index 4ce37c1170..942eb6214e 100644 --- a/pcbnew/dialogs/dialog_netlist.cpp +++ b/pcbnew/dialogs/dialog_netlist.cpp @@ -445,9 +445,9 @@ void DIALOG_NETLIST::loadNetlist( bool aDryRun ) reporter.ReportHead( msg, REPORTER::RPT_INFO ); if( m_matchByTimestamp->GetSelection() == 0 ) - msg = _( "Using time stamps to match components and footprints.\n" ); - else msg = _( "Using references to match components and footprints.\n" ); + else + msg = _( "Using tstamp fields to match components and footprints.\n" ); reporter.ReportHead( msg, REPORTER::RPT_INFO ); m_MessageWindow->SetLazyUpdate( true ); // Use lazy update to speed the creation of the report @@ -457,7 +457,7 @@ void DIALOG_NETLIST::loadNetlist( bool aDryRun ) m_cbUpdateFootprints->GetValue(), m_cbDeleteShortingTracks->GetValue(), m_cbDeleteExtraFootprints->GetValue(), - m_matchByTimestamp->GetSelection() == 0, + m_matchByTimestamp->GetSelection() == 1, m_cbDeleteSinglePadNets->GetValue(), aDryRun, &m_runDragCommand ); diff --git a/pcbnew/dialogs/dialog_netlist_base.cpp b/pcbnew/dialogs/dialog_netlist_base.cpp index c1ed53b11a..f90d0dbdbf 100644 --- a/pcbnew/dialogs/dialog_netlist_base.cpp +++ b/pcbnew/dialogs/dialog_netlist_base.cpp @@ -40,7 +40,7 @@ DIALOG_NETLIST_BASE::DIALOG_NETLIST_BASE( wxWindow* parent, wxWindowID id, const wxBoxSizer* bUpperSizer; bUpperSizer = new wxBoxSizer( wxHORIZONTAL ); - wxString m_matchByTimestampChoices[] = { _("Keep existing symbol to footprint associations"), _("Re-associate footprints by reference") }; + wxString m_matchByTimestampChoices[] = { _("Associate footprints by reference"), _("Associate footprints using \"tstamp\" fields") }; int m_matchByTimestampNChoices = sizeof( m_matchByTimestampChoices ) / sizeof( wxString ); m_matchByTimestamp = new wxRadioBox( this, wxID_ANY, _("Match Method"), wxDefaultPosition, wxDefaultSize, m_matchByTimestampNChoices, m_matchByTimestampChoices, 1, wxRA_SPECIFY_COLS ); m_matchByTimestamp->SetSelection( 0 ); diff --git a/pcbnew/dialogs/dialog_netlist_base.fbp b/pcbnew/dialogs/dialog_netlist_base.fbp index fa2149ed82..7fd9bfea52 100644 --- a/pcbnew/dialogs/dialog_netlist_base.fbp +++ b/pcbnew/dialogs/dialog_netlist_base.fbp @@ -47,7 +47,7 @@ -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h - Netlist + Import Netlist @@ -398,7 +398,7 @@ 1 0 - "Keep existing symbol to footprint associations" "Re-associate footprints by reference" + "Associate footprints by reference" "Associate footprints using \"tstamp\" fields" 1 1 diff --git a/pcbnew/dialogs/dialog_netlist_base.h b/pcbnew/dialogs/dialog_netlist_base.h index d480ea3938..7706d65bb6 100644 --- a/pcbnew/dialogs/dialog_netlist_base.h +++ b/pcbnew/dialogs/dialog_netlist_base.h @@ -76,7 +76,7 @@ class DIALOG_NETLIST_BASE : public DIALOG_SHIM public: - DIALOG_NETLIST_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Netlist"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_NETLIST_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Import Netlist"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_NETLIST_BASE(); }; diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp index 422456245e..042d988bfa 100644 --- a/pcbnew/menubar_pcb_editor.cpp +++ b/pcbnew/menubar_pcb_editor.cpp @@ -191,6 +191,12 @@ void prepareRouteMenu( wxMenu* aParentMenu ) { wxString text; + AddMenuItem( aParentMenu, ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR, + _( "Set &Layer Pair..." ), _( "Change active layer pair" ), + KiBitmap( select_layer_pair_xpm ) ); + + aParentMenu->AppendSeparator(); + text = AddHotkeyName( _( "&Single Track" ), g_Board_Editor_Hotkeys_Descr, HK_ADD_NEW_TRACK, IS_ACCELERATOR ); AddMenuItem( aParentMenu, ID_TRACK_BUTT, text, @@ -364,31 +370,26 @@ void preparePlaceMenu( wxMenu* aParentMenu ) // Build the tools menu void prepareToolsMenu( wxMenu* aParentMenu ) { - AddMenuItem( aParentMenu, ID_GET_NETLIST, - _( "Load &Netlist..." ), - _( "Read netlist and update board connectivity" ), - KiBitmap( netlist_xpm ) ); - AddMenuItem( aParentMenu, ID_UPDATE_PCB_FROM_SCH, _( "Update &PCB from Schematic..." ), _( "Update PCB design with current schematic (forward annotation)" ), KiBitmap( update_pcb_from_sch_xpm ) ); - aParentMenu->AppendSeparator(); - AddMenuItem( aParentMenu, ID_MENU_PCB_UPDATE_FOOTPRINTS, _( "Update &Footprints from Library..." ), _( "Update footprints to include any changes from the library" ), KiBitmap( reload_xpm ) ); - aParentMenu->AppendSeparator(); - - AddMenuItem( aParentMenu, ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR, - _( "Set &Layer Pair..." ), _( "Change active layer pair" ), - KiBitmap( select_layer_pair_xpm ) ); + bool needsSeparator = true; #if defined(KICAD_SCRIPTING_WXPYTHON) + if( needsSeparator ) + { + aParentMenu->AppendSeparator(); + needsSeparator = false; + } + AddMenuItem( aParentMenu, ID_TOOLBARH_PCB_SCRIPTING_CONSOLE, _( "&Scripting Console" ), _( "Show/Hide the Python scripting console" ), @@ -396,7 +397,11 @@ void prepareToolsMenu( wxMenu* aParentMenu ) #endif #if defined(KICAD_SCRIPTING) && defined(KICAD_SCRIPTING_ACTION_MENU) - aParentMenu->AppendSeparator( ); + if( needsSeparator ) + { + aParentMenu->AppendSeparator(); + needsSeparator = false; + } wxMenu* submenuActionPluginsMenu = new wxMenu(); @@ -828,6 +833,11 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) //----- Import submenu ------------------------------------------------------ wxMenu* submenuImport = new wxMenu(); + AddMenuItem( aParentMenu, ID_GET_NETLIST, + _( "Import &Netlist..." ), + _( "Read netlist and update board connectivity" ), + KiBitmap( netlist_xpm ) ); + AddMenuItem( submenuImport, ID_GEN_IMPORT_SPECCTRA_SESSION, _( "&Specctra Session..." ), _( "Import routed \"Specctra Session\" (*.ses) file" ), diff --git a/pcbnew/tool_pcb_editor.cpp b/pcbnew/tool_pcb_editor.cpp index 5428b8276d..0df204579a 100644 --- a/pcbnew/tool_pcb_editor.cpp +++ b/pcbnew/tool_pcb_editor.cpp @@ -297,7 +297,6 @@ void PCB_EDIT_FRAME::ReCreateHToolbar() ADD_TOOL( ID_OPEN_MODULE_VIEWER, modview_icon_xpm, _( "Open footprint viewer" ) ); KiScaledSeparator( m_mainToolBar, this ); - ADD_TOOL( ID_GET_NETLIST, netlist_xpm, _( "Load netlist" ) ); ADD_TOOL( ID_UPDATE_PCB_FROM_SCH, update_pcb_from_sch_xpm, _( "Update PCB from schematic" ) ); ADD_TOOL( ID_DRC_CONTROL, erc_xpm, _( "Perform design rules check" ) );