diff --git a/pcbnew/dialogs/dialog_multichannel_generate_rule_areas.cpp b/pcbnew/dialogs/dialog_multichannel_generate_rule_areas.cpp index 81855a582e..ab93a15e71 100644 --- a/pcbnew/dialogs/dialog_multichannel_generate_rule_areas.cpp +++ b/pcbnew/dialogs/dialog_multichannel_generate_rule_areas.cpp @@ -35,8 +35,11 @@ DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS::DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS_BASE( aFrame ), m_parentTool( aParentTool ) { + m_bSizer1 = new wxBoxSizer( wxVERTICAL ); + m_bSizer2 = new wxBoxSizer( wxVERTICAL ); + // Generate the sheet source grid - m_sheetGrid = new WX_GRID( m_sourceNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_sheetGrid = new WX_GRID( m_panel1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxVSCROLL ); m_sheetGrid->PushEventHandler( new GRID_TRICKS( static_cast( m_sheetGrid ) ) ); m_sheetGrid->CreateGrid( 0, 3 ); m_sheetGrid->EnableEditing( false ); @@ -61,11 +64,13 @@ DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS::DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS m_sheetGrid->SetColLabelValue( 1, _( "Sheet Path" ) ); m_sheetGrid->SetColLabelValue( 2, _( "Sheet Name" ) ); m_sheetGrid->AutoSizeColumn( 1 ); - m_sourceNotebook->AddPage( m_sheetGrid, _( "Sheets" ) ); + m_bSizer1->Add( m_sheetGrid, 1, wxEXPAND | wxALL, 5 ); + m_panel1->SetSizer( m_bSizer1 ); + m_panel1->Layout(); + m_bSizer1->Fit( m_panel1 ); // Generate the component class source grid - m_componentClassGrid = - new WX_GRID( m_sourceNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_componentClassGrid = new WX_GRID( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxVSCROLL ); m_componentClassGrid->CreateGrid( 0, 2 ); m_componentClassGrid->EnableEditing( false ); m_componentClassGrid->EnableGridLines( true ); @@ -87,7 +92,10 @@ DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS::DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS m_componentClassGrid->SetColLabelValue( 0, _( "Generate" ) ); m_componentClassGrid->SetColLabelValue( 1, _( "Component Class" ) ); m_componentClassGrid->AutoSizeColumn( 1 ); - m_sourceNotebook->AddPage( m_componentClassGrid, _( "Component Classes" ) ); + m_bSizer2->Add( m_componentClassGrid, 1, wxEXPAND | wxALL, 5 ); + m_panel2->SetSizer( m_bSizer2 ); + m_panel2->Layout(); + m_bSizer2->Fit( m_panel2 ); RULE_AREAS_DATA* raData = m_parentTool->GetData(); @@ -137,13 +145,10 @@ DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS::DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS } } - m_sheetGrid->SetMaxSize( wxSize( -1, 800 ) ); m_sheetGrid->Fit(); - m_componentClassGrid->SetMaxSize( wxSize( -1, 800 ) ); m_componentClassGrid->Fit(); m_cbGroupItems->SetValue( raData->m_options.m_groupItems ); m_cbReplaceExisting->SetValue( raData->m_replaceExisting ); - Layout(); if( m_sheetGrid->GetNumberRows() == 1 && m_componentClassGrid->GetNumberRows() > 0 ) diff --git a/pcbnew/dialogs/dialog_multichannel_generate_rule_areas.h b/pcbnew/dialogs/dialog_multichannel_generate_rule_areas.h index 670ce714db..5b43e284e5 100644 --- a/pcbnew/dialogs/dialog_multichannel_generate_rule_areas.h +++ b/pcbnew/dialogs/dialog_multichannel_generate_rule_areas.h @@ -48,6 +48,8 @@ public: private: MULTICHANNEL_TOOL* m_parentTool; + wxBoxSizer* m_bSizer1; + wxBoxSizer* m_bSizer2; wxGrid* m_sheetGrid; wxGrid* m_componentClassGrid; }; diff --git a/pcbnew/dialogs/dialog_multichannel_generate_rule_areas_base.cpp b/pcbnew/dialogs/dialog_multichannel_generate_rule_areas_base.cpp index 666ce2464a..264b21d2cc 100644 --- a/pcbnew/dialogs/dialog_multichannel_generate_rule_areas_base.cpp +++ b/pcbnew/dialogs/dialog_multichannel_generate_rule_areas_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -11,21 +11,31 @@ DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS_BASE::DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS_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( wxSize( 500,-1 ), wxDefaultSize ); - - m_GeneralBoxSizer = new wxBoxSizer( wxVERTICAL ); + this->SetSizeHints( wxSize( -1,-1 ), wxSize( -1,-1 ) ); wxFlexGridSizer* fgSizer3; - fgSizer3 = new wxFlexGridSizer( 3, 1, 0, 0 ); + fgSizer3 = new wxFlexGridSizer( 0, 1, 0, 0 ); fgSizer3->AddGrowableCol( 0 ); fgSizer3->AddGrowableRow( 0 ); fgSizer3->SetFlexibleDirection( wxBOTH ); fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); m_sourceNotebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_sourceNotebook->SetMinSize( wxSize( 600,400 ) ); + + m_panel1 = new wxPanel( m_sourceNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_sourceNotebook->AddPage( m_panel1, _("Sheets"), false ); + m_panel2 = new wxPanel( m_sourceNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_sourceNotebook->AddPage( m_panel2, _("Component Classes"), false ); fgSizer3->Add( m_sourceNotebook, 1, wxEXPAND | wxALL, 5 ); + wxBoxSizer* bSizer4; + bSizer4 = new wxBoxSizer( wxVERTICAL ); + + + fgSizer3->Add( bSizer4, 1, wxEXPAND, 5 ); + wxBoxSizer* bSizer13; bSizer13 = new wxBoxSizer( wxVERTICAL ); @@ -57,11 +67,9 @@ DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS_BASE::DIALOG_MULTICHANNEL_GENERATE_RULE_ fgSizer3->Add( bottomButtonsSizer, 0, wxEXPAND|wxLEFT, 5 ); - m_GeneralBoxSizer->Add( fgSizer3, 1, wxEXPAND, 5 ); - - - this->SetSizer( m_GeneralBoxSizer ); + this->SetSizer( fgSizer3 ); this->Layout(); + fgSizer3->Fit( this ); // Connect Events this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS_BASE::OnInitDlg ) ); diff --git a/pcbnew/dialogs/dialog_multichannel_generate_rule_areas_base.fbp b/pcbnew/dialogs/dialog_multichannel_generate_rule_areas_base.fbp index 928227f675..b6e1d0b4c1 100644 --- a/pcbnew/dialogs/dialog_multichannel_generate_rule_areas_base.fbp +++ b/pcbnew/dialogs/dialog_multichannel_generate_rule_areas_base.fbp @@ -46,11 +46,11 @@ 0 wxID_ANY - - 500,-1 + -1,-1 + -1,-1 DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS_BASE - 548,328 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Generate Multichannel Rule Areas @@ -61,32 +61,140 @@ OnInitDlg OnUpdateUI - + + 1 + wxBOTH + 0 + 0 + 0 -1,-1 - m_GeneralBoxSizer - wxVERTICAL - private + fgSizer3 + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 0 5 - wxEXPAND + wxEXPAND | wxALL 1 - - 1 - wxBOTH - 0 - 0 - 0 - -1,-1 - fgSizer3 - wxFLEX_GROWMODE_SPECIFIED - none - 3 - 0 - - 5 - wxEXPAND | wxALL - 1 - + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + -1,-1 + + 0 + 600,400 + 1 + m_sourceNotebook + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + OnNotebookPageChanged + + + Sheets + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + -1,-1 + + 0 + + 1 + m_panel1 + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + + + + + Component Classes + 0 + 1 1 1 @@ -97,7 +205,6 @@ 0 - 1 0 @@ -123,7 +230,89 @@ 0 1 - m_sourceNotebook + m_panel2 + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + + + + + + 5 + wxEXPAND + 1 + + + bSizer4 + wxVERTICAL + none + + + + 5 + wxEXPAND + 1 + + + bSizer13 + wxVERTICAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Replace existing placement rule areas + + 0 + + + 0 + + 1 + m_cbReplaceExisting 1 @@ -137,189 +326,117 @@ ; ; forward_declare 0 + + wxFILTER_NONE + wxDefaultValidator + - + 5 - wxEXPAND - 1 - + wxALL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Group footprints with their placement rule areas + + 0 + + + 0 - bSizer13 - wxVERTICAL - none - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Replace existing placement rule areas - - 0 - - - 0 - - 1 - m_cbReplaceExisting - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Group footprints with their placement rule areas - - 0 - - - 0 - - 1 - m_cbGroupItems - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - + 1 + m_cbGroupItems + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + - + + + + 5 + wxEXPAND|wxLEFT + 0 + + + bottomButtonsSizer + wxHORIZONTAL + none + 5 - wxEXPAND|wxLEFT + + 1 + + 0 + protected + 10 + + + + 5 + wxALL 0 - + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 - bottomButtonsSizer - wxHORIZONTAL - none - - 5 - - 1 - - 0 - protected - 10 - - - - 5 - wxALL - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizerStdButtons - protected - - + m_sdbSizerStdButtons + protected diff --git a/pcbnew/dialogs/dialog_multichannel_generate_rule_areas_base.h b/pcbnew/dialogs/dialog_multichannel_generate_rule_areas_base.h index 0439699a3a..831d4a022c 100644 --- a/pcbnew/dialogs/dialog_multichannel_generate_rule_areas_base.h +++ b/pcbnew/dialogs/dialog_multichannel_generate_rule_areas_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -11,14 +11,18 @@ #include #include #include "dialog_shim.h" +#include #include -#include #include #include #include #include -#include +#include +#include +#include +#include #include +#include #include #include @@ -30,10 +34,11 @@ class DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS_BASE : public DIALOG_SHIM { private: - wxBoxSizer* m_GeneralBoxSizer; protected: wxNotebook* m_sourceNotebook; + wxPanel* m_panel1; + wxPanel* m_panel2; wxCheckBox* m_cbReplaceExisting; wxCheckBox* m_cbGroupItems; wxStdDialogButtonSizer* m_sdbSizerStdButtons; @@ -47,7 +52,7 @@ class DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS_BASE : public DIALOG_SHIM public: - DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Generate Multichannel Rule Areas"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 548,328 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Generate Multichannel Rule Areas"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_MULTICHANNEL_GENERATE_RULE_AREAS_BASE();