From 2a1a6e8cbe088efbbddc050f8d1c4a79da2aec81 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sun, 29 Nov 2020 13:20:01 +0100 Subject: [PATCH] From master branch: Make path substitutions grid read only in lib table dialog From master branch, commit becc811. --- eeschema/dialogs/panel_sym_lib_table_base.cpp | 150 +- eeschema/dialogs/panel_sym_lib_table_base.fbp | 1842 ++++++++-------- eeschema/dialogs/panel_sym_lib_table_base.h | 22 +- pcbnew/dialogs/panel_fp_lib_table_base.cpp | 150 +- pcbnew/dialogs/panel_fp_lib_table_base.fbp | 1844 ++++++++--------- pcbnew/dialogs/panel_fp_lib_table_base.h | 22 +- 6 files changed, 2013 insertions(+), 2017 deletions(-) diff --git a/eeschema/dialogs/panel_sym_lib_table_base.cpp b/eeschema/dialogs/panel_sym_lib_table_base.cpp index 63c4f07005..5f16410f6a 100644 --- a/eeschema/dialogs/panel_sym_lib_table_base.cpp +++ b/eeschema/dialogs/panel_sym_lib_table_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -11,66 +11,66 @@ /////////////////////////////////////////////////////////////////////////// -PANEL_SYM_LIB_TABLE_BASE::PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +PANEL_SYM_LIB_TABLE_BASE::PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) { wxBoxSizer* bSizer1; bSizer1 = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* m_top_sizer; 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, 0 ); m_auinotebook->SetMinSize( wxSize( 720,460 ) ); - + m_global_panel = new wxPanel( m_auinotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* m_global_sizer; m_global_sizer = new wxBoxSizer( wxVERTICAL ); - + wxFlexGridSizer* fgSizer1; fgSizer1 = new wxFlexGridSizer( 1, 2, 0, 0 ); fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticText3 = new wxStaticText( m_global_panel, wxID_ANY, _("File:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText3->Wrap( -1 ); 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, wxTOP|wxRIGHT|wxLEFT, 4 ); - - + + m_global_sizer->Add( fgSizer1, 0, wxEXPAND, 2 ); - + m_global_grid = new WX_GRID( m_global_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - + // Grid m_global_grid->CreateGrid( 1, 5 ); m_global_grid->EnableEditing( true ); m_global_grid->EnableGridLines( true ); m_global_grid->EnableDragGridSize( false ); m_global_grid->SetMargins( 0, 0 ); - + // Columns m_global_grid->AutoSizeColumns(); m_global_grid->EnableDragColMove( false ); m_global_grid->EnableDragColSize( true ); m_global_grid->SetColLabelSize( 22 ); - m_global_grid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_global_grid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_global_grid->AutoSizeRows(); m_global_grid->EnableDragRowSize( false ); m_global_grid->SetRowLabelSize( 0 ); - m_global_grid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_global_grid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_global_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); m_global_sizer->Add( m_global_grid, 5, wxALL|wxEXPAND, 5 ); - - + + m_global_panel->SetSizer( m_global_sizer ); m_global_panel->Layout(); m_global_sizer->Fit( m_global_panel ); @@ -78,107 +78,107 @@ PANEL_SYM_LIB_TABLE_BASE::PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID m_project_panel = new wxPanel( m_auinotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* m_project_sizer; m_project_sizer = new wxBoxSizer( wxVERTICAL ); - + wxFlexGridSizer* fgSizer2; fgSizer2 = new wxFlexGridSizer( 1, 2, 0, 0 ); fgSizer2->SetFlexibleDirection( wxBOTH ); fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticText4 = new wxStaticText( m_project_panel, wxID_ANY, _("File:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText4->Wrap( -1 ); fgSizer2->Add( m_staticText4, 0, wxLEFT|wxRIGHT|wxTOP, 4 ); - + m_PrjTableFilename = new wxStaticText( m_project_panel, wxID_ANY, _("Table Name"), wxDefaultPosition, wxDefaultSize, 0 ); m_PrjTableFilename->Wrap( -1 ); fgSizer2->Add( m_PrjTableFilename, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); - - + + m_project_sizer->Add( fgSizer2, 0, wxEXPAND, 5 ); - + m_project_grid = new WX_GRID( m_project_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - + // Grid m_project_grid->CreateGrid( 1, 5 ); m_project_grid->EnableEditing( true ); m_project_grid->EnableGridLines( true ); m_project_grid->EnableDragGridSize( false ); m_project_grid->SetMargins( 0, 0 ); - + // Columns m_project_grid->AutoSizeColumns(); m_project_grid->EnableDragColMove( false ); m_project_grid->EnableDragColSize( true ); m_project_grid->SetColLabelSize( 22 ); - m_project_grid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_project_grid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_project_grid->EnableDragRowSize( false ); m_project_grid->SetRowLabelSize( 0 ); - m_project_grid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_project_grid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_project_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); m_project_sizer->Add( m_project_grid, 2, wxALL|wxEXPAND, 5 ); - - + + m_project_panel->SetSizer( m_project_sizer ); m_project_panel->Layout(); m_project_sizer->Fit( m_project_panel ); m_auinotebook->AddPage( m_project_panel, _("Project Specific Libraries"), false, wxNullBitmap ); - + m_top_sizer->Add( m_auinotebook, 1, wxEXPAND | wxALL, 5 ); - + wxBoxSizer* bSizer51; bSizer51 = new wxBoxSizer( wxHORIZONTAL ); - - m_append_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW ); + + m_append_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); m_append_button->SetToolTip( _("Add empty row to table") ); - + bSizer51->Add( m_append_button, 0, wxRIGHT|wxLEFT, 5 ); - - m_browse_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW ); + + m_browse_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); m_browse_button->SetToolTip( _("Add existing library to table") ); - + bSizer51->Add( m_browse_button, 0, wxRIGHT, 5 ); - - m_move_up_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW ); + + m_move_up_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); m_move_up_button->SetToolTip( _("Move up") ); - + bSizer51->Add( m_move_up_button, 0, wxRIGHT, 5 ); - - m_move_down_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW ); + + m_move_down_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); m_move_down_button->SetToolTip( _("Move down") ); - + bSizer51->Add( m_move_down_button, 0, wxRIGHT, 5 ); - - + + bSizer51->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - m_delete_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW ); + + m_delete_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); m_delete_button->SetToolTip( _("Remove library from table") ); - + bSizer51->Add( m_delete_button, 0, wxRIGHT|wxLEFT, 5 ); - - + + m_top_sizer->Add( bSizer51, 0, 0, 8 ); - - + + 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 WX_GRID( sbSizer1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - + // Grid m_path_subs_grid->CreateGrid( 1, 2 ); - m_path_subs_grid->EnableEditing( true ); + m_path_subs_grid->EnableEditing( false ); m_path_subs_grid->EnableGridLines( true ); m_path_subs_grid->EnableDragGridSize( false ); m_path_subs_grid->SetMargins( 0, 0 ); - + // Columns m_path_subs_grid->SetColSize( 0, 150 ); m_path_subs_grid->SetColSize( 1, 500 ); @@ -186,28 +186,28 @@ PANEL_SYM_LIB_TABLE_BASE::PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID m_path_subs_grid->EnableDragColMove( false ); m_path_subs_grid->EnableDragColSize( true ); m_path_subs_grid->SetColLabelSize( 0 ); - m_path_subs_grid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_path_subs_grid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_path_subs_grid->EnableDragRowSize( true ); m_path_subs_grid->SetRowLabelSize( 0 ); - m_path_subs_grid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_path_subs_grid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_path_subs_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); m_path_subs_grid->SetToolTip( _("This is a read-only table which shows pertinent environment variables.") ); - + sbSizer1->Add( m_path_subs_grid, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + bSizer1->Add( sbSizer1, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - + + this->SetSizer( bSizer1 ); this->Layout(); - + // Connect Events m_auinotebook->Connect( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEventHandler( PANEL_SYM_LIB_TABLE_BASE::pageChangedHandler ), NULL, this ); m_append_button->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SYM_LIB_TABLE_BASE::appendRowHandler ), NULL, this ); @@ -228,5 +228,5 @@ PANEL_SYM_LIB_TABLE_BASE::~PANEL_SYM_LIB_TABLE_BASE() m_move_down_button->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SYM_LIB_TABLE_BASE::moveDownHandler ), NULL, this ); m_delete_button->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SYM_LIB_TABLE_BASE::deleteRowHandler ), NULL, this ); m_path_subs_grid->Disconnect( wxEVT_SIZE, wxSizeEventHandler( PANEL_SYM_LIB_TABLE_BASE::onSizeGrid ), NULL, this ); - + } diff --git a/eeschema/dialogs/panel_sym_lib_table_base.fbp b/eeschema/dialogs/panel_sym_lib_table_base.fbp index 724ee9320a..7cfc28b496 100644 --- a/eeschema/dialogs/panel_sym_lib_table_base.fbp +++ b/eeschema/dialogs/panel_sym_lib_table_base.fbp @@ -1,8 +1,8 @@ - + - + C++ 1 source_name @@ -16,9 +16,9 @@ none 1 sym_lib_table - + . - + 1 1 1 @@ -29,57 +29,57 @@ 0 wxAUI_MGR_DEFAULT - - + + 1 1 impl_virtual - - + + 0 wxID_ANY - - + + PANEL_SYM_LIB_TABLE_BASE - + 500,300 ; forward_declare - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bSizer1 wxVERTICAL none @@ -90,12 +90,12 @@ wxID_ANY Libraries by Scope - + m_top_sizer wxVERTICAL 1 none - + 5 wxEXPAND | wxALL @@ -105,89 +105,89 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 0 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 720,460 1 m_auinotebook 1 - - + + protected 1 - + Resizable 1 - - - + + + -1 0 - - - - - - - - - - + + + + + + + + + + pageChangedHandler - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + Global Libraries 1 @@ -195,77 +195,77 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 0 - + 0 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + -1,80 0 - + 1 m_global_panel 1 - - + + protected 0 - + Resizable 1 - - + + 0 - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + m_global_sizer wxVERTICAL none @@ -276,10 +276,10 @@ 2 wxBOTH - - + + 0 - + fgSizer1 wxFLEX_GROWMODE_SPECIFIED none @@ -294,78 +294,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY File: - + 0 - - + + 0 - + 1 m_staticText3 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -377,78 +377,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Table Name - + 0 - - + + 0 - + 1 m_GblTableFilename 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -462,30 +462,30 @@ 1 1 1 - - - - + + + + 1 1 - - - + + + 1 - - + + wxALIGN_LEFT - + wxALIGN_TOP 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 22 - - wxALIGN_CENTRE + + wxALIGN_CENTER 5 - - + + 1 0 Dock @@ -497,110 +497,110 @@ 0 1 1 - + 0 - - + + 1 0 0 wxID_ANY - - - + + + 0 0 - + 0 - - + + 0 -1,-1 0 m_global_grid 1 - - + + protected 1 - + Fixed - wxALIGN_CENTRE + wxALIGN_CENTER 0 - - wxALIGN_CENTRE - + + wxALIGN_CENTER + 1 1 - + WX_GRID; widgets/wx_grid.h; forward_declare 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + Project Specific Libraries 0 @@ -608,77 +608,77 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 0 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_project_panel 1 - - + + protected 1 - + Resizable 1 - - + + 0 - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + m_project_sizer wxVERTICAL none @@ -689,10 +689,10 @@ 2 wxBOTH - - + + 0 - + fgSizer2 wxFLEX_GROWMODE_SPECIFIED none @@ -707,78 +707,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY File: - + 0 - - + + 0 - + 1 m_staticText4 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -790,78 +790,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Table Name - + 0 - - + + 0 - + 1 m_PrjTableFilename 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -875,30 +875,30 @@ 1 1 1 - - - - + + + + 1 0 - - - + + + 1 - - + + wxALIGN_LEFT - + wxALIGN_TOP 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 22 - - wxALIGN_CENTRE + + wxALIGN_CENTER 5 - - + + 1 0 Dock @@ -910,103 +910,103 @@ 0 1 1 - + 0 - - + + 1 0 0 wxID_ANY - - - + + + 0 0 - + 0 - - + + 0 - + 0 m_project_grid 1 - - + + protected 1 - + Fixed - wxALIGN_CENTRE + wxALIGN_CENTER 0 - - wxALIGN_CENTRE - + + wxALIGN_CENTER + 1 1 - + WX_GRID; widgets/wx_grid.h; forward_declare 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1016,10 +1016,10 @@ 8 - + 0 - + bSizer51 wxHORIZONTAL none @@ -1032,88 +1032,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY Add Library - + 0 - - + + 0 - + 1 m_append_button 1 - - + + protected 1 - + Resizable - + 1 30,30 - wxBU_AUTODRAW + ; forward_declare 0 Add empty row to table - + wxFILTER_NONE wxDefaultValidator - - - - + + + + appendRowHandler - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1125,88 +1125,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY Add Library - + 0 - - + + 0 - + 1 m_browse_button 1 - - + + protected 1 - + Resizable - + 1 30,30 - wxBU_AUTODRAW + ; forward_declare 0 Add existing library to table - + wxFILTER_NONE wxDefaultValidator - - - - + + + + browseLibrariesHandler - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1218,88 +1218,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY Move Up - + 0 - - + + 0 - + 1 m_move_up_button 1 - - + + protected 1 - + Resizable - + 1 30,30 - wxBU_AUTODRAW + ; forward_declare 0 Move up - + wxFILTER_NONE wxDefaultValidator - - - - + + + + moveUpHandler - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1311,88 +1311,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY Move Down - + 0 - - + + 0 - + 1 m_move_down_button 1 - - + + protected 1 - + Resizable - + 1 30,30 - wxBU_AUTODRAW + ; forward_declare 0 Move down - + wxFILTER_NONE wxDefaultValidator - - - - + + + + moveDownHandler - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1414,88 +1414,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY Remove Library - + 0 - - + + 0 - + 1 m_delete_button 1 - - + + protected 1 - + Resizable - + 1 30,30 - wxBU_AUTODRAW + ; forward_declare 0 Remove library from table - + wxFILTER_NONE wxDefaultValidator - - - - + + + + deleteRowHandler - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1509,12 +1509,12 @@ wxID_ANY Path Substitutions: - + sbSizer1 wxVERTICAL 1 none - + 5 wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT @@ -1524,30 +1524,30 @@ 1 1 1 - - - - + + + + 1 0 - - - + + + 1 - - + + wxALIGN_LEFT - + wxALIGN_TOP 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 0 - - wxALIGN_CENTRE + + wxALIGN_CENTER 2 150,500 - + 1 0 Dock @@ -1557,105 +1557,105 @@ 1 0 1 - 1 + 0 1 - + 1 - - + + 1 0 0 wxID_ANY - - - + + + 0 0 - + 0 - - + + 0 - + 1 m_path_subs_grid 1 - - + + protected 1 - + Resizable - wxALIGN_CENTRE + wxALIGN_CENTER 0 - - wxALIGN_CENTRE - + + wxALIGN_CENTER + 1 1 - + WX_GRID; widgets/wx_grid.h; forward_declare 0 This is a read-only table which shows pertinent environment variables. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + onSizeGrid - + diff --git a/eeschema/dialogs/panel_sym_lib_table_base.h b/eeschema/dialogs/panel_sym_lib_table_base.h index a63ed46060..0994a6aede 100644 --- a/eeschema/dialogs/panel_sym_lib_table_base.h +++ b/eeschema/dialogs/panel_sym_lib_table_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __PANEL_SYM_LIB_TABLE_BASE_H__ -#define __PANEL_SYM_LIB_TABLE_BASE_H__ +#pragma once #include #include @@ -36,10 +35,10 @@ class WX_GRID; /////////////////////////////////////////////////////////////////////////////// /// Class PANEL_SYM_LIB_TABLE_BASE /////////////////////////////////////////////////////////////////////////////// -class PANEL_SYM_LIB_TABLE_BASE : public wxPanel +class PANEL_SYM_LIB_TABLE_BASE : public wxPanel { private: - + protected: wxAuiNotebook* m_auinotebook; wxPanel* m_global_panel; @@ -56,7 +55,7 @@ class PANEL_SYM_LIB_TABLE_BASE : public wxPanel wxBitmapButton* m_move_down_button; wxBitmapButton* m_delete_button; WX_GRID* m_path_subs_grid; - + // Virtual event handlers, overide them in your derived class virtual void pageChangedHandler( wxAuiNotebookEvent& event ) { event.Skip(); } virtual void appendRowHandler( wxCommandEvent& event ) { event.Skip(); } @@ -65,13 +64,12 @@ class PANEL_SYM_LIB_TABLE_BASE : public wxPanel virtual void moveDownHandler( wxCommandEvent& event ) { event.Skip(); } virtual void deleteRowHandler( wxCommandEvent& event ) { event.Skip(); } virtual void onSizeGrid( wxSizeEvent& event ) { event.Skip(); } - - + + public: - - PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxTAB_TRAVERSAL ); + + PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~PANEL_SYM_LIB_TABLE_BASE(); - + }; -#endif //__PANEL_SYM_LIB_TABLE_BASE_H__ diff --git a/pcbnew/dialogs/panel_fp_lib_table_base.cpp b/pcbnew/dialogs/panel_fp_lib_table_base.cpp index 6d23daf28a..e6540a74f0 100644 --- a/pcbnew/dialogs/panel_fp_lib_table_base.cpp +++ b/pcbnew/dialogs/panel_fp_lib_table_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -11,65 +11,65 @@ /////////////////////////////////////////////////////////////////////////// -PANEL_FP_LIB_TABLE_BASE::PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +PANEL_FP_LIB_TABLE_BASE::PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) { wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* m_top_sizer; 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, 0 ); m_auinotebook->SetMinSize( wxSize( 720,460 ) ); - + m_global_panel = new wxPanel( m_auinotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* m_global_sizer; m_global_sizer = new wxBoxSizer( wxVERTICAL ); - + wxFlexGridSizer* fgSizer1; fgSizer1 = new wxFlexGridSizer( 1, 2, 0, 0 ); fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticText3 = new wxStaticText( m_global_panel, wxID_ANY, _("File:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText3->Wrap( -1 ); 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, wxTOP|wxRIGHT|wxLEFT, 4 ); - - + + m_global_sizer->Add( fgSizer1, 0, wxEXPAND, 5 ); - + m_global_grid = new WX_GRID( m_global_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - + // Grid m_global_grid->CreateGrid( 1, 5 ); m_global_grid->EnableEditing( true ); m_global_grid->EnableGridLines( true ); m_global_grid->EnableDragGridSize( false ); m_global_grid->SetMargins( 0, 0 ); - + // Columns m_global_grid->AutoSizeColumns(); m_global_grid->EnableDragColMove( false ); m_global_grid->EnableDragColSize( true ); m_global_grid->SetColLabelSize( 22 ); - m_global_grid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_global_grid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_global_grid->EnableDragRowSize( false ); m_global_grid->SetRowLabelSize( 0 ); - m_global_grid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_global_grid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_global_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); m_global_sizer->Add( m_global_grid, 1, wxALL|wxEXPAND, 5 ); - - + + m_global_panel->SetSizer( m_global_sizer ); m_global_panel->Layout(); m_global_sizer->Fit( m_global_panel ); @@ -77,107 +77,107 @@ PANEL_FP_LIB_TABLE_BASE::PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID i m_project_panel = new wxPanel( m_auinotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* m_project_sizer; m_project_sizer = new wxBoxSizer( wxVERTICAL ); - + wxFlexGridSizer* fgSizer2; fgSizer2 = new wxFlexGridSizer( 1, 2, 0, 0 ); fgSizer2->SetFlexibleDirection( wxBOTH ); fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticText4 = new wxStaticText( m_project_panel, wxID_ANY, _("File:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText4->Wrap( -1 ); fgSizer2->Add( m_staticText4, 0, wxLEFT|wxRIGHT|wxTOP, 4 ); - + m_PrjTableFilename = new wxStaticText( m_project_panel, wxID_ANY, _("Table Name"), wxDefaultPosition, wxDefaultSize, 0 ); m_PrjTableFilename->Wrap( -1 ); fgSizer2->Add( m_PrjTableFilename, 0, wxLEFT|wxRIGHT|wxTOP, 4 ); - - + + m_project_sizer->Add( fgSizer2, 0, wxEXPAND, 5 ); - + m_project_grid = new WX_GRID( m_project_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - + // Grid m_project_grid->CreateGrid( 1, 5 ); m_project_grid->EnableEditing( true ); m_project_grid->EnableGridLines( true ); m_project_grid->EnableDragGridSize( false ); m_project_grid->SetMargins( 0, 0 ); - + // Columns m_project_grid->AutoSizeColumns(); m_project_grid->EnableDragColMove( false ); m_project_grid->EnableDragColSize( true ); m_project_grid->SetColLabelSize( 22 ); - m_project_grid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_project_grid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_project_grid->EnableDragRowSize( false ); m_project_grid->SetRowLabelSize( 0 ); - m_project_grid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_project_grid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_project_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); m_project_sizer->Add( m_project_grid, 1, wxALL|wxEXPAND, 5 ); - - + + m_project_panel->SetSizer( m_project_sizer ); m_project_panel->Layout(); m_project_sizer->Fit( m_project_panel ); m_auinotebook->AddPage( m_project_panel, _("Project Specific Libraries"), true, wxNullBitmap ); - + m_top_sizer->Add( m_auinotebook, 6, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + wxBoxSizer* bButtonsSizer; bButtonsSizer = new wxBoxSizer( wxHORIZONTAL ); - - m_append_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW ); + + m_append_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); m_append_button->SetToolTip( _("Add empty row to table") ); - + bButtonsSizer->Add( m_append_button, 0, wxRIGHT|wxLEFT, 5 ); - - m_browse_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW ); + + m_browse_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); m_browse_button->SetToolTip( _("Add existing library to table") ); - + bButtonsSizer->Add( m_browse_button, 0, wxRIGHT, 5 ); - - m_move_up_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW ); + + m_move_up_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); m_move_up_button->SetToolTip( _("Move up") ); - + bButtonsSizer->Add( m_move_up_button, 0, wxRIGHT, 5 ); - - m_move_down_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW ); + + m_move_down_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); m_move_down_button->SetToolTip( _("Move down") ); - + bButtonsSizer->Add( m_move_down_button, 0, wxRIGHT, 5 ); - - + + bButtonsSizer->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - m_delete_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW ); + + m_delete_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); m_delete_button->SetToolTip( _("Remove library from table") ); - + bButtonsSizer->Add( m_delete_button, 0, wxRIGHT|wxLEFT, 5 ); - - + + m_top_sizer->Add( bButtonsSizer, 0, wxEXPAND, 5 ); - - + + bMainSizer->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 WX_GRID( sbSizer1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - + // Grid m_path_subs_grid->CreateGrid( 1, 2 ); - m_path_subs_grid->EnableEditing( true ); + m_path_subs_grid->EnableEditing( false ); m_path_subs_grid->EnableGridLines( true ); m_path_subs_grid->EnableDragGridSize( false ); m_path_subs_grid->SetMargins( 0, 0 ); - + // Columns m_path_subs_grid->SetColSize( 0, 150 ); m_path_subs_grid->SetColSize( 1, 500 ); @@ -185,28 +185,28 @@ PANEL_FP_LIB_TABLE_BASE::PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID i m_path_subs_grid->EnableDragColMove( false ); m_path_subs_grid->EnableDragColSize( true ); m_path_subs_grid->SetColLabelSize( 0 ); - m_path_subs_grid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_path_subs_grid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_path_subs_grid->EnableDragRowSize( true ); m_path_subs_grid->SetRowLabelSize( 0 ); - m_path_subs_grid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_path_subs_grid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_path_subs_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); m_path_subs_grid->SetToolTip( _("This is a read-only table which shows pertinent environment variables.") ); - + sbSizer1->Add( m_path_subs_grid, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + bMainSizer->Add( sbSizer1, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - + + this->SetSizer( bMainSizer ); this->Layout(); - + // Connect Events m_auinotebook->Connect( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEventHandler( PANEL_FP_LIB_TABLE_BASE::pageChangedHandler ), NULL, this ); m_append_button->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_FP_LIB_TABLE_BASE::appendRowHandler ), NULL, this ); @@ -227,5 +227,5 @@ PANEL_FP_LIB_TABLE_BASE::~PANEL_FP_LIB_TABLE_BASE() m_move_down_button->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_FP_LIB_TABLE_BASE::moveDownHandler ), NULL, this ); m_delete_button->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_FP_LIB_TABLE_BASE::deleteRowHandler ), NULL, this ); m_path_subs_grid->Disconnect( wxEVT_SIZE, wxSizeEventHandler( PANEL_FP_LIB_TABLE_BASE::onSizeGrid ), NULL, this ); - + } diff --git a/pcbnew/dialogs/panel_fp_lib_table_base.fbp b/pcbnew/dialogs/panel_fp_lib_table_base.fbp index eb8df649d9..02a7a38453 100644 --- a/pcbnew/dialogs/panel_fp_lib_table_base.fbp +++ b/pcbnew/dialogs/panel_fp_lib_table_base.fbp @@ -1,8 +1,8 @@ - + - + C++ 1 source_name @@ -16,9 +16,9 @@ none 1 panel_fp_lib_table - + . - + 1 1 1 @@ -29,57 +29,57 @@ 0 wxAUI_MGR_DEFAULT - - + + 1 1 impl_virtual - - + + 0 wxID_ANY - - + + PANEL_FP_LIB_TABLE_BASE - + 500,300 ; forward_declare - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bMainSizer wxVERTICAL none @@ -90,12 +90,12 @@ wxID_ANY Libraries by Scope - + m_top_sizer wxVERTICAL 1 none - + 5 wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT @@ -105,89 +105,89 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 0 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 720,460 1 m_auinotebook 1 - - + + protected 1 - + Resizable 1 - - - + + + -1 0 - - - - - - - - - - + + + + + + + + + + pageChangedHandler - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + Global Libraries 0 @@ -195,77 +195,77 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 0 - + 0 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_global_panel 1 - - + + protected 0 - + Resizable 1 - - + + 0 - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + m_global_sizer wxVERTICAL none @@ -276,10 +276,10 @@ 2 wxBOTH - - + + 0 - + fgSizer1 wxFLEX_GROWMODE_SPECIFIED none @@ -294,78 +294,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY File: - + 0 - - + + 0 - + 1 m_staticText3 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -377,78 +377,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Table Name - + 0 - - + + 0 - + 1 m_GblTableFilename 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -462,30 +462,30 @@ 1 1 1 - - - - + + + + 1 0 - - - + + + 1 - - + + wxALIGN_LEFT - + wxALIGN_TOP 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 22 - - wxALIGN_CENTRE + + wxALIGN_CENTER 5 - - + + 1 0 Dock @@ -497,110 +497,110 @@ 0 1 1 - + 0 - - + + 1 0 0 wxID_ANY - - - + + + 0 0 - + 0 - - + + 0 - + 0 m_global_grid 1 - - + + protected 1 - + Fixed - wxALIGN_CENTRE + wxALIGN_CENTER 0 - - wxALIGN_CENTRE - + + wxALIGN_CENTER + 1 1 - + WX_GRID; widgets/wx_grid.h; forward_declare 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + Project Specific Libraries 1 @@ -608,77 +608,77 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 0 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_project_panel 1 - - + + protected 1 - + Resizable 1 - - + + 0 - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + m_project_sizer wxVERTICAL none @@ -689,10 +689,10 @@ 2 wxBOTH - - + + 0 - + fgSizer2 wxFLEX_GROWMODE_SPECIFIED none @@ -707,78 +707,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY File: - + 0 - - + + 0 - + 1 m_staticText4 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -790,78 +790,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Table Name - + 0 - - + + 0 - + 1 m_PrjTableFilename 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -875,30 +875,30 @@ 1 1 1 - - - - + + + + 1 0 - - - + + + 1 - - + + wxALIGN_LEFT - + wxALIGN_TOP 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 22 - - wxALIGN_CENTRE + + wxALIGN_CENTER 5 - - + + 1 0 Dock @@ -910,103 +910,103 @@ 0 1 1 - + 0 - - + + 1 0 0 wxID_ANY - - - + + + 0 0 - + 0 - - + + 0 - + 0 m_project_grid 1 - - + + protected 1 - + Fixed - wxALIGN_CENTRE + wxALIGN_CENTER 0 - - wxALIGN_CENTRE - + + wxALIGN_CENTER + 1 1 - + WX_GRID; widgets/wx_grid.h; forward_declare 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1019,7 +1019,7 @@ wxEXPAND 0 - + bButtonsSizer wxHORIZONTAL none @@ -1032,88 +1032,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY Add Library - + 0 - - + + 0 - + 1 m_append_button 1 - - + + protected 1 - + Resizable - + 1 30,30 - wxBU_AUTODRAW + ; forward_declare 0 Add empty row to table - + wxFILTER_NONE wxDefaultValidator - - - - + + + + appendRowHandler - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1125,88 +1125,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY Browse for Library - + 0 - - + + 0 - + 1 m_browse_button 1 - - + + protected 1 - + Resizable - + 1 30,30 - wxBU_AUTODRAW + ; forward_declare 0 Add existing library to table - + wxFILTER_NONE wxDefaultValidator - - - - + + + + browseLibrariesHandler - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1218,88 +1218,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY Move Up - + 0 - - + + 0 - + 1 m_move_up_button 1 - - + + protected 1 - + Resizable - + 1 30,30 - wxBU_AUTODRAW + ; forward_declare 0 Move up - + wxFILTER_NONE wxDefaultValidator - - - - + + + + moveUpHandler - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1311,88 +1311,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY Move Down - + 0 - - + + 0 - + 1 m_move_down_button 1 - - + + protected 1 - + Resizable - + 1 30,30 - wxBU_AUTODRAW + ; forward_declare 0 Move down - + wxFILTER_NONE wxDefaultValidator - - - - + + + + moveDownHandler - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1414,88 +1414,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY Remove Library - + 0 - - + + 0 - + 1 m_delete_button 1 - - + + protected 1 - + Resizable - + 1 30,30 - wxBU_AUTODRAW + ; forward_declare 0 Remove library from table - + wxFILTER_NONE wxDefaultValidator - - - - + + + + deleteRowHandler - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1509,12 +1509,12 @@ wxID_ANY Path Substitutions: - + sbSizer1 wxVERTICAL 1 none - + 5 wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT @@ -1524,30 +1524,30 @@ 1 1 1 - - - - + + + + 1 0 - - - + + + 1 - - + + wxALIGN_LEFT - + wxALIGN_TOP 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 0 - - wxALIGN_CENTRE + + wxALIGN_CENTER 2 150,500 - + 1 0 Dock @@ -1557,105 +1557,105 @@ 1 0 1 - 1 + 0 1 - + 1 - - + + 1 0 0 wxID_ANY - - - + + + 0 0 - + 0 - - + + 0 - + 1 m_path_subs_grid 1 - - + + protected 1 - + Resizable - wxALIGN_CENTRE + wxALIGN_CENTER 0 - - wxALIGN_CENTRE - + + wxALIGN_CENTER + 1 1 - + WX_GRID; widgets/wx_grid.h; forward_declare 0 This is a read-only table which shows pertinent environment variables. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + onSizeGrid - + diff --git a/pcbnew/dialogs/panel_fp_lib_table_base.h b/pcbnew/dialogs/panel_fp_lib_table_base.h index d25b82a171..74b101be43 100644 --- a/pcbnew/dialogs/panel_fp_lib_table_base.h +++ b/pcbnew/dialogs/panel_fp_lib_table_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __PANEL_FP_LIB_TABLE_BASE_H__ -#define __PANEL_FP_LIB_TABLE_BASE_H__ +#pragma once #include #include @@ -36,10 +35,10 @@ class WX_GRID; /////////////////////////////////////////////////////////////////////////////// /// Class PANEL_FP_LIB_TABLE_BASE /////////////////////////////////////////////////////////////////////////////// -class PANEL_FP_LIB_TABLE_BASE : public wxPanel +class PANEL_FP_LIB_TABLE_BASE : public wxPanel { private: - + protected: wxAuiNotebook* m_auinotebook; wxPanel* m_global_panel; @@ -56,7 +55,7 @@ class PANEL_FP_LIB_TABLE_BASE : public wxPanel wxBitmapButton* m_move_down_button; wxBitmapButton* m_delete_button; WX_GRID* m_path_subs_grid; - + // Virtual event handlers, overide them in your derived class virtual void pageChangedHandler( wxAuiNotebookEvent& event ) { event.Skip(); } virtual void appendRowHandler( wxCommandEvent& event ) { event.Skip(); } @@ -65,13 +64,12 @@ class PANEL_FP_LIB_TABLE_BASE : public wxPanel virtual void moveDownHandler( wxCommandEvent& event ) { event.Skip(); } virtual void deleteRowHandler( wxCommandEvent& event ) { event.Skip(); } virtual void onSizeGrid( wxSizeEvent& event ) { event.Skip(); } - - + + public: - - PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxTAB_TRAVERSAL ); + + PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~PANEL_FP_LIB_TABLE_BASE(); - + }; -#endif //__PANEL_FP_LIB_TABLE_BASE_H__