diff --git a/pcbnew/dialogs/dialog_rule_area_properties_base.cpp b/pcbnew/dialogs/dialog_rule_area_properties_base.cpp index 0da6f71575..3cf0715768 100644 --- a/pcbnew/dialogs/dialog_rule_area_properties_base.cpp +++ b/pcbnew/dialogs/dialog_rule_area_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -24,7 +24,7 @@ DIALOG_RULE_AREA_PROPERTIES_BASE::DIALOG_RULE_AREA_PROPERTIES_BASE( wxWindow* pa m_staticTextLayerSelection = new wxStaticText( this, wxID_ANY, _("Layers:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextLayerSelection->Wrap( -1 ); - bLayersListSizer->Add( m_staticTextLayerSelection, 0, wxALL, 5 ); + bLayersListSizer->Add( m_staticTextLayerSelection, 0, wxALL, 4 ); m_layers = new wxDataViewListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_NO_HEADER|wxBORDER_SIMPLE ); bLayersListSizer->Add( m_layers, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); @@ -38,41 +38,6 @@ DIALOG_RULE_AREA_PROPERTIES_BASE::DIALOG_RULE_AREA_PROPERTIES_BASE( wxWindow* pa wxBoxSizer* bSizerRight; bSizerRight = new wxBoxSizer( wxVERTICAL ); - m_staticTextBasicRules = new wxStaticText( this, wxID_ANY, _("Basic rules:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextBasicRules->Wrap( -1 ); - bSizerRight->Add( m_staticTextBasicRules, 0, wxRIGHT|wxLEFT, 5 ); - - - bSizerRight->Add( 0, 3, 0, wxEXPAND, 5 ); - - m_cbTracksCtrl = new wxCheckBox( this, wxID_ANY, _("Keep out tracks"), wxDefaultPosition, wxDefaultSize, 0 ); - m_cbTracksCtrl->SetToolTip( _("Prevent tracks from routing into this area") ); - - bSizerRight->Add( m_cbTracksCtrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - m_cbViasCtrl = new wxCheckBox( this, wxID_ANY, _("Keep out vias"), wxDefaultPosition, wxDefaultSize, 0 ); - m_cbViasCtrl->SetToolTip( _("Prevent vias from being placed in this area") ); - - bSizerRight->Add( m_cbViasCtrl, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - m_cbPadsCtrl = new wxCheckBox( this, wxID_ANY, _("Keep out pads"), wxDefaultPosition, wxDefaultSize, 0 ); - m_cbPadsCtrl->SetToolTip( _("Raise a DRC error if a pad overlaps this area") ); - - bSizerRight->Add( m_cbPadsCtrl, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_cbCopperPourCtrl = new wxCheckBox( this, wxID_ANY, _("Keep out copper fill"), wxDefaultPosition, wxDefaultSize, 0 ); - m_cbCopperPourCtrl->SetToolTip( _("Zones will not fill copper into this area") ); - - bSizerRight->Add( m_cbCopperPourCtrl, 0, wxALL|wxEXPAND, 5 ); - - m_cbFootprintsCtrl = new wxCheckBox( this, wxID_ANY, _("Keep out footprints"), wxDefaultPosition, wxDefaultSize, 0 ); - m_cbFootprintsCtrl->SetToolTip( _("Raise a DRC error if a footprint courtyard overlaps this area") ); - - bSizerRight->Add( m_cbFootprintsCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - - bSizerRight->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - wxBoxSizer* bSizer6; bSizer6 = new wxBoxSizer( wxVERTICAL ); @@ -80,60 +45,104 @@ DIALOG_RULE_AREA_PROPERTIES_BASE::DIALOG_RULE_AREA_PROPERTIES_BASE( wxWindow* pa m_staticText3->Wrap( -1 ); m_staticText3->SetToolTip( _("A unique name for this rule area for use in DRC rules") ); - bSizer6->Add( m_staticText3, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + bSizer6->Add( m_staticText3, 0, wxRIGHT|wxLEFT, 5 ); - bSizer6->Add( 0, 2, 1, wxEXPAND, 5 ); + bSizer6->Add( 0, 2, 0, 0, 5 ); m_tcName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_tcName->SetToolTip( _("A unique name for this rule area for use in DRC rules") ); bSizer6->Add( m_tcName, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + m_cbLocked = new wxCheckBox( this, wxID_ANY, _("Locked"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer6->Add( m_cbLocked, 0, wxALL, 5 ); - bSizerRight->Add( bSizer6, 1, wxEXPAND, 5 ); + + bSizerRight->Add( bSizer6, 0, wxEXPAND|wxBOTTOM, 5 ); + + wxFlexGridSizer* fgSizer2; + fgSizer2 = new wxFlexGridSizer( 0, 1, 3, 0 ); + fgSizer2->SetFlexibleDirection( wxBOTH ); + fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + m_staticTextBasicRules = new wxStaticText( this, wxID_ANY, _("Basic rules:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextBasicRules->Wrap( -1 ); + fgSizer2->Add( m_staticTextBasicRules, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_cbTracksCtrl = new wxCheckBox( this, wxID_ANY, _("Keep out tracks"), wxDefaultPosition, wxDefaultSize, 0 ); + m_cbTracksCtrl->SetToolTip( _("Prevent tracks from routing into this area") ); + + fgSizer2->Add( m_cbTracksCtrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + + m_cbViasCtrl = new wxCheckBox( this, wxID_ANY, _("Keep out vias"), wxDefaultPosition, wxDefaultSize, 0 ); + m_cbViasCtrl->SetToolTip( _("Prevent vias from being placed in this area") ); + + fgSizer2->Add( m_cbViasCtrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + + m_cbPadsCtrl = new wxCheckBox( this, wxID_ANY, _("Keep out pads"), wxDefaultPosition, wxDefaultSize, 0 ); + m_cbPadsCtrl->SetToolTip( _("Raise a DRC error if a pad overlaps this area") ); + + fgSizer2->Add( m_cbPadsCtrl, 0, wxRIGHT|wxLEFT, 5 ); + + m_cbCopperPourCtrl = new wxCheckBox( this, wxID_ANY, _("Keep out copper fill"), wxDefaultPosition, wxDefaultSize, 0 ); + m_cbCopperPourCtrl->SetToolTip( _("Zones will not fill copper into this area") ); + + fgSizer2->Add( m_cbCopperPourCtrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + + m_cbFootprintsCtrl = new wxCheckBox( this, wxID_ANY, _("Keep out footprints"), wxDefaultPosition, wxDefaultSize, 0 ); + m_cbFootprintsCtrl->SetToolTip( _("Raise a DRC error if a footprint courtyard overlaps this area") ); + + fgSizer2->Add( m_cbFootprintsCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + + bSizerRight->Add( fgSizer2, 0, wxEXPAND, 5 ); + + + bSizerRight->Add( 0, 3, 0, wxEXPAND, 5 ); + + + bSizerRight->Add( 0, 0, 0, wxEXPAND|wxTOP, 5 ); + + + bSizerRight->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); + + wxGridBagSizer* gbSizer1; + gbSizer1 = new wxGridBagSizer( 3, 3 ); + gbSizer1->SetFlexibleDirection( wxBOTH ); + gbSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + gbSizer1->SetEmptyCellSize( wxSize( -1,2 ) ); m_cbConstrainCtrl = new wxCheckBox( this, wxID_ANY, _("Constrain outline to H, V and 45 deg"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbConstrainCtrl->SetToolTip( _("Draw the area using horizontal, vertical and 45 degree lines only") ); - bSizerRight->Add( m_cbConstrainCtrl, 0, wxALL, 5 ); - - m_cbLocked = new wxCheckBox( this, wxID_ANY, _("Locked"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerRight->Add( m_cbLocked, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - wxFlexGridSizer* fgSizerLowerRigth; - fgSizerLowerRigth = new wxFlexGridSizer( 0, 3, 0, 0 ); - fgSizerLowerRigth->SetFlexibleDirection( wxBOTH ); - fgSizerLowerRigth->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + gbSizer1->Add( m_cbConstrainCtrl, wxGBPosition( 0, 0 ), wxGBSpan( 1, 3 ), wxALIGN_CENTER_VERTICAL, 5 ); m_staticTextStyle = new wxStaticText( this, wxID_ANY, _("Outline display:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextStyle->Wrap( -1 ); - fgSizerLowerRigth->Add( m_staticTextStyle, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + gbSizer1->Add( m_staticTextStyle, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); wxString m_OutlineDisplayCtrlChoices[] = { _("Line"), _("Hatched"), _("Fully hatched") }; int m_OutlineDisplayCtrlNChoices = sizeof( m_OutlineDisplayCtrlChoices ) / sizeof( wxString ); m_OutlineDisplayCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_OutlineDisplayCtrlNChoices, m_OutlineDisplayCtrlChoices, 0 ); m_OutlineDisplayCtrl->SetSelection( 0 ); - fgSizerLowerRigth->Add( m_OutlineDisplayCtrl, 0, wxALL, 5 ); - - - fgSizerLowerRigth->Add( 0, 0, 1, wxEXPAND, 5 ); + gbSizer1->Add( m_OutlineDisplayCtrl, wxGBPosition( 2, 1 ), wxGBSpan( 1, 2 ), wxEXPAND, 5 ); m_stBorderHatchPitchText = new wxStaticText( this, wxID_ANY, _("Outline hatch pitch:"), wxDefaultPosition, wxDefaultSize, 0 ); m_stBorderHatchPitchText->Wrap( -1 ); - fgSizerLowerRigth->Add( m_stBorderHatchPitchText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + gbSizer1->Add( m_stBorderHatchPitchText, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); m_outlineHatchPitchCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_outlineHatchPitchCtrl->SetToolTip( _("A unique name for this rule area for use in DRC rules") ); - fgSizerLowerRigth->Add( m_outlineHatchPitchCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + gbSizer1->Add( m_outlineHatchPitchCtrl, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); m_outlineHatchUnits = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_outlineHatchUnits->Wrap( -1 ); - fgSizerLowerRigth->Add( m_outlineHatchUnits, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + gbSizer1->Add( m_outlineHatchUnits, wxGBPosition( 3, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); - bSizerRight->Add( fgSizerLowerRigth, 1, wxEXPAND, 5 ); + bSizerRight->Add( gbSizer1, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); bUpperSizer->Add( bSizerRight, 0, wxEXPAND|wxALL, 5 ); diff --git a/pcbnew/dialogs/dialog_rule_area_properties_base.fbp b/pcbnew/dialogs/dialog_rule_area_properties_base.fbp index 9bbd3eb184..8b14c64af1 100644 --- a/pcbnew/dialogs/dialog_rule_area_properties_base.fbp +++ b/pcbnew/dialogs/dialog_rule_area_properties_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,7 +14,6 @@ dialog_rule_area_properties_base 1000 none - 1 dialog_rule_areas_properties_base @@ -26,7 +25,6 @@ 1 1 UI - 0 0 0 @@ -52,7 +50,6 @@ DIALOG_SHIM; dialog_shim.h Rule Area Properties - 0 wxFULL_REPAINT_ON_RESIZE|wxBORDER_SUNKEN @@ -80,7 +77,7 @@ wxVERTICAL none - 5 + 4 wxALL 0 @@ -193,409 +190,8 @@ none 5 - wxRIGHT|wxLEFT + wxEXPAND|wxBOTTOM 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Basic rules: - 0 - - 0 - - - 0 - - 1 - m_staticTextBasicRules - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND - 0 - - 3 - protected - 0 - - - - 5 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Keep out tracks - - 0 - - - 0 - - 1 - m_cbTracksCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Prevent tracks from routing into this area - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Keep out vias - - 0 - - - 0 - - 1 - m_cbViasCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Prevent vias from being placed in this area - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Keep out pads - - 0 - - - 0 - - 1 - m_cbPadsCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Raise a DRC error if a pad overlaps this area - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Keep out copper fill - - 0 - - - 0 - - 1 - m_cbCopperPourCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Zones will not fill copper into this area - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Keep out footprints - - 0 - - - 0 - - 1 - m_cbFootprintsCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Raise a DRC error if a footprint courtyard overlaps this area - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxEXPAND|wxTOP|wxBOTTOM - 0 - - 0 - protected - 0 - - - - 5 - wxEXPAND - 1 bSizer6 @@ -603,7 +199,7 @@ none 5 - wxTOP|wxRIGHT|wxLEFT + wxRIGHT|wxLEFT 0 1 @@ -664,8 +260,8 @@ 5 - wxEXPAND - 1 + + 0 2 protected @@ -736,156 +332,590 @@ - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Constrain outline to H, V and 45 deg - - 0 - - - 0 - - 1 - m_cbConstrainCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - Draw the area using horizontal, vertical and 45 degree lines only - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Locked - - 0 - - - 0 - - 1 - m_cbLocked - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Locked + + 0 + + + 0 + + 1 + m_cbLocked + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + 5 wxEXPAND - 1 + 0 - 3 + 1 wxBOTH 0 - fgSizerLowerRigth + fgSizer2 wxFLEX_GROWMODE_SPECIFIED none 0 - 0 + 3 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + wxTOP|wxRIGHT|wxLEFT 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Basic rules: + 0 + + 0 + + + 0 + + 1 + m_staticTextBasicRules + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Keep out tracks + + 0 + + + 0 + + 1 + m_cbTracksCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Prevent tracks from routing into this area + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Keep out vias + + 0 + + + 0 + + 1 + m_cbViasCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Prevent vias from being placed in this area + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Keep out pads + + 0 + + + 0 + + 1 + m_cbPadsCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Raise a DRC error if a pad overlaps this area + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Keep out copper fill + + 0 + + + 0 + + 1 + m_cbCopperPourCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Zones will not fill copper into this area + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Keep out footprints + + 0 + + + 0 + + 1 + m_cbFootprintsCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Raise a DRC error if a footprint courtyard overlaps this area + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + 5 + wxEXPAND + 0 + + 3 + protected + 0 + + + + 5 + wxEXPAND|wxTOP + 0 + + 0 + protected + 0 + + + + 5 + wxEXPAND|wxTOP|wxBOTTOM + 0 + + 0 + protected + 0 + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 1 + + -1,2 + wxBOTH + + + 3 + + gbSizer1 + wxFLEX_GROWMODE_SPECIFIED + none + 3 + + 5 + 3 + 0 + wxALIGN_CENTER_VERTICAL + 0 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Constrain outline to H, V and 45 deg + + 0 + + + 0 + + 1 + m_cbConstrainCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + Draw the area using horizontal, vertical and 45 degree lines only + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + 1 + 0 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 2 + 1 1 1 @@ -943,10 +973,13 @@ -1 - + 5 - wxALL - 0 + 2 + 1 + wxEXPAND + 2 + 1 1 1 @@ -1007,20 +1040,13 @@ - + 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 + 1 + 0 + wxALIGN_CENTER_VERTICAL + 3 + 1 1 1 @@ -1078,10 +1104,13 @@ -1 - + 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 0 + 1 + 1 + wxALIGN_CENTER_VERTICAL + 3 + 1 1 1 @@ -1142,10 +1171,13 @@ - + 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 + 1 + 2 + wxALIGN_CENTER_VERTICAL + 3 + 1 1 1 diff --git a/pcbnew/dialogs/dialog_rule_area_properties_base.h b/pcbnew/dialogs/dialog_rule_area_properties_base.h index 8c246471a4..4a8181d90a 100644 --- a/pcbnew/dialogs/dialog_rule_area_properties_base.h +++ b/pcbnew/dialogs/dialog_rule_area_properties_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -19,9 +19,10 @@ #include #include #include -#include #include +#include #include +#include #include #include #include @@ -39,16 +40,16 @@ class DIALOG_RULE_AREA_PROPERTIES_BASE : public DIALOG_SHIM protected: wxStaticText* m_staticTextLayerSelection; wxDataViewListCtrl* m_layers; + wxStaticText* m_staticText3; + wxTextCtrl* m_tcName; + wxCheckBox* m_cbLocked; wxStaticText* m_staticTextBasicRules; wxCheckBox* m_cbTracksCtrl; wxCheckBox* m_cbViasCtrl; wxCheckBox* m_cbPadsCtrl; wxCheckBox* m_cbCopperPourCtrl; wxCheckBox* m_cbFootprintsCtrl; - wxStaticText* m_staticText3; - wxTextCtrl* m_tcName; wxCheckBox* m_cbConstrainCtrl; - wxCheckBox* m_cbLocked; wxStaticText* m_staticTextStyle; wxChoice* m_OutlineDisplayCtrl; wxStaticText* m_stBorderHatchPitchText; @@ -59,7 +60,7 @@ class DIALOG_RULE_AREA_PROPERTIES_BASE : public DIALOG_SHIM wxButton* m_sdbSizerButtonsOK; wxButton* m_sdbSizerButtonsCancel; - // Virtual event handlers, override them in your derived class + // Virtual event handlers, overide them in your derived class virtual void OnLayerSelection( wxDataViewEvent& event ) { event.Skip(); } virtual void onLayerListRightDown( wxMouseEvent& event ) { event.Skip(); } virtual void OnSizeLayersList( wxSizeEvent& event ) { event.Skip(); } @@ -68,7 +69,6 @@ class DIALOG_RULE_AREA_PROPERTIES_BASE : public DIALOG_SHIM public: DIALOG_RULE_AREA_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Rule Area Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxFULL_REPAINT_ON_RESIZE|wxBORDER_SUNKEN ); - ~DIALOG_RULE_AREA_PROPERTIES_BASE(); };