From d9a90519f926a9b0b6b7a26f765e17e64e4e9570 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Fri, 20 Jan 2023 13:30:17 +0000 Subject: [PATCH] Flatten (and fix layout) of library table managers. --- eeschema/dialogs/panel_sym_lib_table_base.cpp | 69 +- eeschema/dialogs/panel_sym_lib_table_base.fbp | 1831 +++++++++-------- eeschema/dialogs/panel_sym_lib_table_base.h | 4 +- pcbnew/dialogs/panel_fp_lib_table.cpp | 5 - pcbnew/dialogs/panel_fp_lib_table_base.cpp | 52 +- pcbnew/dialogs/panel_fp_lib_table_base.fbp | 1387 +++++++------ pcbnew/dialogs/panel_fp_lib_table_base.h | 5 +- 7 files changed, 1691 insertions(+), 1662 deletions(-) diff --git a/eeschema/dialogs/panel_sym_lib_table_base.cpp b/eeschema/dialogs/panel_sym_lib_table_base.cpp index 8037d9a97c..1d539783d3 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 3.10.0-39-g3487c3cb) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -14,13 +14,10 @@ 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 ); + 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_notebook = new wxNotebook( m_top_sizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_global_panel = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* m_global_sizer; m_global_sizer = new wxBoxSizer( wxVERTICAL ); @@ -123,55 +120,60 @@ PANEL_SYM_LIB_TABLE_BASE::PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID m_project_sizer->Fit( m_project_panel ); m_notebook->AddPage( m_project_panel, _("Project Specific Libraries"), false ); - m_top_sizer->Add( m_notebook, 1, wxEXPAND|wxBOTTOM, 5 ); + bMainSizer->Add( m_notebook, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - wxBoxSizer* bSizer51; - bSizer51 = new wxBoxSizer( wxHORIZONTAL ); + wxBoxSizer* bButtonsSizer; + bButtonsSizer = new wxBoxSizer( wxHORIZONTAL ); - m_append_button = new STD_BITMAP_BUTTON( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); + m_append_button = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_append_button->SetToolTip( _("Add empty row to table") ); - bSizer51->Add( m_append_button, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bButtonsSizer->Add( m_append_button, 0, wxALL, 5 ); - m_browse_button = new STD_BITMAP_BUTTON( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); + m_browse_button = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_browse_button->SetToolTip( _("Add existing library to table") ); - bSizer51->Add( m_browse_button, 0, wxBOTTOM|wxRIGHT, 5 ); + bButtonsSizer->Add( m_browse_button, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); - m_move_up_button = new STD_BITMAP_BUTTON( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); + m_move_up_button = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_move_up_button->SetToolTip( _("Move up") ); - bSizer51->Add( m_move_up_button, 0, wxBOTTOM|wxRIGHT, 5 ); + bButtonsSizer->Add( m_move_up_button, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); - m_move_down_button = new STD_BITMAP_BUTTON( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); + m_move_down_button = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_move_down_button->SetToolTip( _("Move down") ); - bSizer51->Add( m_move_down_button, 0, wxBOTTOM|wxRIGHT, 5 ); + bButtonsSizer->Add( m_move_down_button, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); - bSizer51->Add( 20, 0, 0, wxEXPAND, 5 ); + bButtonsSizer->Add( 20, 0, 0, wxEXPAND, 5 ); - m_delete_button = new STD_BITMAP_BUTTON( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); + m_delete_button = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_delete_button->SetToolTip( _("Remove library from table") ); - bSizer51->Add( m_delete_button, 0, wxBOTTOM|wxRIGHT, 5 ); + bButtonsSizer->Add( m_delete_button, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); - bSizer51->Add( 0, 0, 1, wxEXPAND, 5 ); + bButtonsSizer->Add( 0, 0, 1, wxEXPAND, 5 ); - m_convertLegacy = new wxButton( m_top_sizer->GetStaticBox(), wxID_ANY, _("Migrate Libraries"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer51->Add( m_convertLegacy, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + m_convertLegacy = new wxButton( this, wxID_ANY, _("Migrate Libraries"), wxDefaultPosition, wxDefaultSize, 0 ); + bButtonsSizer->Add( m_convertLegacy, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - m_top_sizer->Add( bSizer51, 0, wxEXPAND, 8 ); + bMainSizer->Add( bButtonsSizer, 0, wxEXPAND|wxALL, 3 ); - bSizer1->Add( m_top_sizer, 1, wxALL|wxEXPAND, 5 ); + bMainSizer->Add( 0, 5, 0, wxEXPAND, 5 ); - wxStaticBoxSizer* sbSizer1; - sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Path Substitutions:") ), wxVERTICAL ); + wxStaticText* stPathsLabel; + stPathsLabel = new wxStaticText( this, wxID_ANY, _("Path Substitutions:"), wxDefaultPosition, wxDefaultSize, 0 ); + stPathsLabel->Wrap( -1 ); + bMainSizer->Add( stPathsLabel, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 8 ); - m_path_subs_grid = new WX_GRID( sbSizer1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + + bMainSizer->Add( 0, 2, 0, wxEXPAND, 5 ); + + m_path_subs_grid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); // Grid m_path_subs_grid->CreateGrid( 1, 2 ); @@ -200,15 +202,12 @@ PANEL_SYM_LIB_TABLE_BASE::PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID 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, wxALL|wxEXPAND, 5 ); + bMainSizer->Add( m_path_subs_grid, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - bSizer1->Add( sbSizer1, 0, wxALL|wxEXPAND, 5 ); - - - this->SetSizer( bSizer1 ); + this->SetSizer( bMainSizer ); this->Layout(); - bSizer1->Fit( this ); + bMainSizer->Fit( this ); // Connect Events this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( PANEL_SYM_LIB_TABLE_BASE::OnUpdateUI ) ); diff --git a/eeschema/dialogs/panel_sym_lib_table_base.fbp b/eeschema/dialogs/panel_sym_lib_table_base.fbp index 21789bc4cf..faf42c1030 100644 --- a/eeschema/dialogs/panel_sym_lib_table_base.fbp +++ b/eeschema/dialogs/panel_sym_lib_table_base.fbp @@ -55,26 +55,222 @@ OnUpdateUI - bSizer1 + bMainSizer wxVERTICAL none 5 - wxALL|wxEXPAND + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 1 - + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 wxID_ANY - Libraries by Scope - - m_top_sizer - wxVERTICAL - 1 - none - - 5 - wxEXPAND|wxBOTTOM - 1 - + + 0 + + + 0 + -1,-1 + 1 + m_notebook + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + + + Global Libraries + 1 + + 1 + 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 + + 5 + wxALL|wxEXPAND + 5 + + 1 + 1 + 1 + 1 + + + + + 0 + 1 + + + + 1 + + + wxALIGN_LEFT + + wxALIGN_TOP + 0 + 1 + wxALIGN_CENTER + 22 + "Active" "Visible" "Nickname" "Library Path" "Library Format" "Options" "Description" + wxALIGN_CENTER + 7 + 48,48,100,240,100,80,240 + + 1 + 0 + Dock + 1 + Left + 0 + 1 + 0 + 0 + 1 + 1 + + 0 + + + 1 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + + + 0 + -1,-1 + 0 + m_global_grid + 1 + + + protected + 1 + + Fixed + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 1 + 1 + + WX_GRID; widgets/wx_grid.h; forward_declare + 0 + + + + + + + + + + + + Project Specific Libraries + 0 + 1 1 1 @@ -85,13 +281,12 @@ - 1 0 1 - 1 + 0 0 Dock 0 @@ -108,9 +303,9 @@ 0 - -1,-1 + 1 - m_notebook + m_project_panel 1 @@ -120,895 +315,753 @@ Resizable 1 + + 0 + + + + wxTAB_TRAVERSAL + + + m_project_sizer + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 2 + + 1 + 1 + 1 + 1 + + + + + 0 + 0 + + + + 1 + + + wxALIGN_LEFT + + wxALIGN_TOP + 0 + 1 + wxALIGN_CENTER + 22 + "Active" "Visible" "Nickname" "Library Path" "Library Format" "Options" "Description" + wxALIGN_CENTER + 7 + 48,48,100,240,100,80,240 + + 1 + 0 + Dock + 1 + Left + 0 + 1 + 0 + 0 + 1 + 1 + + 0 + + + 1 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + + + 0 + 600,-1 + 0 + m_project_grid + 1 + + + protected + 1 + + Fixed + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 1 + 1 + + WX_GRID; widgets/wx_grid.h; forward_declare + 0 + + + + + + + + + + + + + 3 + wxEXPAND|wxALL + 0 + + + bButtonsSizer + wxHORIZONTAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Add Library + + 0 + + 0 + + + 0 + + 1 + m_append_button + 1 + + + protected + 1 + + + + Resizable + 1 + -1,-1 + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Add empty row to table + + wxFILTER_NONE + wxDefaultValidator + + + + + appendRowHandler + + + + 5 + wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Add Library + + 0 + + 0 + + + 0 + + 1 + m_browse_button + 1 + + + protected + 1 + + + + Resizable + 1 + -1,-1 + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Add existing library to table + + wxFILTER_NONE + wxDefaultValidator + + + + + browseLibrariesHandler + + + + 5 + wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Move Up + + 0 + + 0 + + + 0 + + 1 + m_move_up_button + 1 + + + protected + 1 + + + + Resizable + 1 + -1,-1 + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Move up + + wxFILTER_NONE + wxDefaultValidator + + + + + moveUpHandler + + + + 5 + wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Move Down + + 0 + + 0 + + + 0 + + 1 + m_move_down_button + 1 + + + protected + 1 + + + + Resizable + 1 + -1,-1 + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Move down + + wxFILTER_NONE + wxDefaultValidator + + + + + moveDownHandler + + + + 5 + wxEXPAND + 0 + + 0 + protected + 20 + + + + 5 + wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Remove Library + + 0 + + 0 + + + 0 + + 1 + m_delete_button + 1 + + + protected + 1 + + + + Resizable + 1 + -1,-1 + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Remove library from table + + wxFILTER_NONE + wxDefaultValidator + + + + + deleteRowHandler + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Migrate Libraries + + 0 + + 0 + + + 0 + + 1 + m_convertLegacy + 1 + + + protected + 1 + + + + Resizable + 1 + ; ; forward_declare 0 + + wxFILTER_NONE + wxDefaultValidator + - - - Global Libraries - 1 - - 1 - 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 - - 5 - wxALL|wxEXPAND - 5 - - 1 - 1 - 1 - 1 - - - - - 0 - 1 - - - - 1 - - - wxALIGN_LEFT - - wxALIGN_TOP - 0 - 1 - wxALIGN_CENTER - 22 - "Active" "Visible" "Nickname" "Library Path" "Library Format" "Options" "Description" - wxALIGN_CENTER - 7 - 48,48,100,240,100,80,240 - - 1 - 0 - Dock - 1 - Left - 0 - 1 - 0 - 0 - 1 - 1 - - 0 - - - 1 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - - - 0 - -1,-1 - 0 - m_global_grid - 1 - - - protected - 1 - - Fixed - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 1 - 1 - - WX_GRID; widgets/wx_grid.h; forward_declare - 0 - - - - - - - - - - - - Project Specific Libraries - 0 - - 1 - 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 - - 5 - wxALL|wxEXPAND - 2 - - 1 - 1 - 1 - 1 - - - - - 0 - 0 - - - - 1 - - - wxALIGN_LEFT - - wxALIGN_TOP - 0 - 1 - wxALIGN_CENTER - 22 - "Active" "Visible" "Nickname" "Library Path" "Library Format" "Options" "Description" - wxALIGN_CENTER - 7 - 48,48,100,240,100,80,240 - - 1 - 0 - Dock - 1 - Left - 0 - 1 - 0 - 0 - 1 - 1 - - 0 - - - 1 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - - - 0 - 600,-1 - 0 - m_project_grid - 1 - - - protected - 1 - - Fixed - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 1 - 1 - - WX_GRID; widgets/wx_grid.h; forward_declare - 0 - - - - - - - - - - - - - 8 - wxEXPAND - 0 - - - bSizer51 - wxHORIZONTAL - none - - 5 - wxBOTTOM|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Add Library - - 0 - - 0 - - - 0 - - 1 - m_append_button - 1 - - - protected - 1 - - - - Resizable - 1 - -1,-1 - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Add empty row to table - - wxFILTER_NONE - wxDefaultValidator - - - - - appendRowHandler - - - - 5 - wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Add Library - - 0 - - 0 - - - 0 - - 1 - m_browse_button - 1 - - - protected - 1 - - - - Resizable - 1 - -1,-1 - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Add existing library to table - - wxFILTER_NONE - wxDefaultValidator - - - - - browseLibrariesHandler - - - - 5 - wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Move Up - - 0 - - 0 - - - 0 - - 1 - m_move_up_button - 1 - - - protected - 1 - - - - Resizable - 1 - -1,-1 - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Move up - - wxFILTER_NONE - wxDefaultValidator - - - - - moveUpHandler - - - - 5 - wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Move Down - - 0 - - 0 - - - 0 - - 1 - m_move_down_button - 1 - - - protected - 1 - - - - Resizable - 1 - -1,-1 - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Move down - - wxFILTER_NONE - wxDefaultValidator - - - - - moveDownHandler - - - - 5 - wxEXPAND - 0 - - 0 - protected - 20 - - - - 5 - wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Remove Library - - 0 - - 0 - - - 0 - - 1 - m_delete_button - 1 - - - protected - 1 - - - - Resizable - 1 - -1,-1 - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Remove library from table - - wxFILTER_NONE - wxDefaultValidator - - - - - deleteRowHandler - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Migrate Libraries - - 0 - - 0 - - - 0 - - 1 - m_convertLegacy - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - onConvertLegacyLibraries - - + onConvertLegacyLibraries 5 - wxALL|wxEXPAND + wxEXPAND 0 - + + 5 + protected + 0 + + + + 8 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 wxID_ANY Path Substitutions: + 0 + + 0 + + + 0 - sbSizer1 - wxVERTICAL - 1 + 1 + stPathsLabel + 1 + + none - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - 1 - 0 - - - - 1 - - - wxALIGN_LEFT - - wxALIGN_TOP - 0 - 1 - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - 2 - 150,500 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - 0 - 1 - 0 - 1 - - 1 - - - 1 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - - - 0 - - 1 - m_path_subs_grid - 1 - - - protected - 1 - - Resizable - wxALIGN_CENTER - 0 - - 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 - - + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND + 0 + + 2 + protected + 0 + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + 1 + 0 + + + + 1 + + + wxALIGN_LEFT + + wxALIGN_TOP + 0 + 1 + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + 2 + 150,500 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + 0 + 1 + 0 + 1 + + 1 + + + 1 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + + + 0 + + 1 + m_path_subs_grid + 1 + + + protected + 1 + + Resizable + wxALIGN_CENTER + 0 + + 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 cb9c665b4e..d8412bdf22 100644 --- a/eeschema/dialogs/panel_sym_lib_table_base.h +++ b/eeschema/dialogs/panel_sym_lib_table_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -27,7 +27,7 @@ class WX_GRID; #include #include #include -#include +#include /////////////////////////////////////////////////////////////////////////// diff --git a/pcbnew/dialogs/panel_fp_lib_table.cpp b/pcbnew/dialogs/panel_fp_lib_table.cpp index c4b59d232b..9efd887886 100644 --- a/pcbnew/dialogs/panel_fp_lib_table.cpp +++ b/pcbnew/dialogs/panel_fp_lib_table.cpp @@ -501,11 +501,6 @@ PANEL_FP_LIB_TABLE::PANEL_FP_LIB_TABLE( DIALOG_EDIT_LIBRARY_TABLES* aParent, Layout(); - // Hack to make buttons lay out correctly the first time on Mac - wxSize hackSize = m_buttonsPanel->GetSize(); - m_buttonsPanel->SetSize( wxSize( hackSize.x - 5, hackSize.y ) ); - Layout(); - // This is the button only press for the browse button instead of the menu m_browseButton->Bind( wxEVT_BUTTON, &PANEL_FP_LIB_TABLE::browseLibrariesHandler, this ); } diff --git a/pcbnew/dialogs/panel_fp_lib_table_base.cpp b/pcbnew/dialogs/panel_fp_lib_table_base.cpp index a78a8f3766..b5a43ca322 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 3.10.0-39-g3487c3cb) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -17,10 +17,7 @@ PANEL_FP_LIB_TABLE_BASE::PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID i 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_notebook = new wxNotebook( m_top_sizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_global_panel = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* m_global_sizer; m_global_sizer = new wxBoxSizer( wxVERTICAL ); @@ -120,53 +117,51 @@ PANEL_FP_LIB_TABLE_BASE::PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID i m_project_sizer->Fit( m_project_panel ); m_notebook->AddPage( m_project_panel, _("Project Specific Libraries"), false ); - m_top_sizer->Add( m_notebook, 1, wxEXPAND|wxBOTTOM, 5 ); + bMainSizer->Add( m_notebook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - m_buttonsPanel = new wxPanel( m_top_sizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bButtonsSizer; bButtonsSizer = new wxBoxSizer( wxHORIZONTAL ); - m_append_button = new STD_BITMAP_BUTTON( m_buttonsPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); + m_append_button = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_append_button->SetToolTip( _("Add empty row to table") ); - bButtonsSizer->Add( m_append_button, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bButtonsSizer->Add( m_append_button, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); - m_browseButton = new SPLIT_BUTTON( m_buttonsPanel, wxID_ANY, _( "Add Existing" ), wxDefaultPosition ); + m_browseButton = new SPLIT_BUTTON( this, wxID_ANY, _( "Add Existing" ), wxDefaultPosition ); m_browseButton->SetToolTip( _("Add Existing") ); - bButtonsSizer->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); + bButtonsSizer->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - m_move_up_button = new STD_BITMAP_BUTTON( m_buttonsPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); + m_move_up_button = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_move_up_button->SetToolTip( _("Move up") ); - bButtonsSizer->Add( m_move_up_button, 0, wxBOTTOM|wxRIGHT, 5 ); + bButtonsSizer->Add( m_move_up_button, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); - m_move_down_button = new STD_BITMAP_BUTTON( m_buttonsPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); + m_move_down_button = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_move_down_button->SetToolTip( _("Move down") ); - bButtonsSizer->Add( m_move_down_button, 0, wxBOTTOM|wxRIGHT, 5 ); + bButtonsSizer->Add( m_move_down_button, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); bButtonsSizer->Add( 20, 0, 0, wxEXPAND, 5 ); - m_delete_button = new STD_BITMAP_BUTTON( m_buttonsPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); + m_delete_button = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_delete_button->SetToolTip( _("Remove library from table") ); - bButtonsSizer->Add( m_delete_button, 0, wxBOTTOM|wxRIGHT, 5 ); + bButtonsSizer->Add( m_delete_button, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); - m_buttonsPanel->SetSizer( bButtonsSizer ); - m_buttonsPanel->Layout(); - bButtonsSizer->Fit( m_buttonsPanel ); - m_top_sizer->Add( m_buttonsPanel, 0, 0, 5 ); + bMainSizer->Add( bButtonsSizer, 0, wxEXPAND|wxALL, 8 ); + + wxStaticText* stPathsLabel; + stPathsLabel = new wxStaticText( this, wxID_ANY, _("Path Substitutions:"), wxDefaultPosition, wxDefaultSize, 0 ); + stPathsLabel->Wrap( -1 ); + bMainSizer->Add( stPathsLabel, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 8 ); - bMainSizer->Add( m_top_sizer, 1, wxEXPAND|wxALL, 5 ); + bMainSizer->Add( 0, 2, 0, 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 ); + m_path_subs_grid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); // Grid m_path_subs_grid->CreateGrid( 1, 2 ); @@ -195,10 +190,7 @@ PANEL_FP_LIB_TABLE_BASE::PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID i 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, wxALL|wxEXPAND, 5 ); - - - bMainSizer->Add( sbSizer1, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bMainSizer->Add( m_path_subs_grid, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); this->SetSizer( bMainSizer ); diff --git a/pcbnew/dialogs/panel_fp_lib_table_base.fbp b/pcbnew/dialogs/panel_fp_lib_table_base.fbp index adeb80e7e4..7c779a446e 100644 --- a/pcbnew/dialogs/panel_fp_lib_table_base.fbp +++ b/pcbnew/dialogs/panel_fp_lib_table_base.fbp @@ -60,21 +60,66 @@ none 5 - wxEXPAND|wxALL + wxEXPAND|wxRIGHT|wxLEFT 1 - + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 wxID_ANY - Libraries by Scope + + 0 + + + 0 - m_top_sizer - wxVERTICAL - 1 - none - - 5 - wxEXPAND|wxBOTTOM - 1 - + 1 + m_notebook + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + + + Global Libraries + 1 + 1 1 1 @@ -85,13 +130,12 @@ - 1 0 - 1 + 0 - 1 + 0 0 Dock 0 @@ -110,331 +154,122 @@ 0 1 - m_notebook + m_global_panel 1 protected - 1 + 0 Resizable 1 - - ; ; forward_declare + 0 - - - - Global Libraries - 1 - - 1 - 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 - + wxTAB_TRAVERSAL + + + m_global_sizer + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + 0 + 0 + + + + 1 + + + wxALIGN_LEFT + + wxALIGN_TOP + 0 + 1 + wxALIGN_CENTER + 22 + "Active" "Visible" "Nickname" "Library Path" "Library Format" "Options" "Description" + wxALIGN_CENTER + 7 + 48,48,100,240,100,80,240 + + 1 + 0 + Dock + 1 + Left + 0 + 1 + 0 + 0 + 1 + 1 + + 0 + + + 1 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + + + 0 - m_global_sizer - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - 0 - 0 - - - - 1 - - - wxALIGN_LEFT - - wxALIGN_TOP - 0 - 1 - wxALIGN_CENTER - 22 - "Active" "Visible" "Nickname" "Library Path" "Library Format" "Options" "Description" - wxALIGN_CENTER - 7 - 48,48,100,240,100,80,240 - - 1 - 0 - Dock - 1 - Left - 0 - 1 - 0 - 0 - 1 - 1 - - 0 - - - 1 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - - - 0 - - 0 - m_global_grid - 1 - - - protected - 1 - - Fixed - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 1 - 1 - - WX_GRID; widgets/wx_grid.h; forward_declare - 0 - - - - - - - - - - - - Project Specific Libraries - 0 - - 1 - 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 - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - 0 - 0 - - - - 1 - - - wxALIGN_LEFT - - wxALIGN_TOP - 0 - 1 - wxALIGN_CENTER - 22 - "Active" "Visible" "Nickname" "Library Path" "LIbrary Format" "Options" "Description" - wxALIGN_CENTER - 7 - 48,48,100,240,100,80,240 - - 1 - 0 - Dock - 1 - Left - 0 - 1 - 0 - 0 - 1 - 1 - - 0 - - - 1 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - - - 0 - - 0 - m_project_grid - 1 - - - protected - 1 - - Fixed - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 1 - 1 - - WX_GRID; widgets/wx_grid.h; forward_declare - 0 - - - - - - + 0 + m_global_grid + 1 + + + protected + 1 + + Fixed + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 1 + 1 + + WX_GRID; widgets/wx_grid.h; forward_declare + 0 + + + + - - 5 - - 0 + + + Project Specific Libraries + 0 1 1 @@ -451,7 +286,7 @@ 0 1 - 1 + 0 0 Dock 0 @@ -470,7 +305,7 @@ 0 1 - m_buttonsPanel + m_project_panel 1 @@ -480,7 +315,7 @@ Resizable 1 - ; ; forward_declare + 0 @@ -488,14 +323,14 @@ wxTAB_TRAVERSAL - bButtonsSizer - wxHORIZONTAL + m_project_sizer + wxVERTICAL none - + 5 - wxBOTTOM|wxLEFT|wxRIGHT - 0 - + wxALL|wxEXPAND + 1 + 1 1 1 @@ -504,359 +339,79 @@ - 0 + 0 + 0 - 1 + + + wxALIGN_LEFT + + wxALIGN_TOP 0 1 + wxALIGN_CENTER + 22 + "Active" "Visible" "Nickname" "Library Path" "LIbrary Format" "Options" "Description" + wxALIGN_CENTER + 7 + 48,48,100,240,100,80,240 1 - - 0 0 - Dock - 0 + 1 Left + 0 + 1 + 0 + 0 + 1 1 - 1 - + 0 + + 1 0 0 wxID_ANY - Add Library - - 0 + + + + 0 + 0 0 0 - 1 - m_append_button + 0 + m_project_grid 1 protected 1 - - - Resizable + Fixed + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 1 1 - -1,-1 - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + + WX_GRID; widgets/wx_grid.h; forward_declare 0 - Add empty row to table - - wxFILTER_NONE - wxDefaultValidator - + - appendRowHandler - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - SPLIT_BUTTON - 1 - m_browseButton = new SPLIT_BUTTON( m_buttonsPanel, wxID_ANY, _( "Add Existing" ), wxDefaultPosition ); - - 1 - - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - #include <widgets/split_button.h> - - 0 - - - 0 - -1,-1 - 1 - m_browseButton - 1 - - - protected - 1 - - Resizable - - 1 - -1,-1 - ; ; forward_declare - 0 - Add Existing - - - - - - - 5 - wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Move Up - - 0 - - 0 - - - 0 - - 1 - m_move_up_button - 1 - - - protected - 1 - - - - Resizable - 1 - -1,-1 - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Move up - - wxFILTER_NONE - wxDefaultValidator - - - - - moveUpHandler - - - - 5 - wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Move Down - - 0 - - 0 - - - 0 - - 1 - m_move_down_button - 1 - - - protected - 1 - - - - Resizable - 1 - -1,-1 - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Move down - - wxFILTER_NONE - wxDefaultValidator - - - - - moveDownHandler - - - - 5 - wxEXPAND - 0 - - 0 - protected - 20 - - - - 5 - wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Remove Library - - 0 - - 0 - - - 0 - - 1 - m_delete_button - 1 - - - protected - 1 - - - - Resizable - 1 - -1,-1 - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Remove library from table - - wxFILTER_NONE - wxDefaultValidator - - - - - deleteRowHandler @@ -865,22 +420,19 @@ - 5 - wxEXPAND|wxRIGHT|wxLEFT + 8 + wxEXPAND|wxALL 0 - - wxID_ANY - Path Substitutions + - sbSizer1 - wxVERTICAL - 1 + bButtonsSizer + wxHORIZONTAL none - + 5 - wxALL|wxEXPAND - 1 - + wxTOP|wxBOTTOM|wxRIGHT + 0 + 1 1 1 @@ -889,50 +441,34 @@ - 1 - 0 + 0 + 1 - - - wxALIGN_LEFT - - wxALIGN_TOP 0 1 - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - 2 - 150,500 1 + + 0 0 + Dock 0 Left - 0 - 1 - 0 - 1 - 0 1 1 + - - 1 0 0 wxID_ANY - - - - 0 - 0 + Add Library + + 0 0 @@ -940,7 +476,76 @@ 0 1 - m_path_subs_grid + m_append_button + 1 + + + protected + 1 + + + + Resizable + 1 + -1,-1 + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Add empty row to table + + wxFILTER_NONE + wxDefaultValidator + + + + + appendRowHandler + + + + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + SPLIT_BUTTON + 1 + m_browseButton = new SPLIT_BUTTON( this, wxID_ANY, _( "Add Existing" ), wxDefaultPosition ); + + 1 + + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + #include <widgets/split_button.h> + + 0 + + + 0 + -1,-1 + 1 + m_browseButton 1 @@ -948,23 +553,409 @@ 1 Resizable - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 1 + 1 - - WX_GRID; widgets/wx_grid.h; forward_declare + -1,-1 + ; ; forward_declare 0 - This is a read-only table which shows pertinent environment variables. + Add Existing - onSizeGrid + + 5 + wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Move Up + + 0 + + 0 + + + 0 + + 1 + m_move_up_button + 1 + + + protected + 1 + + + + Resizable + 1 + -1,-1 + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Move up + + wxFILTER_NONE + wxDefaultValidator + + + + + moveUpHandler + + + + 5 + wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Move Down + + 0 + + 0 + + + 0 + + 1 + m_move_down_button + 1 + + + protected + 1 + + + + Resizable + 1 + -1,-1 + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Move down + + wxFILTER_NONE + wxDefaultValidator + + + + + moveDownHandler + + + + 5 + wxEXPAND + 0 + + 0 + protected + 20 + + + + 5 + wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Remove Library + + 0 + + 0 + + + 0 + + 1 + m_delete_button + 1 + + + protected + 1 + + + + Resizable + 1 + -1,-1 + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Remove library from table + + wxFILTER_NONE + wxDefaultValidator + + + + + deleteRowHandler + + + + + + 8 + wxTOP|wxRIGHT|wxLEFT|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Path Substitutions: + 0 + + 0 + + + 0 + + 1 + stPathsLabel + 1 + + + none + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND + 0 + + 2 + protected + 0 + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + 1 + 0 + + + + 1 + + + wxALIGN_LEFT + + wxALIGN_TOP + 0 + 1 + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + 2 + 150,500 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + 0 + 1 + 0 + 1 + + 1 + + + 1 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + + + 0 + + 1 + m_path_subs_grid + 1 + + + protected + 1 + + Resizable + wxALIGN_CENTER + 0 + + 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 0bf1742052..5f8859d4cc 100644 --- a/pcbnew/dialogs/panel_fp_lib_table_base.h +++ b/pcbnew/dialogs/panel_fp_lib_table_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -28,7 +28,7 @@ class WX_GRID; #include #include #include -#include +#include /////////////////////////////////////////////////////////////////////////// @@ -46,7 +46,6 @@ class PANEL_FP_LIB_TABLE_BASE : public wxPanel WX_GRID* m_global_grid; wxPanel* m_project_panel; WX_GRID* m_project_grid; - wxPanel* m_buttonsPanel; STD_BITMAP_BUTTON* m_append_button; SPLIT_BUTTON* m_browseButton; STD_BITMAP_BUTTON* m_move_up_button;