diff --git a/eeschema/dialogs/dialog_edit_components_libid_base.cpp b/eeschema/dialogs/dialog_edit_components_libid_base.cpp index b07f055be1..7e6a00cdc5 100644 --- a/eeschema/dialogs/dialog_edit_components_libid_base.cpp +++ b/eeschema/dialogs/dialog_edit_components_libid_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 22 2017) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -37,8 +37,8 @@ DIALOG_EDIT_COMPONENTS_LIBID_BASE::DIALOG_EDIT_COMPONENTS_LIBID_BASE( wxWindow* m_grid->EnableDragColSize( true ); m_grid->SetColLabelSize( 30 ); m_grid->SetColLabelValue( 0, _("Symbols") ); - m_grid->SetColLabelValue( 1, _("Current Symbol") ); - m_grid->SetColLabelValue( 2, _("New Symbol") ); + m_grid->SetColLabelValue( 1, _("Current Library Reference") ); + m_grid->SetColLabelValue( 2, _("New Library Reference") ); m_grid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); // Rows diff --git a/eeschema/dialogs/dialog_edit_components_libid_base.fbp b/eeschema/dialogs/dialog_edit_components_libid_base.fbp index 76eb012af6..dd2b77a749 100644 --- a/eeschema/dialogs/dialog_edit_components_libid_base.fbp +++ b/eeschema/dialogs/dialog_edit_components_libid_base.fbp @@ -47,7 +47,7 @@ -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h - Edit Symbol Library Associations + Symbol Library References @@ -204,7 +204,7 @@ 1 wxALIGN_CENTRE 30 - "Symbols" "Current Symbol" "New Symbol" + "Symbols" "Current Library Reference" "New Library Reference" wxALIGN_CENTRE 3 300,200,200 diff --git a/eeschema/dialogs/dialog_edit_components_libid_base.h b/eeschema/dialogs/dialog_edit_components_libid_base.h index 90c4434afb..6a19626c08 100644 --- a/eeschema/dialogs/dialog_edit_components_libid_base.h +++ b/eeschema/dialogs/dialog_edit_components_libid_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 22 2017) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -61,7 +61,7 @@ class DIALOG_EDIT_COMPONENTS_LIBID_BASE : public DIALOG_SHIM public: - DIALOG_EDIT_COMPONENTS_LIBID_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Edit Symbol Library Associations"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_EDIT_COMPONENTS_LIBID_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Symbol Library References"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_EDIT_COMPONENTS_LIBID_BASE(); }; diff --git a/eeschema/dialogs/dialog_fields_editor_global_base.fbp b/eeschema/dialogs/dialog_fields_editor_global_base.fbp index c4da6932e3..ac779a3ddf 100644 --- a/eeschema/dialogs/dialog_fields_editor_global_base.fbp +++ b/eeschema/dialogs/dialog_fields_editor_global_base.fbp @@ -47,7 +47,7 @@ -1,-1 wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h - Fields Editor + Symbol Fields diff --git a/eeschema/dialogs/dialog_fields_editor_global_base.h b/eeschema/dialogs/dialog_fields_editor_global_base.h index 626aa94f81..7df6d46bac 100644 --- a/eeschema/dialogs/dialog_fields_editor_global_base.h +++ b/eeschema/dialogs/dialog_fields_editor_global_base.h @@ -68,7 +68,7 @@ class DIALOG_FIELDS_EDITOR_GLOBAL_BASE : public DIALOG_SHIM public: - DIALOG_FIELDS_EDITOR_GLOBAL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Fields Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER ); + DIALOG_FIELDS_EDITOR_GLOBAL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Symbol Fields"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER ); ~DIALOG_FIELDS_EDITOR_GLOBAL_BASE(); void m_splitter1OnIdle( wxIdleEvent& ) diff --git a/eeschema/dialogs/dialog_sym_lib_table_base.cpp b/eeschema/dialogs/dialog_sym_lib_table_base.cpp index ba21f36131..bf6505c84b 100644 --- a/eeschema/dialogs/dialog_sym_lib_table_base.cpp +++ b/eeschema/dialogs/dialog_sym_lib_table_base.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 4 2017) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "dialog_sym_lib_table_base.h" @@ -17,9 +17,9 @@ DIALOG_SYMBOL_LIB_TABLE_BASE::DIALOG_SYMBOL_LIB_TABLE_BASE( wxWindow* parent, wx bSizer1 = new wxBoxSizer( wxVERTICAL ); wxStaticBoxSizer* m_top_sizer; - m_top_sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Library Tables by Scope") ), wxVERTICAL ); + m_top_sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Libraries by Scope") ), wxVERTICAL ); - m_auinotebook = new wxAuiNotebook( m_top_sizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_NB_BOTTOM ); + m_auinotebook = new wxAuiNotebook( m_top_sizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_global_panel = new wxPanel( m_auinotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* m_global_sizer; m_global_sizer = new wxBoxSizer( wxVERTICAL ); @@ -29,16 +29,16 @@ DIALOG_SYMBOL_LIB_TABLE_BASE::DIALOG_SYMBOL_LIB_TABLE_BASE( wxWindow* parent, wx fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText3 = new wxStaticText( m_global_panel, wxID_ANY, _("Table:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText3 = new wxStaticText( m_global_panel, wxID_ANY, _("File:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText3->Wrap( -1 ); - fgSizer1->Add( m_staticText3, 0, wxRIGHT|wxLEFT, 5 ); + fgSizer1->Add( m_staticText3, 0, wxTOP|wxRIGHT|wxLEFT, 4 ); m_GblTableFilename = new wxStaticText( m_global_panel, wxID_ANY, _("Table Name"), wxDefaultPosition, wxDefaultSize, 0 ); m_GblTableFilename->Wrap( -1 ); - fgSizer1->Add( m_GblTableFilename, 0, wxRIGHT|wxLEFT, 5 ); + fgSizer1->Add( m_GblTableFilename, 0, wxTOP|wxRIGHT|wxLEFT, 4 ); - m_global_sizer->Add( fgSizer1, 0, wxEXPAND, 5 ); + m_global_sizer->Add( fgSizer1, 0, wxEXPAND, 2 ); m_global_grid = new wxGrid( m_global_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); @@ -158,7 +158,7 @@ DIALOG_SYMBOL_LIB_TABLE_BASE::DIALOG_SYMBOL_LIB_TABLE_BASE( wxWindow* parent, wx m_top_sizer->Add( bSizer51, 0, wxALIGN_CENTER|wxBOTTOM, 8 ); - bSizer1->Add( m_top_sizer, 1, wxEXPAND, 5 ); + bSizer1->Add( m_top_sizer, 1, wxALL|wxEXPAND, 5 ); wxStaticBoxSizer* sbSizer1; sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Path Substitutions") ), wxVERTICAL ); diff --git a/eeschema/dialogs/dialog_sym_lib_table_base.fbp b/eeschema/dialogs/dialog_sym_lib_table_base.fbp index d419037a1d..b5c0672266 100644 --- a/eeschema/dialogs/dialog_sym_lib_table_base.fbp +++ b/eeschema/dialogs/dialog_sym_lib_table_base.fbp @@ -47,7 +47,7 @@ 800,600 wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU DIALOG_SHIM; dialog_shim.h - Schematic Library Tables + Symbol Libraries @@ -95,11 +95,11 @@ none 5 - wxEXPAND + wxALL|wxEXPAND 1 wxID_ANY - Library Tables by Scope + Libraries by Scope m_top_sizer wxVERTICAL @@ -155,7 +155,7 @@ Resizable 1 - wxAUI_NB_BOTTOM + -1 0 @@ -280,7 +280,7 @@ wxVERTICAL none - 5 + 2 wxEXPAND 0 @@ -296,8 +296,8 @@ 1 0 - 5 - wxRIGHT|wxLEFT + 4 + wxTOP|wxRIGHT|wxLEFT 0 1 @@ -327,7 +327,7 @@ 0 0 wxID_ANY - Table: + File: 0 @@ -379,8 +379,8 @@ - 5 - wxRIGHT|wxLEFT + 4 + wxTOP|wxRIGHT|wxLEFT 0 1 diff --git a/eeschema/dialogs/dialog_sym_lib_table_base.h b/eeschema/dialogs/dialog_sym_lib_table_base.h index 3196d48191..c723229b54 100644 --- a/eeschema/dialogs/dialog_sym_lib_table_base.h +++ b/eeschema/dialogs/dialog_sym_lib_table_base.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 4 2017) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #ifndef __DIALOG_SYM_LIB_TABLE_BASE_H__ @@ -11,8 +11,6 @@ #include #include #include -class DIALOG_SHIM; - #include "dialog_shim.h" #include #include @@ -72,7 +70,7 @@ class DIALOG_SYMBOL_LIB_TABLE_BASE : public DIALOG_SHIM public: - DIALOG_SYMBOL_LIB_TABLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Schematic Library Tables"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 800,600 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU ); + DIALOG_SYMBOL_LIB_TABLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Symbol Libraries"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 800,600 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU ); ~DIALOG_SYMBOL_LIB_TABLE_BASE(); }; diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index 81f9f4a1c4..8cc1037e9f 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -560,7 +560,7 @@ void prepareToolsMenu( wxMenu* aParentMenu ) AddMenuItem( aParentMenu, ID_RUN_LIBRARY, - _( "Library &Editor" ), HELP_RUN_LIB_EDITOR, + _( "Symbol Library &Editor" ), HELP_RUN_LIB_EDITOR, KiBitmap( libedit_xpm ) ); AddMenuItem( aParentMenu, @@ -575,19 +575,21 @@ void prepareToolsMenu( wxMenu* aParentMenu ) _( "Remap legacy library symbols to symbol library table" ), KiBitmap( rescue_xpm ) ); - AddMenuItem( aParentMenu, - ID_EDIT_COMPONENTS_TO_SYMBOLS_LIB_ID, - _( "Edit Symbol Library Links..." ), - _( "Edit schematic symbol's symbol library links" ), - KiBitmap( edit_cmp_symb_links_xpm ) ); - aParentMenu->AppendSeparator(); AddMenuItem( aParentMenu, ID_OPEN_CMP_TABLE, - _( "Field&s Editor..." ), + _( "Edit Symbol Field&s..." ), KiBitmap( spreadsheet_xpm ) ); + AddMenuItem( aParentMenu, + ID_EDIT_COMPONENTS_TO_SYMBOLS_LIB_ID, + _( "Edit Symbol Library References..." ), + _( "Edit links between schematic symbols and library symbols" ), + KiBitmap( edit_cmp_symb_links_xpm ) ); + + aParentMenu->AppendSeparator(); + AddMenuItem( aParentMenu, ID_GET_ANNOTATE, _( "&Annotate Schematic..." ), HELP_ANNOTATE, @@ -665,13 +667,6 @@ void prepareHelpMenu( wxMenu* aParentMenu ) static void preparePreferencesMenu( SCH_EDIT_FRAME* aFrame, wxMenu* aParentMenu ) { - // Library - AddMenuItem( aParentMenu, - ID_EDIT_SYM_LIB_TABLE, - _( "Manage Symbol Library Tables..." ), - _( "Edit the global and project symbol library tables (list of active libraries)." ), - KiBitmap( library_table_xpm ) ); - // Path configuration edit dialog. AddMenuItem( aParentMenu, ID_PREFERENCES_CONFIGURE_PATHS, @@ -679,6 +674,13 @@ static void preparePreferencesMenu( SCH_EDIT_FRAME* aFrame, wxMenu* aParentMenu _( "Edit path configuration environment variables" ), KiBitmap( path_xpm ) ); + // Library + AddMenuItem( aParentMenu, + ID_EDIT_SYM_LIB_TABLE, + _( "Manage Symbol Libraries..." ), + _( "Edit the global and project symbol library lists" ), + KiBitmap( library_table_xpm ) ); + // Options (Preferences on WXMAC) #ifdef __WXMAC__ aParentMenu->Append( wxID_PREFERENCES ); diff --git a/pcbnew/dialogs/dialog_fp_lib_table_base.cpp b/pcbnew/dialogs/dialog_fp_lib_table_base.cpp index 9b1f611110..95486a842a 100644 --- a/pcbnew/dialogs/dialog_fp_lib_table_base.cpp +++ b/pcbnew/dialogs/dialog_fp_lib_table_base.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 9 2015) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "dialog_fp_lib_table_base.h" @@ -17,9 +17,9 @@ DIALOG_FP_LIB_TABLE_BASE::DIALOG_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID bSizer1 = new wxBoxSizer( wxVERTICAL ); wxStaticBoxSizer* m_top_sizer; - m_top_sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Library Tables by Scope") ), wxVERTICAL ); + m_top_sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Libraries by Scope") ), wxVERTICAL ); - m_auinotebook = new wxAuiNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_NB_BOTTOM ); + m_auinotebook = new wxAuiNotebook( m_top_sizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_global_panel = new wxPanel( m_auinotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* m_global_sizer; m_global_sizer = new wxBoxSizer( wxVERTICAL ); @@ -29,13 +29,13 @@ DIALOG_FP_LIB_TABLE_BASE::DIALOG_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText3 = new wxStaticText( m_global_panel, wxID_ANY, _("Table:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText3 = new wxStaticText( m_global_panel, wxID_ANY, _("File:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText3->Wrap( -1 ); - fgSizer1->Add( m_staticText3, 0, wxRIGHT|wxLEFT, 5 ); + fgSizer1->Add( m_staticText3, 0, wxTOP|wxRIGHT|wxLEFT, 4 ); m_GblTableFilename = new wxStaticText( m_global_panel, wxID_ANY, _("Table Name"), wxDefaultPosition, wxDefaultSize, 0 ); m_GblTableFilename->Wrap( -1 ); - fgSizer1->Add( m_GblTableFilename, 0, wxRIGHT|wxLEFT, 5 ); + fgSizer1->Add( m_GblTableFilename, 0, wxTOP|wxRIGHT|wxLEFT, 4 ); m_global_sizer->Add( fgSizer1, 0, wxEXPAND, 5 ); @@ -130,30 +130,30 @@ DIALOG_FP_LIB_TABLE_BASE::DIALOG_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID wxBoxSizer* bSizer51; bSizer51 = new wxBoxSizer( wxHORIZONTAL ); - m_buttonWizard = new wxButton( this, wxID_ANY, _("Append with Wizard"), wxDefaultPosition, wxDefaultSize, 0 ); + m_buttonWizard = new wxButton( m_top_sizer->GetStaticBox(), wxID_ANY, _("Append with Wizard"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer51->Add( m_buttonWizard, 0, wxALL, 5 ); - m_append_button = new wxButton( this, wxID_ANY, _("Append Library"), wxDefaultPosition, wxDefaultSize, 0 ); + m_append_button = new wxButton( m_top_sizer->GetStaticBox(), wxID_ANY, _("Append Library"), wxDefaultPosition, wxDefaultSize, 0 ); m_append_button->SetToolTip( _("Add a PCB library row to this table") ); bSizer51->Add( m_append_button, 0, wxALL, 5 ); - m_delete_button = new wxButton( this, wxID_ANY, _("Remove Library"), wxDefaultPosition, wxDefaultSize, 0 ); + m_delete_button = new wxButton( m_top_sizer->GetStaticBox(), wxID_ANY, _("Remove Library"), wxDefaultPosition, wxDefaultSize, 0 ); m_delete_button->SetToolTip( _("Remove a PCB library from this library table") ); bSizer51->Add( m_delete_button, 0, wxALL, 5 ); - m_move_up_button = new wxButton( this, wxID_ANY, _("Move Up"), wxDefaultPosition, wxDefaultSize, 0 ); + m_move_up_button = new wxButton( m_top_sizer->GetStaticBox(), wxID_ANY, _("Move Up"), wxDefaultPosition, wxDefaultSize, 0 ); m_move_up_button->SetToolTip( _("Move the currently selected row up one position") ); bSizer51->Add( m_move_up_button, 0, wxALL, 5 ); - m_move_down_button = new wxButton( this, wxID_ANY, _("Move Down"), wxDefaultPosition, wxDefaultSize, 0 ); + m_move_down_button = new wxButton( m_top_sizer->GetStaticBox(), wxID_ANY, _("Move Down"), wxDefaultPosition, wxDefaultSize, 0 ); m_move_down_button->SetToolTip( _("Move the currently selected row down one position") ); bSizer51->Add( m_move_down_button, 0, wxALL, 5 ); - m_edit_options = new wxButton( this, wxID_ANY, _("Options Editor"), wxDefaultPosition, wxDefaultSize, 0 ); + m_edit_options = new wxButton( m_top_sizer->GetStaticBox(), wxID_ANY, _("Options Editor"), wxDefaultPosition, wxDefaultSize, 0 ); m_edit_options->SetToolTip( _("Zoom into the options table for current row") ); bSizer51->Add( m_edit_options, 0, wxALL, 5 ); @@ -162,12 +162,12 @@ DIALOG_FP_LIB_TABLE_BASE::DIALOG_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID m_top_sizer->Add( bSizer51, 0, wxALIGN_CENTER|wxBOTTOM, 8 ); - bSizer1->Add( m_top_sizer, 1, wxEXPAND, 5 ); + bSizer1->Add( m_top_sizer, 1, wxALL|wxEXPAND, 5 ); wxStaticBoxSizer* sbSizer1; sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Path Substitutions") ), wxVERTICAL ); - m_path_subs_grid = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_path_subs_grid = new wxGrid( sbSizer1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); // Grid m_path_subs_grid->CreateGrid( 1, 2 ); diff --git a/pcbnew/dialogs/dialog_fp_lib_table_base.fbp b/pcbnew/dialogs/dialog_fp_lib_table_base.fbp index 94152fa23d..13e6b0fadc 100644 --- a/pcbnew/dialogs/dialog_fp_lib_table_base.fbp +++ b/pcbnew/dialogs/dialog_fp_lib_table_base.fbp @@ -47,7 +47,7 @@ 717,600 wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU DIALOG_SHIM; dialog_shim.h - PCB Library Tables + Footprint Libraries @@ -95,14 +95,15 @@ none 5 - wxEXPAND + wxALL|wxEXPAND 1 wxID_ANY - Library Tables by Scope + Libraries by Scope m_top_sizer wxVERTICAL + 1 none @@ -154,7 +155,7 @@ Resizable 1 - wxAUI_NB_BOTTOM + -1 0 @@ -171,6 +172,7 @@ pageChangedHandler + @@ -294,8 +296,8 @@ 1 0 - 5 - wxRIGHT|wxLEFT + 4 + wxTOP|wxRIGHT|wxLEFT 0 1 @@ -325,7 +327,7 @@ 0 0 wxID_ANY - Table: + File: 0 @@ -377,8 +379,8 @@ - 5 - wxRIGHT|wxLEFT + 4 + wxTOP|wxRIGHT|wxLEFT 0 1 @@ -1573,6 +1575,7 @@ sbSizer1 wxVERTICAL + 1 none diff --git a/pcbnew/dialogs/dialog_fp_lib_table_base.h b/pcbnew/dialogs/dialog_fp_lib_table_base.h index b2e4932aa4..bcd8c611b0 100644 --- a/pcbnew/dialogs/dialog_fp_lib_table_base.h +++ b/pcbnew/dialogs/dialog_fp_lib_table_base.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 9 2015) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #ifndef __DIALOG_FP_LIB_TABLE_BASE_H__ @@ -11,8 +11,6 @@ #include #include #include -class DIALOG_SHIM; - #include "dialog_shim.h" #include #include @@ -78,7 +76,7 @@ class DIALOG_FP_LIB_TABLE_BASE : public DIALOG_SHIM public: - DIALOG_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("PCB Library Tables"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 717,600 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU ); + DIALOG_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Libraries"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 717,600 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU ); ~DIALOG_FP_LIB_TABLE_BASE(); }; diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp index 2516bf5b64..323514d284 100644 --- a/pcbnew/menubar_pcb_editor.cpp +++ b/pcbnew/menubar_pcb_editor.cpp @@ -320,27 +320,26 @@ void prepareInspectMenu( wxMenu* aParentMenu ) // Build the library management menu void prepareLibraryMenu( wxMenu* aParentMenu ) { - AddMenuItem( aParentMenu, ID_PCB_LIB_WIZARD, - _( "&Footprint Library Wizard..." ), - _( "Add footprint library using wizard" ), - KiBitmap( wizard_add_fplib_small_xpm ) ); - - AddMenuItem( aParentMenu, ID_PCB_LIB_TABLE_EDIT, - _( "Footprint Li&brary Table..." ), - _( "Configure footprint library table" ), - KiBitmap( library_table_xpm ) ); - - // Path configuration edit dialog. AddMenuItem( aParentMenu, ID_PREFERENCES_CONFIGURE_PATHS, _( "Configure Pa&ths..." ), _( "Edit path configuration environment variables" ), KiBitmap( path_xpm ) ); + AddMenuItem( aParentMenu, ID_PCB_LIB_WIZARD, + _( "&Add Footprint Libraries Wizard..." ), + _( "Add footprint libraries using wizard" ), + KiBitmap( wizard_add_fplib_small_xpm ) ); + + AddMenuItem( aParentMenu, ID_PCB_LIB_TABLE_EDIT, + _( "Manage Footprint Li&braries..." ), + _( "Edit the global and project footprint library lists" ), + KiBitmap( library_table_xpm ) ); + #ifdef BUILD_GITHUB_PLUGIN AddMenuItem( aParentMenu, ID_PCB_3DSHAPELIB_WIZARD, - _( "&3D Shape Downloader..." ), - _( "Download from Github 3D shape libraries using wizard" ), + _( "Add &3D Shapes Wizard..." ), + _( "Download 3D shape libraries from GitHub" ), KiBitmap( import3d_xpm ) ); #endif }