diff --git a/eeschema/dialogs/dialog_user_defined_signals_base.cpp b/eeschema/dialogs/dialog_user_defined_signals_base.cpp index aafb54a50f..50a47b3ded 100644 --- a/eeschema/dialogs/dialog_user_defined_signals_base.cpp +++ b/eeschema/dialogs/dialog_user_defined_signals_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -55,7 +55,7 @@ DIALOG_USER_DEFINED_SIGNALS_BASE::DIALOG_USER_DEFINED_SIGNALS_BASE( wxWindow* pa m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); m_grid->SetMinSize( wxSize( -1,120 ) ); - bMainSizer->Add( m_grid, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); + bMainSizer->Add( m_grid, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); bButtonSize = new wxBoxSizer( wxHORIZONTAL ); diff --git a/eeschema/dialogs/dialog_user_defined_signals_base.fbp b/eeschema/dialogs/dialog_user_defined_signals_base.fbp index 5648118054..850e398459 100644 --- a/eeschema/dialogs/dialog_user_defined_signals_base.fbp +++ b/eeschema/dialogs/dialog_user_defined_signals_base.fbp @@ -1,477 +1,483 @@ - + - - - - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - dialog_user_defined_signals_base - 1000 - none - - - 1 - dialog_user_defined_signals_base - - . - - 1 - 1 - 1 - 1 - UI - 0 - 1 - 0 - - 0 - wxAUI_MGR_DEFAULT + + + + C++ + 1 + source_name + 0 + 0 + res + UTF-8 + connect + dialog_user_defined_signals_base + 1000 + none + + + 1 + dialog_user_defined_signals_base + + . + + 1 + 1 + 1 + 1 + UI + 0 + 1 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + + 1 + 0 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + DIALOG_USER_DEFINED_SIGNALS_BASE + + -1,-1 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + DIALOG_SHIM; dialog_shim.h + User-defined Signals + + 0 + + + + + + bMainSizer + wxVERTICAL + none + + 5 + wxEXPAND|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + - + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left + 0 + 500 1 - impl_virtual - + 1 - 0 + 0 + 1 + wxSHOW_EFFECT_NONE wxID_ANY + + 0 + + 0 - DIALOG_USER_DEFINED_SIGNALS_BASE + 1 + m_infoBar + 1 + + + protected + 1 + + Resizable + 1 + wxSHOW_EFFECT_NONE + + WX_INFOBAR; widgets/wx_infobar.h; forward_declare + 0 + + + + + + + + 10 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + 0 + 0 + + + + 1 + + + wxALIGN_LEFT + + wxALIGN_CENTER + 0 + 1 + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + 2 + 400,0 + + 1 + 0 + Dock + 0 + Left + 0 + 0 + 1 + 0 + 0 + 1 + 1 + + 1 + + + 1 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + + + 0 + -1,120 + 1 + m_grid + 1 + + + protected + 1 - -1,-1 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - DIALOG_SHIM; dialog_shim.h - User-defined Signals + Resizable + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 0 + 1 + + WX_GRID; widgets/wx_grid.h; forward_declare + 0 - 0 - + onGridCellClick + + + + 10 + wxEXPAND|wxRIGHT|wxLEFT + 0 + + + bButtonSize + wxHORIZONTAL + protected + + 5 + wxTOP|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Add Field + + 0 + + 0 + + + 0 + -1,-1 + 1 + m_addButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Add field + + wxFILTER_NONE + wxDefaultValidator + + + + + onAddSignal + + + + 5 + wxEXPAND + 0 + + 0 + protected + 20 + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Delete Field + + 0 + + 0 + + + 0 + -1,-1 + 1 + m_deleteButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Delete field + + wxFILTER_NONE + wxDefaultValidator + + + + + onDeleteSignal + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 4 + wxTOP|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + + wxID_ANY + Syntax help + + 0 + + + 0 - bMainSizer - wxVERTICAL - none - - 5 - wxEXPAND|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 500 - 1 - - 1 - - 0 - 1 - wxSHOW_EFFECT_NONE - wxID_ANY - - 0 - - - 0 - - 1 - m_infoBar - 1 - - - protected - 1 - - Resizable - 1 - wxSHOW_EFFECT_NONE - - WX_INFOBAR; widgets/wx_infobar.h; forward_declare - 0 - - - - - - - - 10 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - 0 - - - - 1 - - - wxALIGN_LEFT - - wxALIGN_CENTER - 0 - 1 - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - 2 - 400,0 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - 0 - 0 - 1 - 1 - - 1 - - - 1 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - - - 0 - -1,120 - 1 - m_grid - 1 - - - protected - 1 - - Resizable - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 0 - 1 - - WX_GRID; widgets/wx_grid.h; forward_declare - 0 - - - - - onGridCellClick - - - - 10 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - - bButtonSize - wxHORIZONTAL - protected - - 5 - wxTOP|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Add Field - - 0 - - 0 - - - 0 - -1,-1 - 1 - m_addButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Add field - - wxFILTER_NONE - wxDefaultValidator - - - - - onAddSignal - - - - 5 - wxEXPAND - 0 - - 0 - protected - 20 - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Delete Field - - 0 - - 0 - - - 0 - -1,-1 - 1 - m_deleteButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Delete field - - wxFILTER_NONE - wxDefaultValidator - - - - - onDeleteSignal - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 4 - wxTOP|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - - wxID_ANY - Syntax help - - 0 - - - 0 - - 1 - m_syntaxHelp - - 1 - - - protected - 1 - - Resizable - 1 - - wxHL_DEFAULT_STYLE - ; ; forward_declare - 0 - Show syntax help window - - - - - - OnFormattingHelp - - - - - - 5 - wxALL|wxEXPAND - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer1 - protected - - + 1 + m_syntaxHelp + + 1 + + + protected + 1 + + Resizable + 1 + + wxHL_DEFAULT_STYLE + ; ; forward_declare + 0 + Show syntax help window + + + + + + OnFormattingHelp + + + + + 5 + wxALL|wxEXPAND + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer1 + protected + + + diff --git a/eeschema/dialogs/dialog_user_defined_signals_base.h b/eeschema/dialogs/dialog_user_defined_signals_base.h index e2048c652d..41cf921d89 100644 --- a/eeschema/dialogs/dialog_user_defined_signals_base.h +++ b/eeschema/dialogs/dialog_user_defined_signals_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/dialogs/panel_setup_buses.cpp b/eeschema/dialogs/panel_setup_buses.cpp index 37df1a8dd7..89a3f33b9e 100644 --- a/eeschema/dialogs/panel_setup_buses.cpp +++ b/eeschema/dialogs/panel_setup_buses.cpp @@ -45,6 +45,8 @@ PANEL_SETUP_BUSES::PANEL_SETUP_BUSES( wxWindow* aWindow, SCH_EDIT_FRAME* aFrame m_source->SetFont( KIUI::GetInfoFont( aWindow ) ); + m_aliasesGrid->OverrideMinSize( 0.6, 0.3 ); + m_membersGrid->OverrideMinSize( 0.6, 0.3 ); m_aliasesGrid->SetSelectionMode( wxGrid::wxGridSelectRows ); m_membersGrid->SetSelectionMode( wxGrid::wxGridSelectRows ); diff --git a/eeschema/widgets/design_block_pane.cpp b/eeschema/widgets/design_block_pane.cpp index 0dee32a55f..3177a0f848 100644 --- a/eeschema/widgets/design_block_pane.cpp +++ b/eeschema/widgets/design_block_pane.cpp @@ -77,11 +77,11 @@ DESIGN_BLOCK_PANE::DESIGN_BLOCK_PANE( SCH_EDIT_FRAME* aParent, const LIB_ID* aPr m_placeAsSheet->Bind( wxEVT_CHECKBOX, &DESIGN_BLOCK_PANE::OnCheckBox, this ); m_keepAnnotations->Bind( wxEVT_CHECKBOX, &DESIGN_BLOCK_PANE::OnCheckBox, this ); - cbSizer->Add( m_repeatedPlacement, 0, wxLEFT, 5 ); - cbSizer->Add( m_placeAsSheet, 0, wxLEFT, 5 ); - cbSizer->Add( m_keepAnnotations, 0, wxLEFT, 5 ); + cbSizer->Add( m_repeatedPlacement, 0, wxTOP|wxLEFT, 2 ); + cbSizer->Add( m_placeAsSheet, 0, wxTOP|wxLEFT, 2 ); + cbSizer->Add( m_keepAnnotations, 0, wxTOP|wxLEFT|wxBOTTOM, 2 ); - sizer->Add( cbSizer, 0, wxEXPAND | wxLEFT, 5 ); + sizer->Add( cbSizer, 0, wxEXPAND, 5 ); SetSizer( sizer ); m_chooserPanel->FinishSetup(); diff --git a/include/widgets/wx_grid.h b/include/widgets/wx_grid.h index 9e027653be..a84bdcaa62 100644 --- a/include/widgets/wx_grid.h +++ b/include/widgets/wx_grid.h @@ -197,6 +197,24 @@ public: */ static void CellEditorTransformSizeRect( wxRect& aRect ); + /** + * Grids that have column sizes automatically set to fill the available width don't want + * to shrink afterwards (because wxGrid reports the aggregate column size as the bestSize. + * @param aSize + */ + void OverrideMinSize( double aXPct, double aYPct ) + { + wxSize size = DoGetBestSize(); + m_minSizeOverride = wxSize( KiROUND( size.x * aXPct ), KiROUND( size.y * aYPct ) ); + } + wxSize DoGetBestSize() const override + { + if( m_minSizeOverride ) + return m_minSizeOverride.value(); + else + return wxGrid::DoGetBestSize(); + } + protected: /** * A re-implementation of wxGrid::DrawColLabel which left-aligns the first column and draws @@ -229,6 +247,8 @@ protected: std::vector m_autoEvalCols; std::map< std::pair, std::pair > m_evalBeforeAfter; + + std::optional m_minSizeOverride; }; #endif //KICAD_WX_GRID_H diff --git a/kicad/dialogs/panel_jobs.cpp b/kicad/dialogs/panel_jobs.cpp index 42b2aac696..3da107ffde 100644 --- a/kicad/dialogs/panel_jobs.cpp +++ b/kicad/dialogs/panel_jobs.cpp @@ -529,6 +529,7 @@ PANEL_JOBS::PANEL_JOBS( wxAuiNotebook* aParent, KICAD_MANAGER_FRAME* aFrame, m_jobsGrid->PushEventHandler( new JOBS_GRID_TRICKS( this, m_jobsGrid ) ); m_jobsGrid->SetDefaultRowSize( m_jobsGrid->GetDefaultRowSize() + 4 ); + m_jobsGrid->OverrideMinSize( 0.6, 0.3 ); m_jobsGrid->SetSelectionMode( wxGrid::wxGridSelectRows ); m_buttonAddJob->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) ); diff --git a/kicad/dialogs/panel_jobs_base.cpp b/kicad/dialogs/panel_jobs_base.cpp index 9fa92b18d4..ccec024d63 100644 --- a/kicad/dialogs/panel_jobs_base.cpp +++ b/kicad/dialogs/panel_jobs_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6-dirty) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -76,7 +76,7 @@ PANEL_JOBS_BASE::PANEL_JOBS_BASE( wxWindow* parent, wxWindowID id, const wxPoint sbJobs->Add( bJobsButtons, 0, wxEXPAND|wxLEFT|wxRIGHT, 3 ); - bSizerUpper->Add( sbJobs, 2, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + bSizerUpper->Add( sbJobs, 7, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); wxStaticBoxSizer* sbOutputs; sbOutputs = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Outputs") ), wxVERTICAL ); @@ -101,7 +101,7 @@ PANEL_JOBS_BASE::PANEL_JOBS_BASE( wxWindow* parent, wxWindowID id, const wxPoint sbOutputs->Add( bOutputButtons, 0, wxEXPAND|wxLEFT, 3 ); - bSizerUpper->Add( sbOutputs, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + bSizerUpper->Add( sbOutputs, 4, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); bSizerMain->Add( bSizerUpper, 1, wxEXPAND, 5 ); @@ -116,7 +116,7 @@ PANEL_JOBS_BASE::PANEL_JOBS_BASE( wxWindow* parent, wxWindowID id, const wxPoint bSizerButtons->Add( m_buttonSave, 0, wxALL, 5 ); - bSizerButtons->Add( 20, 0, 0, wxEXPAND, 5 ); + bSizerButtons->Add( 10, 0, 0, wxEXPAND, 5 ); m_buttonRunAllOutputs = new wxButton( this, wxID_ANY, _("Generate All Outputs"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerButtons->Add( m_buttonRunAllOutputs, 0, wxALL, 5 ); diff --git a/kicad/dialogs/panel_jobs_base.fbp b/kicad/dialogs/panel_jobs_base.fbp index 8f2b51c0e6..3131b493ed 100644 --- a/kicad/dialogs/panel_jobs_base.fbp +++ b/kicad/dialogs/panel_jobs_base.fbp @@ -70,7 +70,7 @@ 5 wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 2 + 7 wxID_ANY Jobs @@ -165,7 +165,7 @@ - wxHSCROLL + OnSizeGrid @@ -505,7 +505,7 @@ 5 wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 1 + 4 wxID_ANY Outputs @@ -771,7 +771,7 @@ 0 protected - 20 + 10 diff --git a/kicad/dialogs/panel_jobs_base.h b/kicad/dialogs/panel_jobs_base.h index f194f872be..c2cea9d067 100644 --- a/kicad/dialogs/panel_jobs_base.h +++ b/kicad/dialogs/panel_jobs_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6-dirty) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/kicad/pcm/dialogs/dialog_manage_repositories_base.cpp b/kicad/pcm/dialogs/dialog_manage_repositories_base.cpp index f012038845..e004c3e459 100644 --- a/kicad/pcm/dialogs/dialog_manage_repositories_base.cpp +++ b/kicad/pcm/dialogs/dialog_manage_repositories_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -58,7 +58,7 @@ DIALOG_MANAGE_REPOSITORIES_BASE::DIALOG_MANAGE_REPOSITORIES_BASE( wxWindow* pare m_buttonAdd = new SPLIT_BUTTON( this, wxID_ANY, _( "Add Existing" ) ); m_buttonAdd->SetToolTip( _("Add repository") ); - bButtonsSizer->Add( m_buttonAdd, 0, wxRIGHT, 5 ); + bButtonsSizer->Add( m_buttonAdd, 0, wxRIGHT|wxLEFT, 5 ); m_buttonMoveUp = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_buttonMoveUp->SetToolTip( _("Move up") ); @@ -79,7 +79,7 @@ DIALOG_MANAGE_REPOSITORIES_BASE::DIALOG_MANAGE_REPOSITORIES_BASE( wxWindow* pare bButtonsSizer->Add( m_buttonRemove, 0, 0, 5 ); - m_TopSizer->Add( bButtonsSizer, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + m_TopSizer->Add( bButtonsSizer, 0, wxRIGHT, 5 ); m_MainSizer->Add( m_TopSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); diff --git a/kicad/pcm/dialogs/dialog_manage_repositories_base.fbp b/kicad/pcm/dialogs/dialog_manage_repositories_base.fbp index f71fbdc122..093fcef4be 100644 --- a/kicad/pcm/dialogs/dialog_manage_repositories_base.fbp +++ b/kicad/pcm/dialogs/dialog_manage_repositories_base.fbp @@ -1,491 +1,497 @@ - + - - - ; - C++ - 1 - source_name - 0 - 0 - - UTF-8 - connect - dialog_manage_repositories_base - 1000 - none - - - 1 - dialog_manage_repositories_base - - ./ - - 1 - 1 - 1 - 1 - UI - 0 - 0 - 0 - - 0 - wxAUI_MGR_DEFAULT - - wxBOTH - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - - -1,-1 - DIALOG_MANAGE_REPOSITORIES_BASE - - -1,-1 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - DIALOG_SHIM; dialog_shim.h; forward_declare - Manage Repositories - - 0 - - - - + + + ; + C++ + 1 + source_name + 0 + 0 + + UTF-8 + connect + dialog_manage_repositories_base + 1000 + none + + + 1 + dialog_manage_repositories_base + + ./ + + 1 + 1 + 1 + 1 + UI + 0 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + wxBOTH + + 1 + 0 + 1 + impl_virtual + + + + 0 + wxID_ANY + + -1,-1 + DIALOG_MANAGE_REPOSITORIES_BASE + + -1,-1 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + DIALOG_SHIM; dialog_shim.h; forward_declare + Manage Repositories + + 0 + + + + + + m_MainSizer + wxVERTICAL + none + + 10 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 1 + + + m_TopSizer + wxVERTICAL + none + + 5 + wxEXPAND|wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + 0 + 0 + + + + 1 + + + wxALIGN_LEFT + + wxALIGN_CENTER + 0 + 1 + wxALIGN_CENTER + 22 + "Name" "URL" + wxALIGN_CENTER + 2 + 200,400 + + 1 + 0 + Dock + 0 + Left + 0 + 0 + 1 + 0 + 1 + 0 + 1 + + 1 + + + 1 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + + + 0 - m_MainSizer - wxVERTICAL + 1 + m_grid + 1 + + + protected + 1 + + Resizable + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 5 + 1 + + WX_GRID; widgets/wx_grid.h; forward_declare + 0 + + + + + OnGridCellClicked + + + + 5 + wxRIGHT + 0 + + + bButtonsSizer + wxHORIZONTAL none - - 10 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 1 - - - m_TopSizer - wxVERTICAL - none - - 5 - wxEXPAND|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - 0 - 0 - - - - 1 - - - wxALIGN_LEFT - - wxALIGN_CENTER - 0 - 1 - wxALIGN_CENTER - 22 - "Name" "URL" - wxALIGN_CENTER - 2 - 200,400 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - 0 - 1 - 0 - 1 - - 1 - - - 1 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - - - 0 - - 1 - m_grid - 1 - - - protected - 1 - - Resizable - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 5 - 1 - - WX_GRID; widgets/wx_grid.h; forward_declare - 0 - - - - - OnGridCellClicked - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - bButtonsSizer - wxHORIZONTAL - none - - 5 - wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - SPLIT_BUTTON - 1 - m_buttonAdd = new SPLIT_BUTTON( this, wxID_ANY, _( "Add Existing" ) ); - - 1 - - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - #include <widgets/split_button.h> - - 0 - - - 0 - - 1 - m_buttonAdd - 1 - - - protected - 1 - - Resizable - - 1 - - - 0 - Add repository - - - - - - - 5 - 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_buttonMoveUp - 1 - - - protected - 1 - - - - Resizable - 1 - - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Move up - - wxFILTER_NONE - wxDefaultValidator - - - - - OnMoveUpButtonClicked - - - - 5 - 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_buttonMoveDown - 1 - - - protected - 1 - - - - Resizable - 1 - - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Move down - - wxFILTER_NONE - wxDefaultValidator - - - - - OnMoveDownButtonClicked - - - - 5 - wxEXPAND - 0 - - 0 - protected - 20 - - - - 5 - - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Remove repository - - 0 - - 0 - - - 0 - - 1 - m_buttonRemove - 1 - - - protected - 1 - - - - Resizable - 1 - - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Remove repository - - wxFILTER_NONE - wxDefaultValidator - - - - - OnRemoveButtonClicked - - - - - + + 5 + wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + SPLIT_BUTTON + 1 + m_buttonAdd = new SPLIT_BUTTON( this, wxID_ANY, _( "Add Existing" ) ); + + 1 + + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + #include <widgets/split_button.h> + + 0 + + + 0 + + 1 + m_buttonAdd + 1 + + + protected + 1 + + Resizable + + 1 + + + 0 + Add repository + + + + + + + 5 + wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Move Up + + 0 + + 0 + + + 0 + + 1 + m_buttonMoveUp + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Move up + + wxFILTER_NONE + wxDefaultValidator + + + + + OnMoveUpButtonClicked + - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 0 - 1 - 0 - 0 - 0 - 0 - 1 - 0 - - m_sdbSizer1 - protected - OnSaveClicked - + + 5 + wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Move Down + + 0 + + 0 + + + 0 + + 1 + m_buttonMoveDown + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Move down + + wxFILTER_NONE + wxDefaultValidator + + + + + OnMoveDownButtonClicked + + + 5 + wxEXPAND + 0 + + 0 + protected + 20 + + + + 5 + + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Remove repository + + 0 + + 0 + + + 0 + + 1 + m_buttonRemove + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Remove repository + + wxFILTER_NONE + wxDefaultValidator + + + + + OnRemoveButtonClicked + + + + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + + m_sdbSizer1 + protected + OnSaveClicked + + + diff --git a/kicad/pcm/dialogs/dialog_manage_repositories_base.h b/kicad/pcm/dialogs/dialog_manage_repositories_base.h index 94ee0704e1..da89d7e514 100644 --- a/kicad/pcm/dialogs/dialog_manage_repositories_base.h +++ b/kicad/pcm/dialogs/dialog_manage_repositories_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/kicad/pcm/dialogs/dialog_pcm_base.cpp b/kicad/pcm/dialogs/dialog_pcm_base.cpp index 2948472922..aa3f621311 100644 --- a/kicad/pcm/dialogs/dialog_pcm_base.cpp +++ b/kicad/pcm/dialogs/dialog_pcm_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -120,7 +120,7 @@ DIALOG_PCM_BASE::DIALOG_PCM_BASE( wxWindow* parent, wxWindowID id, const wxStrin bSizer8->Fit( m_panelPending ); m_dialogNotebook->AddPage( m_panelPending, _("Pending (%d)"), false ); - m_TopSizer->Add( m_dialogNotebook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + m_TopSizer->Add( m_dialogNotebook, 1, wxEXPAND|wxALL, 5 ); m_MainSizer->Add( m_TopSizer, 1, wxEXPAND, 5 ); diff --git a/kicad/pcm/dialogs/dialog_pcm_base.fbp b/kicad/pcm/dialogs/dialog_pcm_base.fbp index 7811530799..eb72a97923 100644 --- a/kicad/pcm/dialogs/dialog_pcm_base.fbp +++ b/kicad/pcm/dialogs/dialog_pcm_base.fbp @@ -1,983 +1,996 @@ - + - - - ; - C++ - 1 - source_name - 0 - 0 - - UTF-8 - connect - dialog_pcm_base - 1000 - none - - - 1 - dialog_pcm_base - - ./ - - 1 - 1 - 1 - 1 - UI - 0 - 0 - 0 - - 0 - wxAUI_MGR_DEFAULT - - wxBOTH - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - - 940,550 - DIALOG_PCM_BASE - - -1,-1 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - DIALOG_SHIM; dialog_shim.h; forward_declare - Plugin And Content Manager - - 0 - - - - + + + ; + C++ + 1 + source_name + 0 + 0 + + UTF-8 + connect + dialog_pcm_base + 1000 + none + + + 1 + dialog_pcm_base + + ./ + + 1 + 1 + 1 + 1 + UI + 0 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + wxBOTH + + 1 + 0 + 1 + impl_virtual + + + + 0 + wxID_ANY + + 940,550 + DIALOG_PCM_BASE + + -1,-1 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + DIALOG_SHIM; dialog_shim.h; forward_declare + Plugin And Content Manager + + 0 + + + + + + m_MainSizer + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + + m_TopSizer + wxVERTICAL + none + + 5 + wxEXPAND|wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 - m_MainSizer - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - - m_TopSizer - wxVERTICAL - none - + 1 + m_dialogNotebook + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + + + Repository (%d) + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_panelRepository + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + + + bSizer4 + wxVERTICAL + none + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 0 + + + bSizer6 + wxHORIZONTAL + none + 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxALIGN_CENTER|wxALL 1 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_dialogNotebook - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - - - Repository (%d) - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panelRepository - 1 - - - protected - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - wxTAB_TRAVERSAL - - - bSizer4 - wxVERTICAL - none - - 5 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - - bSizer6 - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_choiceRepository - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnRepositoryChoice - - - - 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 - Manage... - - 0 - - 0 - - - 0 - - 1 - m_buttonManage - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnManageRepositoriesClicked - - - - - - 3 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - 900,400 - 1 - m_contentNotebook - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - - - - - - - - Installed (%d) - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panelInstalledHolder - 1 - - - protected - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - wxTAB_TRAVERSAL - - - bSizer7 - wxVERTICAL - none - - - - - - Pending (%d) - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - wxSYS_COLOUR_WINDOW - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panelPending - 1 - - - protected - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - wxTAB_TRAVERSAL - - - bSizer8 - wxVERTICAL - none - - 5 - wxEXPAND|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - 0 - 0 - - - - 1 - - - wxALIGN_LEFT - - wxALIGN_CENTER - 0 - 1 - wxALIGN_CENTER - 22 - "Action" "Package" "Version" "Repository" - wxALIGN_CENTER - 4 - 100,200,80,200 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - 0 - 0 - 0 - 1 - - 1 - - - 1 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - - - 0 - - 1 - m_gridPendingActions - 1 - - - protected - 1 - - Resizable - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 0 - 1 - - WX_GRID; widgets/wx_grid.h; forward_declare - 0 - - - - - OnPendingActionsCellClicked - - - - 0 - wxEXPAND - 0 - - - bSizer9 - wxHORIZONTAL - none - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Discard action - - 0 - - 0 - - - 0 - - 1 - m_discardActionButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - Discard action - - wxFILTER_NONE - wxDefaultValidator - - - - - OnDiscardActionClicked - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - - - - + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_choiceRepository + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnRepositoryChoice - - - - - 5 - wxEXPAND|wxLEFT - 0 - - - m_BottomSizer - wxHORIZONTAL - none - + + 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 - Refresh - - 0 - - 0 - - - 0 - - 1 - m_refreshButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnRefreshClicked + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Manage... + + 0 + + 0 + + + 0 + + 1 + m_buttonManage + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnManageRepositoriesClicked + - - 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 - Install from File... - - 0 - - 0 - - - 0 - - 1 - m_installLocalButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnInstallFromFileClicked - + + + 3 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + 900,400 + 1 + m_contentNotebook + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + - + + + + + + + Installed (%d) + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_panelInstalledHolder + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + + + bSizer7 + wxVERTICAL + none + + + + + + Pending (%d) + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + wxSYS_COLOUR_WINDOW + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_panelPending + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + + + bSizer8 + wxVERTICAL + none + + 5 + wxEXPAND|wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + 0 + 0 + + + + 1 + + + wxALIGN_LEFT + + wxALIGN_CENTER + 0 + 1 + wxALIGN_CENTER + 22 + "Action" "Package" "Version" "Repository" + wxALIGN_CENTER + 4 + 100,200,80,200 + + 1 + 0 + Dock + 0 + Left + 0 + 0 + 1 + 0 + 0 + 0 + 1 + + 1 + + + 1 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + + + 0 + + 1 + m_gridPendingActions + 1 + + + protected + 1 + + Resizable + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 0 + 1 + + WX_GRID; widgets/wx_grid.h; forward_declare + 0 + + + + + OnPendingActionsCellClicked + + + + 0 + wxEXPAND + 0 + + + bSizer9 + wxHORIZONTAL + none + 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Open Package Directory - - 0 - - 0 - - - 0 - - 1 - m_openPackageDirButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnOpenPackageDirClicked + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Discard action + + 0 + + 0 + + + 0 + + 1 + m_discardActionButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; ; forward_declare + 0 + Discard action + + wxFILTER_NONE + wxDefaultValidator + + + + + OnDiscardActionClicked - - + + 5 - + wxEXPAND 1 - - 0 - protected - 0 - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer1 - protected - OnApplyChangesClicked - OnDiscardChangesClicked - OnCloseClicked + + 0 + protected + 0 + + + + + + + + + 5 + wxEXPAND|wxLEFT + 0 + + + m_BottomSizer + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Refresh + + 0 + + 0 + + + 0 + + 1 + m_refreshButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnRefreshClicked + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Install from File... + + 0 + + 0 + + + 0 + + 1 + m_installLocalButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnInstallFromFileClicked + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Open Package Directory + + 0 + + 0 + + + 0 + + 1 + m_openPackageDirButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnOpenPackageDirClicked + + + + 5 + + 1 + + 0 + protected + 0 + + + + 5 + wxALL|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer1 + protected + OnApplyChangesClicked + OnDiscardChangesClicked + OnCloseClicked + + + + diff --git a/kicad/pcm/dialogs/dialog_pcm_base.h b/kicad/pcm/dialogs/dialog_pcm_base.h index 441b0441eb..b6a9d40450 100644 --- a/kicad/pcm/dialogs/dialog_pcm_base.h +++ b/kicad/pcm/dialogs/dialog_pcm_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/kicad/pcm/dialogs/panel_packages_view.cpp b/kicad/pcm/dialogs/panel_packages_view.cpp index 3252a04465..8bc0f8f0a9 100644 --- a/kicad/pcm/dialogs/panel_packages_view.cpp +++ b/kicad/pcm/dialogs/panel_packages_view.cpp @@ -689,6 +689,12 @@ void PANEL_PACKAGES_VIEW::updatePackageList() { sizer->Add( panel, 0, wxEXPAND ); panel->Show(); + + if( !m_currentSelected ) + { + wxMouseEvent dummy; + panel->OnClick( dummy ); + } } else { diff --git a/kicad/pcm/dialogs/panel_packages_view_base.cpp b/kicad/pcm/dialogs/panel_packages_view_base.cpp index 0db4e44e8e..20cde302a0 100644 --- a/kicad/pcm/dialogs/panel_packages_view_base.cpp +++ b/kicad/pcm/dialogs/panel_packages_view_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -70,7 +70,7 @@ PANEL_PACKAGES_VIEW_BASE::PANEL_PACKAGES_VIEW_BASE( wxWindow* parent, wxWindowID m_infoText = new HTML_WINDOW( m_infoScrollWindow, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_NEVER ); m_infoText->SetMinSize( wxSize( -1,100 ) ); - bSizerScrolledWindow->Add( m_infoText, 0, wxALL|wxEXPAND, 5 ); + bSizerScrolledWindow->Add( m_infoText, 0, wxEXPAND, 5 ); m_sizerVersions = new wxBoxSizer( wxVERTICAL ); diff --git a/kicad/pcm/dialogs/panel_packages_view_base.fbp b/kicad/pcm/dialogs/panel_packages_view_base.fbp index 2465eedb3a..4c59290d4b 100644 --- a/kicad/pcm/dialogs/panel_packages_view_base.fbp +++ b/kicad/pcm/dialogs/panel_packages_view_base.fbp @@ -1,125 +1,601 @@ - + - - - ; - C++ - 1 - source_name - 0 - 0 - - UTF-8 - connect - panel_packages_view_base - 1000 - none - - - 1 - panel_packages_view_base - - ./ - - 1 - 1 - 1 - 1 - UI - 0 - 0 - 0 - - 0 - wxAUI_MGR_DEFAULT + + + ; + C++ + 1 + source_name + 0 + 0 + + UTF-8 + connect + panel_packages_view_base + 1000 + none + + + 1 + panel_packages_view_base + + ./ + + 1 + 1 + 1 + 1 + UI + 0 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + 1 + 0 + 1 + impl_virtual + + + 0 + wxID_ANY + + + PANEL_PACKAGES_VIEW_BASE + + -1,-1 + ; ; forward_declare + + 0 + + + wxTAB_TRAVERSAL + + + bSizer1 + wxVERTICAL + none + + 5 + wxEXPAND|wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left + 0 1 - impl_virtual + 1 + 0 0 wxID_ANY + + 0 + + + 0 - PANEL_PACKAGES_VIEW_BASE + 1 + m_splitter1 + 1 + + + protected + 1 - -1,-1 - ; ; forward_declare + Resizable + 0.25 + 0 + -1 + 1 + + wxSPLIT_VERTICAL + wxSP_3DSASH|wxSP_LIVE_UPDATE + WX_SPLITTER_WINDOW; widgets/wx_splitter_window.h; Not forward_declare + 0 - 0 - wxTAB_TRAVERSAL - + + + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 - bSizer1 - wxVERTICAL - none - + 1 + m_panelList + 1 + + + protected + 1 + + Resizable + 1 + + WX_PANEL; widgets/wx_panel.h; forward_declare + 0 + + + + wxBORDER_NONE|wxTAB_TRAVERSAL + + + bPanelListSizer + wxVERTICAL + none + 5 - wxEXPAND|wxALL + wxEXPAND + 0 + + + bSizer8 + wxHORIZONTAL + none + + 5 + wxEXPAND|wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + + + 0 + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_searchCtrl + 1 + + + protected + 1 + + Resizable + 1 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxTOP + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Update All + + 0 + + 0 + + + 0 + + 1 + m_buttonUpdateAll + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnUpdateAllClicked + + + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + -1,-1 + 1 + m_packageListWindow + 1 + + + protected + 1 + + Resizable + 5 + 5 + 1 + + ; ; forward_declare + 0 + + + + wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE|wxVSCROLL + - 1 - m_splitter1 - 1 - - - protected - 1 - - Resizable - 0.25 - 0 - -1 - 1 - - wxSPLIT_VERTICAL - wxSP_3DSASH|wxSP_LIVE_UPDATE - WX_SPLITTER_WINDOW; widgets/wx_splitter_window.h; Not forward_declare - 0 - - - - - - + bSizer2 + wxVERTICAL + none + + + + + + + + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + -1,-1 + 1 + m_panelDetails + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + + -1,-1 + bPanelDetailsSizer + wxHORIZONTAL + none + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + 480,-1 + 1 + m_infoScrollWindow + 1 + + + protected + 1 + + Resizable + 5 + 5 + 1 + + ; ; forward_declare + 0 + + + + wxVSCROLL + OnSizeInfoBox + + + bSizerScrolledWindow + wxVERTICAL + none + + 5 + wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + -1,100 + 1 + m_infoText + 1 + + + protected + 1 + + Resizable + 1 + + wxHW_SCROLLBAR_NEVER + HTML_WINDOW; widgets/html_window.h; forward_declare + 0 + + + + + OnURLClicked + OnInfoMouseWheel + + + + 3 + wxEXPAND|wxRIGHT|wxLEFT + 0 + + + m_sizerVersions + wxVERTICAL + protected + + 5 + wxEXPAND|wxRIGHT + 0 + 1 1 1 @@ -128,25 +604,51 @@ + 1 + 0 1 + + + wxALIGN_CENTER + + wxALIGN_CENTER 0 1 + wxALIGN_CENTER + 22 + "Version" "Download Size" "Install Size" "Compatible" "Status" + wxALIGN_CENTER + 5 + 1 0 Dock 0 Left + 0 + 0 + 1 + 0 + 0 + 0 1 1 + + 1 0 0 wxID_ANY + + + + 0 + 0 0 @@ -154,7 +656,7 @@ 0 1 - m_panelList + m_gridVersions 1 @@ -162,760 +664,271 @@ 1 Resizable + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 0 1 - WX_PANEL; widgets/wx_panel.h; forward_declare + WX_GRID; widgets/wx_grid.h; Not forward_declare 0 - wxBORDER_NONE|wxTAB_TRAVERSAL - + + OnVersionsCellClicked + + + + 5 + wxEXPAND|wxRIGHT + 0 + + + bSizerVersionButtons + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Show all versions + + 0 + + + 0 - bPanelListSizer - wxVERTICAL - none - - 5 - wxEXPAND - 0 - - - bSizer8 - wxHORIZONTAL - none - - 5 - wxEXPAND|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - 0 - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_searchCtrl - 1 - - - protected - 1 - - Resizable - 1 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxTOP - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Update All - - 0 - - 0 - - - 0 - - 1 - m_buttonUpdateAll - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnUpdateAllClicked - - - - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - -1,-1 - 1 - m_packageListWindow - 1 - - - protected - 1 - - Resizable - 5 - 5 - 1 - - ; ; forward_declare - 0 - - - - wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE|wxVSCROLL - - - bSizer2 - wxVERTICAL - none - - - + 1 + m_showAllVersions + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnShowAllVersionsClicked + - - - - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - -1,-1 - 1 - m_panelDetails - 1 - - - protected - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - wxTAB_TRAVERSAL - - -1,-1 - bPanelDetailsSizer - wxHORIZONTAL - none - - 5 - wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - 480,-1 - 1 - m_infoScrollWindow - 1 - - - protected - 1 - - Resizable - 5 - 5 - 1 - - ; ; forward_declare - 0 - - - - wxVSCROLL - OnSizeInfoBox - - - bSizerScrolledWindow - wxVERTICAL - none - - 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,100 - 1 - m_infoText - 1 - - - protected - 1 - - Resizable - 1 - - wxHW_SCROLLBAR_NEVER - HTML_WINDOW; widgets/html_window.h; forward_declare - 0 - - - - - OnURLClicked - OnInfoMouseWheel - - - - 3 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - - m_sizerVersions - wxVERTICAL - protected - - 5 - wxEXPAND|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 1 - 0 - - - - 1 - - - wxALIGN_CENTER - - wxALIGN_CENTER - 0 - 1 - wxALIGN_CENTER - 22 - "Version" "Download Size" "Install Size" "Compatible" "Status" - wxALIGN_CENTER - 5 - - - 1 - 0 - Dock - 0 - Left - 0 - 1 - 0 - 0 - 0 - 1 - - 1 - - - 1 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - - - 0 - - 1 - m_gridVersions - 1 - - - protected - 1 - - Resizable - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 0 - 1 - - WX_GRID; widgets/wx_grid.h; Not forward_declare - 0 - - - - - OnVersionsCellClicked - - - - 5 - wxEXPAND|wxRIGHT - 0 - - - bSizerVersionButtons - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show all versions - - 0 - - - 0 - - 1 - m_showAllVersions - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnShowAllVersionsClicked - - - - 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 - Download - - 0 - - 0 - - - 0 - - 1 - m_buttonDownload - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnDownloadVersionClicked - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Install - - 0 - - 0 - - - 0 - - 1 - m_buttonAction - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnVersionActionClicked - - - - - - - - - + + 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 + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Download + + 0 + + 0 + + + 0 + + 1 + m_buttonDownload + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnDownloadVersionClicked + + + + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Install + + 0 + + 0 + + + 0 + + 1 + m_buttonAction + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnVersionActionClicked + + + + + + + + + diff --git a/kicad/pcm/dialogs/panel_packages_view_base.h b/kicad/pcm/dialogs/panel_packages_view_base.h index 645507d8fe..f659de54d3 100644 --- a/kicad/pcm/dialogs/panel_packages_view_base.h +++ b/kicad/pcm/dialogs/panel_packages_view_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_board_statistics_base.cpp b/pcbnew/dialogs/dialog_board_statistics_base.cpp index f06e190bc6..df7b6cc421 100644 --- a/pcbnew/dialogs/dialog_board_statistics_base.cpp +++ b/pcbnew/dialogs/dialog_board_statistics_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -252,20 +252,20 @@ DIALOG_BOARD_STATISTICS_BASE::DIALOG_BOARD_STATISTICS_BASE( wxWindow* parent, wx bDrillsSizer->Fit( m_drillsPanel ); topNotebook->AddPage( m_drillsPanel, _("Drill Holes"), false ); - bMainBoxSizer->Add( topNotebook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + bMainBoxSizer->Add( topNotebook, 1, wxEXPAND|wxALL, 5 ); wxBoxSizer* bSizerBottom; bSizerBottom = new wxBoxSizer( wxHORIZONTAL ); m_buttonSaveReport = new wxButton( this, wxID_ANY, _("Generate Report File..."), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerBottom->Add( m_buttonSaveReport, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 15 ); + bSizerBottom->Add( m_buttonSaveReport, 0, wxALIGN_CENTER_VERTICAL|wxALL, 15 ); m_sdbControlSizer = new wxStdDialogButtonSizer(); m_sdbControlSizerCancel = new wxButton( this, wxID_CANCEL ); m_sdbControlSizer->AddButton( m_sdbControlSizerCancel ); m_sdbControlSizer->Realize(); - bSizerBottom->Add( m_sdbControlSizer, 1, wxBOTTOM|wxLEFT|wxRIGHT|wxTOP, 5 ); + bSizerBottom->Add( m_sdbControlSizer, 1, wxBOTTOM|wxLEFT|wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL, 5 ); bMainBoxSizer->Add( bSizerBottom, 0, wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/dialog_board_statistics_base.fbp b/pcbnew/dialogs/dialog_board_statistics_base.fbp index e430a12a0e..2418378305 100644 --- a/pcbnew/dialogs/dialog_board_statistics_base.fbp +++ b/pcbnew/dialogs/dialog_board_statistics_base.fbp @@ -1,1247 +1,1263 @@ - + - - - ; - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - dialog_board_statistics_base - 1000 - none - - - 1 - DIALOG_BOARD_STATISTCS_BASE - - . - - 1 - 1 - 1 - 1 - UI - 0 - 0 - 0 - - 0 - wxAUI_MGR_DEFAULT + + + ; + C++ + 1 + source_name + 0 + 0 + res + UTF-8 + connect + dialog_board_statistics_base + 1000 + none + + + 1 + DIALOG_BOARD_STATISTCS_BASE + + . + + 1 + 1 + 1 + 1 + UI + 0 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + wxBOTH + + 1 + 0 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + DIALOG_BOARD_STATISTICS_BASE + + + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + DIALOG_SHIM; dialog_shim.h; forward_declare + Board Statistics + + 0 + + + + windowSize + + + bMainBoxSizer + wxVERTICAL + none + + 5 + wxEXPAND|wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + - wxBOTH + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left + 0 1 - impl_virtual - + 1 + 0 0 wxID_ANY + + 0 + + 0 - DIALOG_BOARD_STATISTICS_BASE + 1 + topNotebook + 1 + + + protected + 1 + Resizable + 1 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - DIALOG_SHIM; dialog_shim.h; forward_declare - Board Statistics + + ; ; forward_declare + 0 - 0 - windowSize - + + + General + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 - bMainBoxSizer - wxVERTICAL - none - + 1 + m_generalPanel + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + + + bGeneralPanelSizer + wxVERTICAL + none + 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND 1 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - topNotebook - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - - - General - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_generalPanel - 1 - - - protected - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - wxTAB_TRAVERSAL - - - bGeneralPanelSizer - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - 2 - wxBOTH - 0,1 - 0,1 - 0 - - fgSizerContents - wxFLEX_GROWMODE_ALL - none - 0 - 0 - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT - 1 - - - bSizerComponents - wxVERTICAL - none - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Components - 0 - - 0 - - - 0 - - 1 - componentsLabel - 1 - - - none - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - - - -1 - - - - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT - 1 - - 1 - 1 - 1 - 1 - - - - - 0 - 0 - - - - 1 - - - wxALIGN_CENTER - - wxALIGN_CENTER - 0 - 1 - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - 4 - - - 1 - 0 - Dock - 0 - Left - 0 - 1 - 0 - 1 - 0 - 1 - - 1 - - - 0 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - -1,300 - - 0 - - 1 - m_gridComponents - 1 - - - protected - 1 - - Resizable - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 5 - 1 - - ; ; forward_declare - 0 - - - - wxVSCROLL - - - - - - 5 - wxEXPAND|wxBOTTOM|wxLEFT - 1 - - - bSizerPads - wxVERTICAL - none - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Pads - 0 - - 0 - - - 0 - - 1 - padsLabel - 1 - - - none - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - 0 - 0 - - - - 1 - - - wxALIGN_CENTER - - wxALIGN_CENTER - 0 - 1 - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - 2 - - - 1 - 0 - Dock - 0 - Left - 0 - 1 - 0 - 1 - 0 - 1 - - 1 - - - 0 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - -1,300 - - 0 - - 1 - m_gridPads - 1 - - - protected - 1 - - Resizable - wxALIGN_RIGHT - 0 - - wxALIGN_CENTER - - 5 - 1 - - ; ; forward_declare - 0 - - - - wxVSCROLL - - - - - - 5 - wxEXPAND|wxRIGHT - 1 - - - bSizerBrdSize - wxVERTICAL - none - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Board Size - 0 - - 0 - - - 0 - - 1 - boardLabel - 1 - - - none - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - - - -1 - - - - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT - 1 - - 1 - 1 - 1 - 1 - - - - - 0 - 0 - - - - 1 - - - wxALIGN_CENTER - - wxALIGN_CENTER - 0 - 1 - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - 2 - - - 1 - 0 - Dock - 0 - Left - 0 - 1 - 0 - 1 - 0 - 1 - - 1 - - - 0 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - -1,300 - - 0 - - 1 - m_gridBoard - 1 - - - protected - 1 - - Resizable - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 3 - 1 - - ; ; forward_declare - 0 - - - - wxVSCROLL - - - - - - 5 - wxEXPAND|wxLEFT - 1 - - - bSizerVias - wxVERTICAL - none - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Vias - 0 - - 0 - - - 0 - - 1 - viasLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT - 1 - - 1 - 1 - 1 - 1 - - - - - 0 - 0 - - - - 1 - - - wxALIGN_CENTER - - wxALIGN_CENTER - 0 - 1 - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - 2 - - - 1 - 0 - Dock - 0 - Left - 0 - 1 - 0 - 1 - 0 - 1 - - 1 - - - 0 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - -1,300 - - 0 - - 1 - m_gridVias - 1 - - - protected - 1 - - Resizable - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 4 - 1 - - ; ; forward_declare - 0 - - - - wxVSCROLL - - - - - - - - 2 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 0 - - gOptionsSizer - none - 0 - 0 - - 4 - wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Subtract holes from board area - - 0 - - - 0 - - 1 - m_checkBoxSubtractHoles - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - checkboxClicked - - - - 4 - wxEXPAND|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Exclude footprints with no pads - - 0 - - - 0 - - 1 - m_checkBoxExcludeComponentsNoPins - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - checkboxClicked - - - - - + + 2 + wxBOTH + 0,1 + 0,1 + 0 + + fgSizerContents + wxFLEX_GROWMODE_ALL + none + 0 + 0 + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT + 1 + + + bSizerComponents + wxVERTICAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Components + 0 + + 0 + + + 0 + + 1 + componentsLabel + 1 + + + none + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + + + -1 + + + 5 + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + 1 + + 1 + 1 + 1 + 1 + + + + + 0 + 0 + + + + 1 + + + wxALIGN_CENTER + + wxALIGN_CENTER + 0 + 1 + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + 4 + + + 1 + 0 + Dock + 0 + Left + 0 + 0 + 1 + 0 + 1 + 0 + 1 + + 1 + + + 0 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + -1,300 + + 0 + + 1 + m_gridComponents + 1 + + + protected + 1 + + Resizable + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 5 + 1 + + ; ; forward_declare + 0 + + + + wxVSCROLL + + - - - Drill Holes - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_drillsPanel - 1 - - - protected - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - wxTAB_TRAVERSAL - - - bDrillsSizer - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - 1 - 0 - - - - 1 - - - wxALIGN_CENTER - - wxALIGN_CENTER - 0 - 1 - wxALIGN_CENTER - 22 - "Count" "Shape" "X Size" "Y Size" "Plated" "Via/Pad" "Start Layer" "Stop Layer" - wxALIGN_CENTER - 8 - - - 1 - 0 - Dock - 0 - Left - 1 - 1 - 0 - 0 - 0 - 1 - - 1 - - - 1 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - -1,-1 - - 0 - - 1 - m_gridDrills - 1 - - - protected - 1 - - Resizable - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 0 - 1 - - WX_GRID; widgets/wx_grid.h; forward_declare - 0 - - - - wxVSCROLL - drillGridSize - - - + + + 5 + wxEXPAND|wxBOTTOM|wxLEFT + 1 + + + bSizerPads + wxVERTICAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Pads + 0 + + 0 + + + 0 + + 1 + padsLabel + 1 + + + none + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + + + -1 + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + 0 + 0 + + + + 1 + + + wxALIGN_CENTER + + wxALIGN_CENTER + 0 + 1 + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + 2 + + + 1 + 0 + Dock + 0 + Left + 0 + 0 + 1 + 0 + 1 + 0 + 1 + + 1 + + + 0 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + -1,300 + + 0 + + 1 + m_gridPads + 1 + + + protected + 1 + + Resizable + wxALIGN_RIGHT + 0 + + wxALIGN_CENTER + + 5 + 1 + + ; ; forward_declare + 0 + + + + wxVSCROLL + + - - - - 5 - wxEXPAND - 0 - - - bSizerBottom - wxHORIZONTAL - none - - 15 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + + + 5 + wxEXPAND|wxRIGHT + 1 + + + bSizerBrdSize + wxVERTICAL + none + + 5 + wxALL 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Generate Report File... - - 0 - - 0 - - - 0 - - 1 - m_buttonSaveReport - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - saveReportClicked + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Board Size + 0 + + 0 + + + 0 + + 1 + boardLabel + 1 + + + none + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + + + -1 + + + + 5 + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + 1 + + 1 + 1 + 1 + 1 + + + + + 0 + 0 + + + + 1 + + + wxALIGN_CENTER + + wxALIGN_CENTER + 0 + 1 + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + 2 + + + 1 + 0 + Dock + 0 + Left + 0 + 0 + 1 + 0 + 1 + 0 + 1 + + 1 + + + 0 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + -1,300 + + 0 + + 1 + m_gridBoard + 1 + + + protected + 1 + + Resizable + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 3 + 1 + + ; ; forward_declare + 0 + + + + wxVSCROLL + - + + + 5 + wxEXPAND|wxLEFT + 1 + + + bSizerVias + wxVERTICAL + none + 5 - wxBOTTOM|wxLEFT|wxRIGHT|wxTOP + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Vias + 0 + + 0 + + + 0 + + 1 + viasLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 1 - - 0 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - - m_sdbControlSizer - protected + + 1 + 1 + 1 + 1 + + + + + 0 + 0 + + + + 1 + + + wxALIGN_CENTER + + wxALIGN_CENTER + 0 + 1 + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + 2 + + + 1 + 0 + Dock + 0 + Left + 0 + 0 + 1 + 0 + 1 + 0 + 1 + + 1 + + + 0 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + -1,300 + + 0 + + 1 + m_gridVias + 1 + + + protected + 1 + + Resizable + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 4 + 1 + + ; ; forward_declare + 0 + + + + wxVSCROLL + + + + + + + 2 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 0 + + gOptionsSizer + none + 0 + 0 + + 4 + wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Subtract holes from board area + + 0 + + + 0 + + 1 + m_checkBoxSubtractHoles + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + checkboxClicked + + + + 4 + wxEXPAND|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Exclude footprints with no pads + + 0 + + + 0 + + 1 + m_checkBoxExcludeComponentsNoPins + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + checkboxClicked + + + + + + + + + Drill Holes + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_drillsPanel + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + + + bDrillsSizer + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + 1 + 0 + + + + 1 + + + wxALIGN_CENTER + + wxALIGN_CENTER + 0 + 1 + wxALIGN_CENTER + 22 + "Count" "Shape" "X Size" "Y Size" "Plated" "Via/Pad" "Start Layer" "Stop Layer" + wxALIGN_CENTER + 8 + + + 1 + 0 + Dock + 0 + Left + 0 + 1 + 1 + 0 + 0 + 0 + 1 + + 1 + + + 1 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + -1,-1 + + 0 + + 1 + m_gridDrills + 1 + + + protected + 1 + + Resizable + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 0 + 1 + + WX_GRID; widgets/wx_grid.h; forward_declare + 0 + + + + wxVSCROLL + drillGridSize + + + + + + + 5 + wxEXPAND + 0 + + + bSizerBottom + wxHORIZONTAL + none + + 15 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Generate Report File... + + 0 + + 0 + + + 0 + + 1 + m_buttonSaveReport + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + saveReportClicked + + + + 5 + wxBOTTOM|wxLEFT|wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL + 1 + + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + + m_sdbControlSizer + protected + + + + diff --git a/pcbnew/dialogs/dialog_board_statistics_base.h b/pcbnew/dialogs/dialog_board_statistics_base.h index 2f51c352e9..7a4ebf008d 100644 --- a/pcbnew/dialogs/dialog_board_statistics_base.h +++ b/pcbnew/dialogs/dialog_board_statistics_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_layer_selection_base.cpp b/pcbnew/dialogs/dialog_layer_selection_base.cpp index 074e3e411f..cef1580dbc 100644 --- a/pcbnew/dialogs/dialog_layer_selection_base.cpp +++ b/pcbnew/dialogs/dialog_layer_selection_base.cpp @@ -1,10 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// +#include "widgets/std_bitmap_button.h" #include "widgets/wx_grid.h" #include "dialog_layer_selection_base.h" @@ -242,11 +243,11 @@ DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE::DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE m_presetsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); m_presetsSizer->Add( m_presetsGrid, 1, wxALL|wxEXPAND, 0 ); - m_deleteRowButton = new wxBitmapButton( m_presetsSizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_presetsSizer->Add( m_deleteRowButton, 0, wxALL, 5 ); + m_deleteRowButton = new STD_BITMAP_BUTTON( m_presetsSizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); + m_presetsSizer->Add( m_deleteRowButton, 0, wxTOP, 5 ); - bSizerUpper->Add( m_presetsSizer, 1, wxEXPAND, 5 ); + bSizerUpper->Add( m_presetsSizer, 1, wxEXPAND|wxLEFT, 10 ); bSizerMain->Add( bSizerUpper, 1, wxALL|wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/dialog_layer_selection_base.fbp b/pcbnew/dialogs/dialog_layer_selection_base.fbp index c213b36b2e..9672f988b4 100644 --- a/pcbnew/dialogs/dialog_layer_selection_base.fbp +++ b/pcbnew/dialogs/dialog_layer_selection_base.fbp @@ -710,8 +710,8 @@ - 5 - wxEXPAND + 10 + wxEXPAND|wxLEFT 1 wxID_ANY @@ -812,7 +812,7 @@ 5 - wxALL + wxTOP 0 1 @@ -872,7 +872,7 @@ 1 - ; ; forward_declare + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare 0 diff --git a/pcbnew/dialogs/dialog_layer_selection_base.h b/pcbnew/dialogs/dialog_layer_selection_base.h index 0f078f0572..a92d813cb3 100644 --- a/pcbnew/dialogs/dialog_layer_selection_base.h +++ b/pcbnew/dialogs/dialog_layer_selection_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -10,6 +10,7 @@ #include #include #include +class STD_BITMAP_BUTTON; class WX_GRID; #include "dialog_shim.h" @@ -74,7 +75,7 @@ class DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE : public DIALOG_SHIM wxGrid* m_rightGridLayers; wxBitmapButton* m_addToPresetsButton; WX_GRID* m_presetsGrid; - wxBitmapButton* m_deleteRowButton; + STD_BITMAP_BUTTON* m_deleteRowButton; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel; diff --git a/pcbnew/sel_layer.cpp b/pcbnew/sel_layer.cpp index 3ff2c2b42d..04dd067e45 100644 --- a/pcbnew/sel_layer.cpp +++ b/pcbnew/sel_layer.cpp @@ -45,6 +45,7 @@ #include #include #include +#include // Column position by function: @@ -685,7 +686,7 @@ public: m_presetsGridController( *m_presetsGrid, m_layerPresentation, m_dialogPairSettings ) { m_addToPresetsButton->SetBitmap( KiBitmapBundle( BITMAPS::right ) ); - m_deleteRowButton->SetBitmap( KiBitmapBundle( BITMAPS::trash ) ); + m_deleteRowButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) ); m_addToPresetsButton->Bind( wxEVT_BUTTON, [this]( wxCommandEvent& aEvent )