diff --git a/eeschema/dialogs/dialog_bom_base.cpp b/eeschema/dialogs/dialog_bom_base.cpp index 22532ee993..0a15347995 100644 --- a/eeschema/dialogs/dialog_bom_base.cpp +++ b/eeschema/dialogs/dialog_bom_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2019) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -76,7 +76,7 @@ DIALOG_BOM_BASE::DIALOG_BOM_BASE( wxWindow* parent, wxWindowID id, const wxStrin bGeneratorButtons->Add( m_buttonEdit, 0, wxRIGHT, 5 ); - bGeneratorButtons->Add( 0, 0, 0, wxRIGHT|wxLEFT, 5 ); + bGeneratorButtons->Add( 20, 0, 0, 0, 5 ); m_buttonDelGenerator = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_buttonDelGenerator->SetToolTip( _("Remove the current generator script from list") ); diff --git a/eeschema/dialogs/dialog_bom_base.fbp b/eeschema/dialogs/dialog_bom_base.fbp index 6acea41fe3..7d5900ae96 100644 --- a/eeschema/dialogs/dialog_bom_base.fbp +++ b/eeschema/dialogs/dialog_bom_base.fbp @@ -575,12 +575,12 @@ 5 - wxRIGHT|wxLEFT + 0 0 protected - 0 + 20 diff --git a/eeschema/dialogs/dialog_bom_base.h b/eeschema/dialogs/dialog_bom_base.h index 60fd4da677..581ffa587e 100644 --- a/eeschema/dialogs/dialog_bom_base.h +++ b/eeschema/dialogs/dialog_bom_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2019) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp b/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp index 4bb67ba264..e10840f8b9 100644 --- a/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp +++ b/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -97,7 +97,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx bButtonSize->Add( m_bpMoveDown, 0, wxRIGHT, 5 ); - bButtonSize->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bButtonSize->Add( 20, 0, 0, wxEXPAND, 5 ); m_bpDelete = new wxBitmapButton( sbSizer4->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_bpDelete->SetToolTip( _("Delete field") ); @@ -283,20 +283,20 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx wxBoxSizer* bFpFilterRightBoxSizer; bFpFilterRightBoxSizer = new wxBoxSizer( wxHORIZONTAL ); - m_addFilterButton = new wxBitmapButton( m_PanelFootprintFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); + m_addFilterButton = new wxBitmapButton( m_PanelFootprintFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_addFilterButton->SetToolTip( _("Add footprint filter") ); bFpFilterRightBoxSizer->Add( m_addFilterButton, 0, wxTOP|wxBOTTOM|wxLEFT, 5 ); - m_editFilterButton = new wxBitmapButton( m_PanelFootprintFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); + m_editFilterButton = new wxBitmapButton( m_PanelFootprintFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_editFilterButton->SetToolTip( _("Edit footprint filter") ); bFpFilterRightBoxSizer->Add( m_editFilterButton, 0, wxALL, 5 ); - bFpFilterRightBoxSizer->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bFpFilterRightBoxSizer->Add( 20, 0, 0, wxEXPAND, 5 ); - m_deleteFilterButton = new wxBitmapButton( m_PanelFootprintFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); + m_deleteFilterButton = new wxBitmapButton( m_PanelFootprintFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_deleteFilterButton->SetToolTip( _("Delete footprint filter") ); bFpFilterRightBoxSizer->Add( m_deleteFilterButton, 0, wxALL, 5 ); diff --git a/eeschema/dialogs/dialog_edit_component_in_lib_base.fbp b/eeschema/dialogs/dialog_edit_component_in_lib_base.fbp index c2d4c5141b..603a2f7ab2 100644 --- a/eeschema/dialogs/dialog_edit_component_in_lib_base.fbp +++ b/eeschema/dialogs/dialog_edit_component_in_lib_base.fbp @@ -14,7 +14,6 @@ dialog_edit_component_in_lib_base 1000 none - 1 DIALOG_EDIT_COMPONENT_IN_LIBRARY_FBP @@ -26,7 +25,6 @@ 1 1 UI - 0 0 0 @@ -310,7 +308,6 @@ - 0 @@ -384,7 +381,6 @@ - 0 @@ -458,7 +454,6 @@ - 0 @@ -521,12 +516,12 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND 0 0 protected - 0 + 20 @@ -542,7 +537,6 @@ - 0 @@ -2155,7 +2149,6 @@ - 0 @@ -2201,7 +2194,7 @@ Resizable 1 - 30,30 + -1,-1 ; forward_declare 0 @@ -2229,7 +2222,6 @@ - 0 @@ -2275,7 +2267,7 @@ Resizable 1 - 30,30 + -1,-1 ; forward_declare 0 @@ -2292,12 +2284,12 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND 0 0 protected - 0 + 20 @@ -2313,7 +2305,6 @@ - 0 @@ -2359,7 +2350,7 @@ Resizable 1 - 30,30 + -1,-1 ; forward_declare 0 @@ -2417,7 +2408,6 @@ - 0 diff --git a/eeschema/dialogs/dialog_edit_component_in_lib_base.h b/eeschema/dialogs/dialog_edit_component_in_lib_base.h index bb5c563c6b..2d0ab086b9 100644 --- a/eeschema/dialogs/dialog_edit_component_in_lib_base.h +++ b/eeschema/dialogs/dialog_edit_component_in_lib_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp index 32b8a053c9..3e2378f361 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 10 2019) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -90,7 +90,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE bButtonSize->Add( m_bpMoveDown, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - bButtonSize->Add( 0, 0, 0, wxEXPAND|wxLEFT|wxRIGHT, 10 ); + bButtonSize->Add( 20, 0, 0, wxEXPAND, 10 ); m_bpDelete = new wxBitmapButton( sbFields->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_bpDelete->SetToolTip( _("Delete field") ); diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp b/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp index c1f357349e..de69832c02 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp @@ -14,7 +14,6 @@ dialog_edit_component_in_schematic_base 1000 none - 1 dialog_edit_component_in_schematic_base @@ -26,7 +25,6 @@ 1 1 UI - 0 0 0 @@ -393,12 +391,12 @@ 10 - wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND 0 0 protected - 0 + 20 diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_base.h b/eeschema/dialogs/dialog_edit_component_in_schematic_base.h index e017e95599..58546725a8 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_base.h +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 10 2019) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp b/eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp index eb6f9c2f43..225d0bf6f7 100644 --- a/eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp +++ b/eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 17 2016) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "widgets/wx_grid.h" @@ -14,19 +14,19 @@ DIALOG_LIB_EDIT_PIN_TABLE_BASE::DIALOG_LIB_EDIT_PIN_TABLE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - + wxBoxSizer* top_sizer; top_sizer = new wxBoxSizer( wxVERTICAL ); - + m_grid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - + // Grid m_grid->CreateGrid( 5, 10 ); m_grid->EnableEditing( true ); m_grid->EnableGridLines( true ); m_grid->EnableDragGridSize( false ); m_grid->SetMargins( 0, 0 ); - + // Columns m_grid->SetColSize( 0, 66 ); m_grid->SetColSize( 1, 84 ); @@ -51,78 +51,72 @@ DIALOG_LIB_EDIT_PIN_TABLE_BASE::DIALOG_LIB_EDIT_PIN_TABLE_BASE( wxWindow* parent m_grid->SetColLabelValue( 7, _("Length") ); m_grid->SetColLabelValue( 8, _("X Position") ); m_grid->SetColLabelValue( 9, _("Y Position") ); - m_grid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_grid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_grid->EnableDragRowSize( false ); m_grid->SetRowLabelSize( 0 ); - m_grid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_grid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); m_grid->SetMinSize( wxSize( 720,240 ) ); - + top_sizer->Add( m_grid, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 10 ); - + wxBoxSizer* bSizer2; bSizer2 = new wxBoxSizer( wxHORIZONTAL ); - - m_addButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); - m_addButton->SetMinSize( wxSize( 30,29 ) ); - + + m_addButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bSizer2->Add( m_addButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - - - bSizer2->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - m_deleteButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); - m_deleteButton->SetMinSize( wxSize( 30,29 ) ); - + + + bSizer2->Add( 20, 0, 0, wxEXPAND, 5 ); + + m_deleteButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bSizer2->Add( m_deleteButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 10 ); - + m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); bSizer2->Add( m_staticline1, 0, wxEXPAND|wxALL, 5 ); - + m_cbGroup = new wxCheckBox( this, wxID_ANY, _("Group by name"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer2->Add( m_cbGroup, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 ); - - m_refreshButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); - m_refreshButton->SetMinSize( wxSize( 30,29 ) ); - + + m_refreshButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bSizer2->Add( m_refreshButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 10 ); - + m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); bSizer2->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 ); - + m_staticText1 = new wxStaticText( this, wxID_ANY, _("Pin numbers:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText1->Wrap( -1 ); bSizer2->Add( m_staticText1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 ); - + m_summary = new wxStaticText( this, wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); m_summary->Wrap( -1 ); bSizer2->Add( m_summary, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_Buttons = new wxStdDialogButtonSizer(); m_ButtonsOK = new wxButton( this, wxID_OK ); m_Buttons->AddButton( m_ButtonsOK ); m_ButtonsCancel = new wxButton( this, wxID_CANCEL ); m_Buttons->AddButton( m_ButtonsCancel ); m_Buttons->Realize(); - + bSizer2->Add( m_Buttons, 0, wxEXPAND, 5 ); - - + + top_sizer->Add( bSizer2, 0, wxEXPAND|wxLEFT, 5 ); - - + + this->SetSizer( top_sizer ); this->Layout(); top_sizer->Fit( this ); - + this->Centre( wxBOTH ); - + // Connect Events this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_LIB_EDIT_PIN_TABLE_BASE::OnClose ) ); this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_LIB_EDIT_PIN_TABLE_BASE::OnUpdateUI ) ); @@ -147,5 +141,5 @@ DIALOG_LIB_EDIT_PIN_TABLE_BASE::~DIALOG_LIB_EDIT_PIN_TABLE_BASE() m_cbGroup->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LIB_EDIT_PIN_TABLE_BASE::OnRebuildRows ), NULL, this ); m_refreshButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_EDIT_PIN_TABLE_BASE::OnRebuildRows ), NULL, this ); m_ButtonsCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_EDIT_PIN_TABLE_BASE::OnCancel ), NULL, this ); - + } diff --git a/eeschema/dialogs/dialog_lib_edit_pin_table_base.fbp b/eeschema/dialogs/dialog_lib_edit_pin_table_base.fbp index 85692afc0c..cd79a620bb 100644 --- a/eeschema/dialogs/dialog_lib_edit_pin_table_base.fbp +++ b/eeschema/dialogs/dialog_lib_edit_pin_table_base.fbp @@ -2,7 +2,7 @@ - + C++ 1 source_name @@ -14,11 +14,12 @@ dialog_lib_edit_pin_table_base 1000 none + 1 dialog_lib_edit_pin_table - + . - + 1 1 1 @@ -29,67 +30,33 @@ 0 wxAUI_MGR_DEFAULT - + wxBOTH - + 1 1 decl_pure_virtual - - - + + + 0 wxID_ANY - - + + DIALOG_LIB_EDIT_PIN_TABLE_BASE - + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Pin Table - - - - - - - - - - - - - + + + + OnClose - - - - - - - - - - - - - - - - - - - - - - - - - OnUpdateUI - + top_sizer wxVERTICAL none @@ -102,20 +69,20 @@ 1 1 1 - - - - + + + + 0 0 - - - + + + 1 - - + + wxALIGN_LEFT - + wxALIGN_TOP 0 1 @@ -125,7 +92,7 @@ wxALIGN_CENTER 10 66,84,140,140,100,110,110,84,84,84 - + 1 0 Dock @@ -137,103 +104,50 @@ 0 1 1 - + 1 - - + + 1 0 0 wxID_ANY - - - + + + 0 0 - + 0 - - + + 0 720,240 1 m_grid 1 - - + + protected 1 - + Resizable wxALIGN_CENTER 0 - + wxALIGN_CENTER - + 5 1 - + WX_GRID; widgets/wx_grid.h; forward_declare 0 - - - - - - - + + + + OnCellEdited - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnSize - @@ -241,7 +155,7 @@ wxEXPAND|wxLEFT 0 - + bSizer2 wxHORIZONTAL none @@ -254,98 +168,78 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 + 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - wxID_ANY Add Pin - + + 0 + 0 - + 22,22 0 - 30,29 + -1,-1 1 m_addButton 1 - - + + protected 1 - + + + Resizable - 1 - + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnAddRow - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND 0 0 protected - 0 + 20 @@ -357,88 +251,68 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 + 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - wxID_ANY Delete Pin - + + 0 + 0 - + -1,-1 0 - 30,29 + -1,-1 1 m_deleteButton 1 - - + + protected 1 - + + + Resizable - 1 - + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnDeleteRow - - - - - - - - - - - - - - - - - - - - - - - @@ -450,76 +324,53 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_staticline1 1 - - + + protected 1 - + Resizable 1 - + wxLI_VERTICAL ; forward_declare 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -531,83 +382,60 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Group by name - + 0 - - + + 0 - + 1 m_cbGroup 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - + + + + OnRebuildRows - - - - - - - - - - - - - - - - - - - - - - @@ -619,88 +447,68 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 + 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - wxID_ANY Refresh Grouping - + + 0 + 0 - - + + 0 - 30,29 + -1,-1 1 m_refreshButton 1 - - + + protected 1 - + + + Resizable - 1 - + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnRebuildRows - - - - - - - - - - - - - - - - - - - - - - - @@ -712,76 +520,53 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_staticline2 1 - - + + protected 1 - + Resizable 1 - + wxLI_VERTICAL ; forward_declare 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -793,78 +578,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Pin numbers: - + 0 + 0 - - + + 0 - + 1 m_staticText1 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -876,78 +639,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY 0 - + 0 + 0 - - + + 0 - + 1 m_summary 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -963,17 +704,10 @@ 1 0 0 - + m_Buttons protected - OnCancel - - - - - - diff --git a/eeschema/dialogs/dialog_lib_edit_pin_table_base.h b/eeschema/dialogs/dialog_lib_edit_pin_table_base.h index 7da1609e18..972f2605b2 100644 --- a/eeschema/dialogs/dialog_lib_edit_pin_table_base.h +++ b/eeschema/dialogs/dialog_lib_edit_pin_table_base.h @@ -1,17 +1,15 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 17 2016) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __DIALOG_LIB_EDIT_PIN_TABLE_BASE_H__ -#define __DIALOG_LIB_EDIT_PIN_TABLE_BASE_H__ +#pragma once #include #include #include -class DIALOG_SHIM; class WX_GRID; #include "dialog_shim.h" @@ -21,10 +19,10 @@ class WX_GRID; #include #include #include +#include #include #include #include -#include #include #include #include @@ -41,7 +39,7 @@ class WX_GRID; class DIALOG_LIB_EDIT_PIN_TABLE_BASE : public DIALOG_SHIM { private: - + protected: WX_GRID* m_grid; wxBitmapButton* m_addButton; @@ -55,7 +53,7 @@ class DIALOG_LIB_EDIT_PIN_TABLE_BASE : public DIALOG_SHIM wxStdDialogButtonSizer* m_Buttons; wxButton* m_ButtonsOK; wxButton* m_ButtonsCancel; - + // Virtual event handlers, overide them in your derived class virtual void OnClose( wxCloseEvent& event ) = 0; virtual void OnUpdateUI( wxUpdateUIEvent& event ) = 0; @@ -65,13 +63,12 @@ class DIALOG_LIB_EDIT_PIN_TABLE_BASE : public DIALOG_SHIM virtual void OnDeleteRow( wxCommandEvent& event ) = 0; virtual void OnRebuildRows( wxCommandEvent& event ) = 0; virtual void OnCancel( wxCommandEvent& event ) = 0; - - + + public: - - DIALOG_LIB_EDIT_PIN_TABLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Pin Table"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_LIB_EDIT_PIN_TABLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Pin Table"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_LIB_EDIT_PIN_TABLE_BASE(); - + }; -#endif //__DIALOG_LIB_EDIT_PIN_TABLE_BASE_H__ diff --git a/eeschema/dialogs/dialog_migrate_buses_base.cpp b/eeschema/dialogs/dialog_migrate_buses_base.cpp index c98178da85..1531522535 100644 --- a/eeschema/dialogs/dialog_migrate_buses_base.cpp +++ b/eeschema/dialogs/dialog_migrate_buses_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 1 2018) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -18,22 +18,20 @@ DIALOG_MIGRATE_BUSES_BASE::DIALOG_MIGRATE_BUSES_BASE( wxWindow* parent, wxWindow m_staticText5 = new wxStaticText( this, wxID_ANY, _("This schematic has one or more buses with more than one label.\nThis was allowed in previous KiCad versions but is no longer permitted."), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText5->Wrap( 480 ); - main_sizer->Add( m_staticText5, 0, wxALL|wxEXPAND, 5 ); + main_sizer->Add( m_staticText5, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); m_staticText7 = new wxStaticText( this, wxID_ANY, _("Please select a new name for each of the buses below.\nA name has been suggested for you based on the labels attached to the bus."), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText7->Wrap( 480 ); - m_staticText7->SetMinSize( wxSize( -1,60 ) ); - - main_sizer->Add( m_staticText7, 0, wxALL|wxEXPAND, 5 ); + main_sizer->Add( m_staticText7, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); m_migration_list = new wxListView( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES ); m_migration_list->SetMinSize( wxSize( 460,100 ) ); - main_sizer->Add( m_migration_list, 1, wxALL|wxEXPAND, 5 ); + main_sizer->Add( m_migration_list, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); m_staticText6 = new wxStaticText( this, wxID_ANY, _("Proposed new name:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText6->Wrap( -1 ); - main_sizer->Add( m_staticText6, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + main_sizer->Add( m_staticText6, 0, wxTOP|wxRIGHT|wxLEFT, 10 ); wxBoxSizer* bSizer7; bSizer7 = new wxBoxSizer( wxHORIZONTAL ); @@ -42,13 +40,16 @@ DIALOG_MIGRATE_BUSES_BASE::DIALOG_MIGRATE_BUSES_BASE( wxWindow* parent, wxWindow m_cb_new_name->SetMinSize( wxSize( 300,-1 ) ); m_cb_new_name->SetMaxSize( wxSize( 460,-1 ) ); - bSizer7->Add( m_cb_new_name, 1, wxALL|wxEXPAND, 5 ); + bSizer7->Add( m_cb_new_name, 1, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); m_btn_accept = new wxButton( this, wxID_ANY, _("Accept Name"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer7->Add( m_btn_accept, 0, wxALL, 5 ); + bSizer7->Add( m_btn_accept, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - main_sizer->Add( bSizer7, 0, wxEXPAND, 5 ); + main_sizer->Add( bSizer7, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + main_sizer->Add( m_staticline1, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 ); m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); diff --git a/eeschema/dialogs/dialog_migrate_buses_base.fbp b/eeschema/dialogs/dialog_migrate_buses_base.fbp index 2d61195b39..e2701ca6b8 100644 --- a/eeschema/dialogs/dialog_migrate_buses_base.fbp +++ b/eeschema/dialogs/dialog_migrate_buses_base.fbp @@ -59,8 +59,8 @@ wxVERTICAL none - 5 - wxALL|wxEXPAND + 10 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -120,8 +120,8 @@ - 5 - wxALL|wxEXPAND + 10 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -158,7 +158,7 @@ 0 - -1,60 + -1,-1 1 m_staticText7 1 @@ -181,8 +181,8 @@ - 5 - wxALL|wxEXPAND + 10 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 1 1 @@ -243,7 +243,7 @@ - 5 + 10 wxTOP|wxRIGHT|wxLEFT 0 @@ -305,7 +305,7 @@ 5 - wxEXPAND + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 @@ -314,7 +314,7 @@ none 5 - wxALL|wxEXPAND + wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL 1 1 @@ -379,7 +379,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT 0 1 @@ -451,6 +451,64 @@ + + 10 + wxEXPAND|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline1 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + ; ; forward_declare + 0 + + + + + + 5 wxEXPAND|wxALL diff --git a/eeschema/dialogs/dialog_migrate_buses_base.h b/eeschema/dialogs/dialog_migrate_buses_base.h index 7487bf6401..e58542dc0d 100644 --- a/eeschema/dialogs/dialog_migrate_buses_base.h +++ b/eeschema/dialogs/dialog_migrate_buses_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 1 2018) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -24,6 +24,7 @@ #include #include #include +#include #include /////////////////////////////////////////////////////////////////////////// @@ -43,6 +44,7 @@ class DIALOG_MIGRATE_BUSES_BASE : public DIALOG_SHIM wxStaticText* m_staticText6; wxComboBox* m_cb_new_name; wxButton* m_btn_accept; + wxStaticLine* m_staticline1; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; diff --git a/eeschema/dialogs/dialog_sch_sheet_props_base.cpp b/eeschema/dialogs/dialog_sch_sheet_props_base.cpp index e983ca2ca5..0246111b0c 100644 --- a/eeschema/dialogs/dialog_sch_sheet_props_base.cpp +++ b/eeschema/dialogs/dialog_sch_sheet_props_base.cpp @@ -92,12 +92,12 @@ DIALOG_SCH_SHEET_PROPS_BASE::DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWi bButtonSize->Add( m_bpMoveDown, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - bButtonSize->Add( 0, 0, 0, wxEXPAND|wxLEFT|wxRIGHT, 10 ); + bButtonSize->Add( 20, 0, 0, wxEXPAND, 10 ); m_bpDelete = new wxBitmapButton( sbFields->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_bpDelete->SetToolTip( _("Delete field") ); - bButtonSize->Add( m_bpDelete, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + bButtonSize->Add( m_bpDelete, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); bButtonSize->Add( 0, 0, 1, wxEXPAND, 5 ); diff --git a/eeschema/dialogs/dialog_sch_sheet_props_base.fbp b/eeschema/dialogs/dialog_sch_sheet_props_base.fbp index 4e5c7a2b97..38c5fe3704 100644 --- a/eeschema/dialogs/dialog_sch_sheet_props_base.fbp +++ b/eeschema/dialogs/dialog_sch_sheet_props_base.fbp @@ -400,17 +400,17 @@ 10 - wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND 0 0 protected - 0 + 20 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 diff --git a/eeschema/dialogs/dialog_signal_list_base.cpp b/eeschema/dialogs/dialog_signal_list_base.cpp index f015c26b4a..7626a2be95 100644 --- a/eeschema/dialogs/dialog_signal_list_base.cpp +++ b/eeschema/dialogs/dialog_signal_list_base.cpp @@ -19,14 +19,20 @@ DIALOG_SIGNAL_LIST_BASE::DIALOG_SIGNAL_LIST_BASE( wxWindow* parent, wxWindowID i m_signals = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_EXTENDED|wxLB_NEEDED_SB|wxLB_SORT ); m_signals->SetMinSize( wxSize( 450,400 ) ); - bSizer6->Add( m_signals, 1, wxALL|wxEXPAND, 5 ); + bSizer6->Add( m_signals, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); + + wxBoxSizer* bSizer2; + bSizer2 = new wxBoxSizer( wxVERTICAL ); m_staticText1 = new wxStaticText( this, wxID_ANY, _("Add signal by name:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText1->Wrap( -1 ); - bSizer6->Add( m_staticText1, 0, wxALL, 5 ); + bSizer2->Add( m_staticText1, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_signalEntry = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); - bSizer6->Add( m_signalEntry, 0, wxALL|wxEXPAND, 5 ); + bSizer2->Add( m_signalEntry, 0, wxALL|wxEXPAND, 5 ); + + + bSizer6->Add( bSizer2, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); diff --git a/eeschema/dialogs/dialog_signal_list_base.fbp b/eeschema/dialogs/dialog_signal_list_base.fbp index 8fdca5f295..5eb2f5fd00 100644 --- a/eeschema/dialogs/dialog_signal_list_base.fbp +++ b/eeschema/dialogs/dialog_signal_list_base.fbp @@ -59,8 +59,8 @@ wxVERTICAL none - 5 - wxALL|wxEXPAND + 10 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 1 1 @@ -124,128 +124,139 @@ 5 - wxALL + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Add signal by name: - 0 - - 0 - - - 0 + - 1 - m_staticText1 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_signalEntry - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_PROCESS_ENTER - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - onSignalAdd + bSizer2 + wxVERTICAL + none + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Add signal by name: + 0 + + 0 + + + 0 + + 1 + m_staticText1 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_signalEntry + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_PROCESS_ENTER + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + onSignalAdd + + diff --git a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp index 5f506e4dc1..9fd8983cc2 100644 --- a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp +++ b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2019) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -65,7 +65,7 @@ PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE::PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE bSizer10->Add( m_addFieldButton, 0, wxTOP|wxRIGHT, 5 ); - bSizer10->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bSizer10->Add( 20, 0, 0, wxEXPAND, 5 ); m_deleteFieldButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bSizer10->Add( m_deleteFieldButton, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); diff --git a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.fbp b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.fbp index 156e3e34b3..ef63091df4 100644 --- a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.fbp +++ b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.fbp @@ -306,12 +306,12 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND 0 0 protected - 0 + 20 diff --git a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.h b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.h index 593e0d2cbd..20653729cd 100644 --- a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.h +++ b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2019) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/dialogs/panel_sym_lib_table_base.cpp b/eeschema/dialogs/panel_sym_lib_table_base.cpp index d8f444bf73..80377f027e 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.9.0 Jun 3 2020) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -154,7 +154,7 @@ PANEL_SYM_LIB_TABLE_BASE::PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID bSizer51->Add( m_move_down_button, 0, wxBOTTOM|wxRIGHT, 5 ); - bSizer51->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bSizer51->Add( 20, 0, 0, wxEXPAND, 5 ); m_delete_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_delete_button->SetToolTip( _("Remove library from table") ); diff --git a/eeschema/dialogs/panel_sym_lib_table_base.fbp b/eeschema/dialogs/panel_sym_lib_table_base.fbp index a38c1ecf3a..b0d03a7e69 100644 --- a/eeschema/dialogs/panel_sym_lib_table_base.fbp +++ b/eeschema/dialogs/panel_sym_lib_table_base.fbp @@ -14,7 +14,6 @@ panel_sym_lib_table_base 1000 none - 1 sym_lib_table @@ -26,7 +25,6 @@ 1 1 UI - 0 0 0 @@ -733,7 +731,6 @@ - 0 @@ -807,7 +804,6 @@ - 0 @@ -881,7 +877,6 @@ - 0 @@ -955,7 +950,6 @@ - 0 @@ -1018,12 +1012,12 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND 0 0 protected - 0 + 20 @@ -1039,7 +1033,6 @@ - 0 diff --git a/eeschema/dialogs/panel_sym_lib_table_base.h b/eeschema/dialogs/panel_sym_lib_table_base.h index d40e08ed4c..187d1a7029 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.9.0 Jun 3 2020) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp index 085766784c..51c30a8956 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp @@ -85,7 +85,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow bButtonSize->Add( m_bpAdd, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - bButtonSize->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bButtonSize->Add( 20, 0, 0, wxEXPAND, 5 ); m_bpDelete = new wxBitmapButton( sbSizerTexts->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bButtonSize->Add( m_bpDelete, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); @@ -454,7 +454,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow bSizer3DButtons->Add( m_buttonBrowse, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - bSizer3DButtons->Add( 10, 0, 0, wxEXPAND|wxLEFT, 5 ); + bSizer3DButtons->Add( 20, 0, 0, wxEXPAND, 5 ); m_buttonRemove = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); bSizer3DButtons->Add( m_buttonRemove, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp index 33a21117c1..e90a3b507b 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp @@ -178,11 +178,11 @@ m_PanelPropertiesBoxSizer wxVERTICAL none - + 5 wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 1 - + wxID_ANY @@ -279,11 +279,11 @@ OnGridSize - + 5 wxEXPAND 0 - + bButtonSize wxHORIZONTAL @@ -363,12 +363,12 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND 0 0 protected - 0 + 20 @@ -448,11 +448,11 @@ - + 5 wxEXPAND 0 - + bSizerProperties wxHORIZONTAL @@ -3519,11 +3519,11 @@ - + 3D Settings 0 - + 1 1 1 @@ -3574,16 +3574,16 @@ wxTAB_TRAVERSAL - + bSizerMain3D wxVERTICAL protected - + 5 wxEXPAND|wxRIGHT|wxLEFT 4 - + wxID_ANY @@ -3681,11 +3681,11 @@ On3DModelSelected - + 5 wxEXPAND 0 - + bSizer3DButtons wxHORIZONTAL @@ -3838,12 +3838,12 @@ 5 - wxEXPAND|wxLEFT + wxEXPAND 0 0 protected - 10 + 20 diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp index 28c44aba8f..996b5e50dd 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -86,7 +86,7 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare bButtonSize->Add( m_bpAdd, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - bButtonSize->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bButtonSize->Add( 20, 0, 0, wxEXPAND, 5 ); m_bpDelete = new wxBitmapButton( sbSizerTexts->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bButtonSize->Add( m_bpDelete, 0, wxRIGHT, 5 ); @@ -356,7 +356,7 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare bSizer3DButtons->Add( m_button3DShapeBrowse, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - bSizer3DButtons->Add( 0, 0, 0, wxLEFT|wxRIGHT, 5 ); + bSizer3DButtons->Add( 20, 0, 0, 0, 5 ); m_button3DShapeRemove = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); bSizer3DButtons->Add( m_button3DShapeRemove, 0, wxALIGN_CENTER_VERTICAL, 5 ); diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp index c73041b459..a36ea0de5f 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp @@ -14,7 +14,6 @@ dialog_edit_footprint_for_fp_editor_base 1000 none - 1 dialog_edit_footprint_for_fp_editor_base @@ -26,7 +25,6 @@ 1 1 UI - 0 0 0 @@ -302,7 +300,6 @@ - 0 @@ -365,12 +362,12 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND 0 0 protected - 0 + 20 @@ -386,7 +383,6 @@ - 0 @@ -2756,7 +2752,6 @@ - 0 @@ -2830,7 +2825,6 @@ - 0 @@ -2893,12 +2887,12 @@ 5 - wxLEFT|wxRIGHT + 0 0 protected - 0 + 20 @@ -2914,7 +2908,6 @@ - 0 @@ -2998,7 +2991,6 @@ - 0 diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h index 87d559b172..47dcfad6f1 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_footprint_wizard_list_base.fbp b/pcbnew/dialogs/dialog_footprint_wizard_list_base.fbp index 434ffa7dde..5adaa91b7c 100644 --- a/pcbnew/dialogs/dialog_footprint_wizard_list_base.fbp +++ b/pcbnew/dialogs/dialog_footprint_wizard_list_base.fbp @@ -1,8 +1,8 @@ - + - + C++ 1 source_name @@ -14,12 +14,12 @@ dialog_footprint_wizard_list_base 1000 none - + 1 DIALOG_FOOTPRINT_WIZARD_LIST_BASE - + . - + 1 1 1 @@ -30,80 +30,80 @@ 0 wxAUI_MGR_DEFAULT - + wxBOTH - + 1 1 impl_virtual - - - + + + 0 wxID_ANY - + -1,-1 DIALOG_FOOTPRINT_WIZARD_LIST_BASE - + 525,374 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Footprint Generators - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bSizerMain wxVERTICAL none @@ -116,88 +116,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_notebook 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + Available Footprint Generators 1 @@ -205,84 +205,84 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 550,300 1 m_panelGenerators 1 - - + + protected 1 - + Resizable 1 - - + + 0 - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bSizerpanelGen wxVERTICAL none @@ -295,30 +295,30 @@ 1 1 1 - - - - + + + + 0 1 - - - + + + 1 - - + + wxALIGN_LEFT - + wxALIGN_TOP 0 1 wxALIGN_LEFT 20 "" "Name" "Description" - wxALIGN_CENTRE + wxALIGN_CENTER 3 40,160,325 - + 1 0 Dock @@ -330,117 +330,117 @@ 1 0 1 - + 1 - - + + 1 0 0 wxID_ANY - - - + + + 0 0 - + 0 - - + + 0 485,120 1 m_footprintGeneratorsGrid 1 - - + + protected 1 - + Resizable - wxALIGN_CENTRE + wxALIGN_CENTER 0 - - wxALIGN_CENTRE - + + wxALIGN_CENTER + 0 1 - - + + 0 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + OnCellFpGeneratorClick OnCellFpGeneratorDoubleClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + Messages 0 @@ -448,84 +448,84 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_panelInfo 1 - - + + protected 1 - + Resizable 1 - - + + 0 - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + m_bsizerPanelInfo wxVERTICAL none @@ -538,86 +538,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Search paths: 0 - + 0 - - + + 0 - + 1 m_staticTextSearchPaths 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -629,93 +629,93 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 -1,-1 1 m_tcSearchPaths 1 - - + + protected 1 - + Resizable 1 - + wxTE_MULTILINE|wxTE_READONLY - + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -727,86 +727,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Not loadable python scripts: 0 - + 0 - - + + 0 - + 1 m_staticTextNotLoaded 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -818,93 +818,93 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 -1,-1 1 m_tcNotLoaded 1 - - + + protected 1 - + Resizable 1 - + wxTE_MULTILINE|wxTE_READONLY - + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -916,98 +916,98 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 - + 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 wxID_ANY Show Trace - + 0 - + 0 - - + + 0 - + 1 m_buttonShowTrace 1 - - + + protected 1 - - - + + + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - + + + + + + + + + + onShowTrace - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -1020,7 +1020,7 @@ wxEXPAND|wxLEFT 0 - + bSizerLower wxHORIZONTAL none @@ -1033,98 +1033,98 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 - + 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 wxID_ANY Update Python Modules - + 0 - + 0 - - + + 0 - + 1 m_buttonUpdateModules 1 - - + + protected 1 - - - + + + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - + + + + + + + + + + onUpdatePythonModulesClick - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -1150,17 +1150,17 @@ 1 0 0 - + m_sdbSizer protected - - - - - - - - + + + + + + + + @@ -1170,80 +1170,80 @@ 0 wxAUI_MGR_DEFAULT - + wxBOTH - + 1 1 impl_virtual - - - + + + 0 wxID_ANY - + -1,-1 DIALOG_FOOTPRINT_WIZARD_LOG - + 646,361 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Traceback of Python Script Errors - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bSizerMain wxVERTICAL none @@ -1256,93 +1256,93 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 550,300 1 m_Message 1 - - + + public 1 - + Resizable 1 - + wxTE_MULTILINE|wxTE_READONLY - + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1358,17 +1358,17 @@ 1 0 0 - + m_sdbSizer protected - - - - - - - - + + + + + + + + diff --git a/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp b/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp index e0fe0c99b6..a9523f229c 100644 --- a/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp +++ b/pcbnew/dialogs/dialog_fp_plugin_options_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! @@ -14,26 +14,26 @@ DIALOG_FP_PLUGIN_OPTIONS_BASE::DIALOG_FP_PLUGIN_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - + wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* m_horizontal_sizer; m_horizontal_sizer = new wxBoxSizer( wxHORIZONTAL ); - + wxStaticBoxSizer* m_grid_sizer; m_grid_sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Plugin Options") ), wxVERTICAL ); - - m_grid_sizer->SetMinSize( wxSize( 400,300 ) ); + + m_grid_sizer->SetMinSize( wxSize( 400,300 ) ); m_grid = new WX_GRID( m_grid_sizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE|wxVSCROLL ); - + // Grid m_grid->CreateGrid( 1, 2 ); m_grid->EnableEditing( true ); m_grid->EnableGridLines( true ); m_grid->EnableDragGridSize( false ); m_grid->SetMargins( 0, 0 ); - + // Columns m_grid->SetColSize( 0, 120 ); m_grid->SetColSize( 1, 240 ); @@ -42,78 +42,78 @@ DIALOG_FP_PLUGIN_OPTIONS_BASE::DIALOG_FP_PLUGIN_OPTIONS_BASE( wxWindow* parent, m_grid->SetColLabelSize( 22 ); m_grid->SetColLabelValue( 0, _("Option") ); m_grid->SetColLabelValue( 1, _("Value") ); - m_grid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_grid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_grid->EnableDragRowSize( false ); m_grid->SetRowLabelSize( 0 ); - m_grid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_grid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); m_grid_sizer->Add( m_grid, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - + wxBoxSizer* bButtonsSizer; bButtonsSizer = new wxBoxSizer( wxHORIZONTAL ); - - m_append_button = new wxBitmapButton( m_grid_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 ); + + m_append_button = new wxBitmapButton( m_grid_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); bButtonsSizer->Add( m_append_button, 0, wxRIGHT|wxLEFT, 5 ); - - - bButtonsSizer->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - m_delete_button = new wxBitmapButton( m_grid_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 ); + + + bButtonsSizer->Add( 20, 0, 0, wxEXPAND, 5 ); + + m_delete_button = new wxBitmapButton( m_grid_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); bButtonsSizer->Add( m_delete_button, 0, wxRIGHT|wxLEFT, 5 ); - - + + m_grid_sizer->Add( bButtonsSizer, 0, wxEXPAND|wxTOP, 5 ); - - + + m_horizontal_sizer->Add( m_grid_sizer, 3, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - + wxStaticBoxSizer* m_options_sizer; m_options_sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Option Choices") ), wxVERTICAL ); - - m_listbox = new wxListBox( m_options_sizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_ALWAYS_SB|wxLB_SINGLE ); + + m_listbox = new wxListBox( m_options_sizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_ALWAYS_SB|wxLB_SINGLE ); m_listbox->SetToolTip( _("Options supported by current plugin") ); - + m_options_sizer->Add( m_listbox, 3, wxALL|wxEXPAND, 5 ); - + m_append_choice_button = new wxButton( m_options_sizer->GetStaticBox(), wxID_ANY, _("<< Append Selected Option"), wxDefaultPosition, wxDefaultSize, 0 ); m_options_sizer->Add( m_append_choice_button, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - - + + m_options_sizer->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - + m_html = new wxHtmlWindow( m_options_sizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO|wxBORDER_SIMPLE|wxVSCROLL ); m_html->SetMinSize( wxSize( 280,100 ) ); - + m_options_sizer->Add( m_html, 2, wxALL|wxEXPAND, 5 ); - - + + m_horizontal_sizer->Add( m_options_sizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - - + + bMainSizer->Add( m_horizontal_sizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); - + bMainSizer->Add( m_sdbSizer1, 0, wxEXPAND, 5 ); - - + + this->SetSizer( bMainSizer ); this->Layout(); bMainSizer->Fit( this ); - + this->Centre( wxBOTH ); - + // Connect Events m_grid->Connect( wxEVT_GRID_CELL_CHANGED, wxGridEventHandler( DIALOG_FP_PLUGIN_OPTIONS_BASE::onGridCellChange ), NULL, this ); m_grid->Connect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_FP_PLUGIN_OPTIONS_BASE::onSize ), NULL, this ); @@ -136,5 +136,5 @@ DIALOG_FP_PLUGIN_OPTIONS_BASE::~DIALOG_FP_PLUGIN_OPTIONS_BASE() m_listbox->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( DIALOG_FP_PLUGIN_OPTIONS_BASE::onListBoxItemSelected ), NULL, this ); m_listbox->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( DIALOG_FP_PLUGIN_OPTIONS_BASE::onListBoxItemDoubleClicked ), NULL, this ); m_append_choice_button->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FP_PLUGIN_OPTIONS_BASE::onAppendOption ), NULL, this ); - + } diff --git a/pcbnew/dialogs/dialog_fp_plugin_options_base.fbp b/pcbnew/dialogs/dialog_fp_plugin_options_base.fbp index 14d8b84ac0..2db04ef862 100644 --- a/pcbnew/dialogs/dialog_fp_plugin_options_base.fbp +++ b/pcbnew/dialogs/dialog_fp_plugin_options_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_fp_plugin_options_base 1000 none + 1 dialog_fp_plugin_options @@ -52,42 +53,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bMainSizer @@ -114,7 +79,6 @@ wxVERTICAL 1 none - 5 wxEXPAND|wxTOP|wxRIGHT|wxLEFT @@ -141,10 +105,10 @@ wxALIGN_TOP 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 22 "Option" "Value" - wxALIGN_CENTRE + wxALIGN_CENTER 2 120,240 @@ -187,10 +151,10 @@ 1 Resizable - wxALIGN_CENTRE + wxALIGN_CENTER 0 - wxALIGN_CENTRE + wxALIGN_CENTER 1 1 @@ -201,59 +165,7 @@ wxBORDER_SIMPLE|wxVSCROLL - - - onGridCellChange - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - onSize onUpdateUI @@ -289,6 +201,7 @@ 1 1 + 0 0 @@ -302,9 +215,10 @@ 0 0 - wxID_ANY Add Library + + 0 0 @@ -319,10 +233,11 @@ protected 1 + + Resizable - 1 - 30,30 + -1,-1 ; forward_declare 0 @@ -335,39 +250,16 @@ onAppendRow - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND 0 0 protected - 0 + 20 @@ -392,6 +284,7 @@ 1 1 + 0 0 @@ -405,9 +298,10 @@ 0 0 - wxID_ANY Remove Library + + 0 0 @@ -422,10 +316,11 @@ protected 1 + + Resizable - 1 - 30,30 + -1,-1 ; forward_declare 0 @@ -438,29 +333,6 @@ onDeleteRow - - - - - - - - - - - - - - - - - - - - - - - @@ -479,7 +351,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -541,31 +412,8 @@ - - - - - - - - - - onListBoxItemSelected onListBoxItemDoubleClicked - - - - - - - - - - - - - @@ -583,25 +431,31 @@ + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY << Append Selected Option + + 0 0 -1,-1 @@ -616,6 +470,8 @@ protected 1 + + Resizable 1 @@ -631,29 +487,6 @@ onAppendOption - - - - - - - - - - - - - - - - - - - - - - - @@ -722,32 +555,6 @@ wxBORDER_SIMPLE|wxVSCROLL - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -770,14 +577,6 @@ m_sdbSizer1 protected - - - - - - - - diff --git a/pcbnew/dialogs/dialog_fp_plugin_options_base.h b/pcbnew/dialogs/dialog_fp_plugin_options_base.h index eef74a8f18..50ff8752da 100644 --- a/pcbnew/dialogs/dialog_fp_plugin_options_base.h +++ b/pcbnew/dialogs/dialog_fp_plugin_options_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 __DIALOG_FP_PLUGIN_OPTIONS_BASE_H__ -#define __DIALOG_FP_PLUGIN_OPTIONS_BASE_H__ +#pragma once #include #include @@ -20,10 +19,10 @@ class WX_GRID; #include #include #include +#include #include #include #include -#include #include #include #include @@ -40,7 +39,7 @@ class WX_GRID; class DIALOG_FP_PLUGIN_OPTIONS_BASE : public DIALOG_SHIM { private: - + protected: WX_GRID* m_grid; wxBitmapButton* m_append_button; @@ -51,7 +50,7 @@ class DIALOG_FP_PLUGIN_OPTIONS_BASE : public DIALOG_SHIM wxStdDialogButtonSizer* m_sdbSizer1; wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1Cancel; - + // Virtual event handlers, overide them in your derived class virtual void onGridCellChange( wxGridEvent& event ) = 0; virtual void onSize( wxSizeEvent& event ) = 0; @@ -61,13 +60,12 @@ class DIALOG_FP_PLUGIN_OPTIONS_BASE : public DIALOG_SHIM virtual void onListBoxItemSelected( wxCommandEvent& event ) = 0; virtual void onListBoxItemDoubleClicked( wxCommandEvent& event ) = 0; virtual void onAppendOption( wxCommandEvent& event ) = 0; - - + + public: - - DIALOG_FP_PLUGIN_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER ); + + DIALOG_FP_PLUGIN_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER ); ~DIALOG_FP_PLUGIN_OPTIONS_BASE(); - + }; -#endif //__DIALOG_FP_PLUGIN_OPTIONS_BASE_H__ diff --git a/pcbnew/dialogs/dialog_select_net_from_list_base.cpp b/pcbnew/dialogs/dialog_select_net_from_list_base.cpp index 2d95a19350..b5d416d204 100644 --- a/pcbnew/dialogs/dialog_select_net_from_list_base.cpp +++ b/pcbnew/dialogs/dialog_select_net_from_list_base.cpp @@ -48,10 +48,10 @@ DIALOG_SELECT_NET_FROM_LIST_BASE::DIALOG_SELECT_NET_FROM_LIST_BASE( wxWindow* pa bSizerListButtons->Add( m_addNet, 0, wxTOP|wxBOTTOM|wxLEFT, 5 ); m_renameNet = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - bSizerListButtons->Add( m_renameNet, 0, wxALL, 5 ); + bSizerListButtons->Add( m_renameNet, 0, wxTOP|wxBOTTOM|wxLEFT, 5 ); - bSizerListButtons->Add( 15, 0, 0, wxEXPAND, 5 ); + bSizerListButtons->Add( 20, 0, 0, wxEXPAND, 5 ); m_deleteNet = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bSizerListButtons->Add( m_deleteNet, 0, wxALL, 5 ); diff --git a/pcbnew/dialogs/dialog_select_net_from_list_base.fbp b/pcbnew/dialogs/dialog_select_net_from_list_base.fbp index 9ae9135e4e..8be98ae369 100644 --- a/pcbnew/dialogs/dialog_select_net_from_list_base.fbp +++ b/pcbnew/dialogs/dialog_select_net_from_list_base.fbp @@ -383,7 +383,7 @@ 5 - wxALL + wxTOP|wxBOTTOM|wxLEFT 0 1 @@ -461,7 +461,7 @@ 0 protected - 15 + 20 diff --git a/pcbnew/dialogs/panel_display_options_base.cpp b/pcbnew/dialogs/panel_display_options_base.cpp index f5a8f81390..b5cd9bc388 100644 --- a/pcbnew/dialogs/panel_display_options_base.cpp +++ b/pcbnew/dialogs/panel_display_options_base.cpp @@ -79,13 +79,13 @@ PANEL_DISPLAY_OPTIONS_BASE::PANEL_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWind m_checkCrossProbeZoom = new wxCheckBox( sbSizer3->GetStaticBox(), wxID_ANY, _("Zoom to fit cross-probed items"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkCrossProbeZoom->SetValue(true); - sbSizer3->Add( m_checkCrossProbeZoom, 0, wxALL, 5 ); + sbSizer3->Add( m_checkCrossProbeZoom, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_checkCrossProbeAutoHighlight = new wxCheckBox( sbSizer3->GetStaticBox(), wxID_ANY, _("Highlight cross-probed nets"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkCrossProbeAutoHighlight->SetValue(true); m_checkCrossProbeAutoHighlight->SetToolTip( _("Highlight nets when they are highlighted in the schematic editor") ); - sbSizer3->Add( m_checkCrossProbeAutoHighlight, 0, wxALL, 5 ); + sbSizer3->Add( m_checkCrossProbeAutoHighlight, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); pcbOptionsSizer->Add( sbSizer3, 1, wxEXPAND|wxTOP, 5 ); diff --git a/pcbnew/dialogs/panel_display_options_base.fbp b/pcbnew/dialogs/panel_display_options_base.fbp index aa1956365d..de4c5d6a3d 100644 --- a/pcbnew/dialogs/panel_display_options_base.fbp +++ b/pcbnew/dialogs/panel_display_options_base.fbp @@ -674,7 +674,7 @@ 5 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -738,7 +738,7 @@ 5 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 1 diff --git a/pcbnew/dialogs/panel_fp_lib_table_base.cpp b/pcbnew/dialogs/panel_fp_lib_table_base.cpp index 4dc89bafab..a89d65bae1 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.9.0 Jun 3 2020) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -151,7 +151,7 @@ PANEL_FP_LIB_TABLE_BASE::PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID i bButtonsSizer->Add( m_move_down_button, 0, wxBOTTOM|wxRIGHT, 5 ); - bButtonsSizer->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bButtonsSizer->Add( 20, 0, 0, wxEXPAND, 5 ); m_delete_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_delete_button->SetToolTip( _("Remove library from table") ); diff --git a/pcbnew/dialogs/panel_fp_lib_table_base.fbp b/pcbnew/dialogs/panel_fp_lib_table_base.fbp index cafb36be7a..b69ab499f9 100644 --- a/pcbnew/dialogs/panel_fp_lib_table_base.fbp +++ b/pcbnew/dialogs/panel_fp_lib_table_base.fbp @@ -14,7 +14,6 @@ panel_fp_lib_table_base 1000 none - 1 panel_fp_lib_table @@ -26,7 +25,6 @@ 1 1 UI - 0 0 0 @@ -733,7 +731,6 @@ - 0 @@ -869,7 +866,6 @@ - 0 @@ -943,7 +939,6 @@ - 0 @@ -1006,12 +1001,12 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND 0 0 protected - 0 + 20 @@ -1027,7 +1022,6 @@ - 0 diff --git a/pcbnew/dialogs/panel_fp_lib_table_base.h b/pcbnew/dialogs/panel_fp_lib_table_base.h index aa9c090ddc..35ffacf8df 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.9.0 Jun 3 2020) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp b/pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp index a3290ee7c3..cb34b4f494 100644 --- a/pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp +++ b/pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -65,7 +65,7 @@ PANEL_PCBNEW_ACTION_PLUGINS_BASE::PANEL_PCBNEW_ACTION_PLUGINS_BASE( wxWindow* pa bButtonsSizer->Add( m_moveDownButton, 0, wxRIGHT, 5 ); - bButtonsSizer->Add( 0, 0, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); + bButtonsSizer->Add( 20, 0, 0, wxEXPAND, 5 ); m_reloadButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bButtonsSizer->Add( m_reloadButton, 0, wxLEFT|wxRIGHT, 5 ); diff --git a/pcbnew/dialogs/panel_pcbnew_action_plugins_base.fbp b/pcbnew/dialogs/panel_pcbnew_action_plugins_base.fbp index 77a8f2de3f..ab27e3c48f 100644 --- a/pcbnew/dialogs/panel_pcbnew_action_plugins_base.fbp +++ b/pcbnew/dialogs/panel_pcbnew_action_plugins_base.fbp @@ -14,7 +14,6 @@ panel_pcbnew_action_plugins_base 1000 none - 0 1 PanelPcbnewActionPlugins @@ -26,7 +25,6 @@ 1 1 UI - 0 1 0 @@ -178,7 +176,6 @@ - 0 @@ -252,7 +249,6 @@ - 0 @@ -315,12 +311,12 @@ 5 - wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND 0 0 protected - 0 + 20 @@ -336,7 +332,6 @@ - 0 diff --git a/pcbnew/dialogs/panel_pcbnew_action_plugins_base.h b/pcbnew/dialogs/panel_pcbnew_action_plugins_base.h index b85b06c0d2..76002ef6b1 100644 --- a/pcbnew/dialogs/panel_pcbnew_action_plugins_base.h +++ b/pcbnew/dialogs/panel_pcbnew_action_plugins_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp index 43032a6a64..f90175cf57 100644 --- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp +++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -69,7 +69,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa bSizer3->Add( m_trackWidthsAddButton, 0, wxLEFT|wxRIGHT, 5 ); - bSizer3->Add( 0, 0, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); + bSizer3->Add( 20, 0, 0, wxEXPAND, 5 ); m_trackWidthsRemoveButton = new wxBitmapButton( sbSizer4->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bSizer3->Add( m_trackWidthsRemoveButton, 0, wxLEFT|wxRIGHT, 5 ); @@ -128,7 +128,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa bSizer4->Add( m_viaSizesAddButton, 0, wxLEFT|wxRIGHT, 5 ); - bSizer4->Add( 0, 0, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); + bSizer4->Add( 20, 0, 0, wxEXPAND, 5 ); m_viaSizesRemoveButton = new wxBitmapButton( sbSizer5->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bSizer4->Add( m_viaSizesRemoveButton, 0, wxLEFT|wxRIGHT, 5 ); @@ -190,7 +190,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa bSizer5->Add( m_diffPairsAddButton, 0, wxLEFT|wxRIGHT, 5 ); - bSizer5->Add( 0, 0, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); + bSizer5->Add( 20, 0, 0, wxEXPAND, 5 ); m_diffPairsRemoveButton = new wxBitmapButton( sbSizer6->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bSizer5->Add( m_diffPairsRemoveButton, 0, wxLEFT|wxRIGHT, 5 ); diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp index 3c78f5c600..554ea72142 100644 --- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp +++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp @@ -14,7 +14,6 @@ panel_setup_tracks_and_vias_base 1000 none - 1 panel_setup_tracks_and_vias_base @@ -26,7 +25,6 @@ 1 1 UI - 0 1 0 @@ -248,7 +246,6 @@ - 0 @@ -311,12 +308,12 @@ 5 - wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND 0 0 protected - 0 + 20 @@ -332,7 +329,6 @@ - 0 @@ -519,7 +515,6 @@ - 0 @@ -582,12 +577,12 @@ 5 - wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND 0 0 protected - 0 + 20 @@ -603,7 +598,6 @@ - 0 @@ -790,7 +784,6 @@ - 0 @@ -853,12 +846,12 @@ 5 - wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND 0 0 protected - 0 + 20 @@ -874,7 +867,6 @@ - 0 diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.h b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.h index 84486659c9..b46fa33259 100644 --- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.h +++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE!