haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove checkboxes that can't be unchecked (part 1) 

The checkboxes for copper layers should probably also be removed
but leaving them for now since they direct the user to the right
place to disable copper layers.
This commit is contained in:
Jon Evans 2021-08-24 20:29:03 -04:00
parent a03b6f6fc9
commit a7bd621419
4 changed files with 177 additions and 419 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pcbnew/dialogs/panel_setup_layers.cpp
View File

@ -135,10 +135,11 @@ PANEL_SETUP_LAYERS_CTLs PANEL_SETUP_LAYERS::getCTLs( LAYER_NUM aLayerNumber )
{
#define RETURN_COPPER( x ) return PANEL_SETUP_LAYERS_CTLs( x##Name, x##CheckBox, x##Choice )
#define RETURN_AUX( x ) return PANEL_SETUP_LAYERS_CTLs( x##Name, x##CheckBox, x##StaticText )
#define RETURN_MANDATORY( x ) return PANEL_SETUP_LAYERS_CTLs( x##Name, nullptr, x##StaticText )
switch( aLayerNumber )
{
case F_CrtYd: RETURN_AUX( m_CrtYdFront );
case F_CrtYd: RETURN_MANDATORY( m_CrtYdFront );
case F_Fab: RETURN_AUX( m_FabFront );
case F_Adhes: RETURN_AUX( m_AdhesFront );
case F_Paste: RETURN_AUX( m_SoldPFront );
@ -184,10 +185,10 @@ PANEL_SETUP_LAYERS_CTLs PANEL_SETUP_LAYERS::getCTLs( LAYER_NUM aLayerNumber )
case B_Paste: RETURN_AUX( m_SoldPBack );
case B_Adhes: RETURN_AUX( m_AdhesBack );
case B_Fab: RETURN_AUX( m_FabBack );
case B_CrtYd: RETURN_AUX( m_CrtYdBack );
case B_CrtYd: RETURN_MANDATORY( m_CrtYdBack );
case Edge_Cuts: RETURN_AUX( m_PCBEdges );
case Margin: RETURN_AUX( m_Margin );
case Edge_Cuts: RETURN_MANDATORY( m_PCBEdges );
case Margin: RETURN_MANDATORY( m_Margin );
case Eco2_User: RETURN_AUX( m_Eco2 );
case Eco1_User: RETURN_AUX( m_Eco1 );
case Cmts_User: RETURN_AUX( m_Comments );
@ -272,6 +273,9 @@ void PANEL_SETUP_LAYERS::setUserDefinedLayerCheckBoxes()
// This code hides inactive copper layers, or redisplays hidden layers which are now needed.
PANEL_SETUP_LAYERS_CTLs ctl = getCTLs( layer );
// All user-defined layers should have a checkbox
wxASSERT( ctl.checkbox );
ctl.name->Show( state );
ctl.checkbox->Show( state );
ctl.choice->Show( state );
@ -344,7 +348,7 @@ LSET PANEL_SETUP_LAYERS::GetUILayerMask()
PCB_LAYER_ID layer = *seq;
wxCheckBox* ctl = getCheckBox( layer );
if( ctl->GetValue() )
if( !ctl || ctl->GetValue() )
layerMaskResult.set( layer );
}
@ -356,6 +360,9 @@ void PANEL_SETUP_LAYERS::setLayerCheckBox( LAYER_NUM aLayer, bool isChecked )
{
PANEL_SETUP_LAYERS_CTLs ctl = getCTLs( aLayer );
if( !ctl.checkbox )
return;
ctl.checkbox->SetValue( isChecked );
}
@ -383,6 +390,9 @@ void PANEL_SETUP_LAYERS::setCopperLayerCheckBoxes( int copperCount )
// This code hides inactive copper layers, or redisplays hidden layers which are now needed.
PANEL_SETUP_LAYERS_CTLs ctl = getCTLs( layer );
// Inner layers should have a checkbox
wxASSERT( ctl.checkbox );
ctl.name->Show( state );
ctl.checkbox->Show( state );
ctl.choice->Show( state );
@ -424,19 +434,6 @@ void PANEL_SETUP_LAYERS::DenyChangeCheckBox( wxCommandEvent& event )
return;
}
}
for( int layer : { F_CrtYd, B_CrtYd, Edge_Cuts, Margin } )
{
wxCheckBox* mandatory = getCheckBox( layer );
if( source == mandatory )
{
msg.Printf( _( "The %s layer is mandatory." ), GetLayerName( layer ) );
DisplayError( this, msg );
mandatory->SetValue( true );
return;
}
}
}
@ -840,6 +837,9 @@ void PANEL_SETUP_LAYERS::addUserDefinedLayer( wxCommandEvent& aEvent )
PANEL_SETUP_LAYERS_CTLs ctl = getCTLs( *seq );
// All user-defined layers should have a checkbox
wxASSERT( ctl.checkbox );
wxTextCtrl* textCtrl = dynamic_cast<wxTextCtrl*>( ctl.name );
wxCHECK( textCtrl, /* void */ );

24
pcbnew/dialogs/panel_setup_layers_base.cpp
View File

@ -40,10 +40,8 @@ PANEL_SETUP_LAYERS_BASE::PANEL_SETUP_LAYERS_BASE( wxWindow* parent, wxWindowID i
m_LayerListFlexGridSizer->SetFlexibleDirection( wxHORIZONTAL );
m_LayerListFlexGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_CrtYdFrontCheckBox = new wxCheckBox( m_LayersListPanel, ID_CRTYDFRONTCHECKBOX, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );
m_CrtYdFrontCheckBox->SetToolTip( _("If you want a courtyard layer for the front side of the board") );
m_LayerListFlexGridSizer->Add( m_CrtYdFrontCheckBox, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxLEFT, 5 );
m_LayerListFlexGridSizer->Add( 0, 0, 1, wxEXPAND, 5 );
m_CrtYdFrontName = new wxTextCtrl( m_LayersListPanel, wxID_ANY, _("CrtYd_Front"), wxDefaultPosition, wxDefaultSize, 0 );
m_CrtYdFrontName->SetMinSize( wxSize( 160,-1 ) );
@ -632,10 +630,8 @@ PANEL_SETUP_LAYERS_BASE::PANEL_SETUP_LAYERS_BASE( wxWindow* parent, wxWindowID i
m_FabBackStaticText->Wrap( -1 );
m_LayerListFlexGridSizer->Add( m_FabBackStaticText, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
m_CrtYdBackCheckBox = new wxCheckBox( m_LayersListPanel, ID_CRTYDBACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_CrtYdBackCheckBox->SetToolTip( _("If you want a courtyard layer for the back side of the board") );
m_LayerListFlexGridSizer->Add( m_CrtYdBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
m_LayerListFlexGridSizer->Add( 0, 0, 1, wxEXPAND, 5 );
m_CrtYdBackName = new wxTextCtrl( m_LayersListPanel, wxID_ANY, _("CrtYd_Back"), wxDefaultPosition, wxDefaultSize, 0 );
m_LayerListFlexGridSizer->Add( m_CrtYdBackName, 0, wxEXPAND|wxRIGHT, 5 );
@ -644,10 +640,8 @@ PANEL_SETUP_LAYERS_BASE::PANEL_SETUP_LAYERS_BASE( wxWindow* parent, wxWindowID i
m_CrtYdBackStaticText->Wrap( -1 );
m_LayerListFlexGridSizer->Add( m_CrtYdBackStaticText, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
m_PCBEdgesCheckBox = new wxCheckBox( m_LayersListPanel, ID_PCBEDGESCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_PCBEdgesCheckBox->SetToolTip( _("If you want a board perimeter layer") );
m_LayerListFlexGridSizer->Add( m_PCBEdgesCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
m_LayerListFlexGridSizer->Add( 0, 0, 1, wxEXPAND, 5 );
m_PCBEdgesName = new wxTextCtrl( m_LayersListPanel, wxID_ANY, _("Pcb_Edges"), wxDefaultPosition, wxDefaultSize, 0 );
m_LayerListFlexGridSizer->Add( m_PCBEdgesName, 0, wxEXPAND|wxRIGHT, 5 );
@ -656,8 +650,8 @@ PANEL_SETUP_LAYERS_BASE::PANEL_SETUP_LAYERS_BASE( wxWindow* parent, wxWindowID i
m_PCBEdgesStaticText->Wrap( -1 );
m_LayerListFlexGridSizer->Add( m_PCBEdgesStaticText, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
m_MarginCheckBox = new wxCheckBox( m_LayersListPanel, ID_MARGINCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_LayerListFlexGridSizer->Add( m_MarginCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
m_LayerListFlexGridSizer->Add( 0, 0, 1, wxEXPAND, 5 );
m_MarginName = new wxTextCtrl( m_LayersListPanel, wxID_ANY, _("Margin"), wxDefaultPosition, wxDefaultSize, 0 );
m_LayerListFlexGridSizer->Add( m_MarginName, 0, wxEXPAND|wxRIGHT, 5 );
@ -816,7 +810,6 @@ PANEL_SETUP_LAYERS_BASE::PANEL_SETUP_LAYERS_BASE( wxWindow* parent, wxWindowID i
// Connect Events
m_addUserDefinedLayerButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::addUserDefinedLayer ), NULL, this );
m_CrtYdFrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::DenyChangeCheckBox ), NULL, this );
m_FabFrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this );
m_AdhesFrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this );
m_SoldPFrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this );
@ -859,9 +852,6 @@ PANEL_SETUP_LAYERS_BASE::PANEL_SETUP_LAYERS_BASE( wxWindow* parent, wxWindowID i
m_SoldPBackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this );
m_AdhesBackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this );
m_FabBackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this );
m_CrtYdBackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::DenyChangeCheckBox ), NULL, this );
m_PCBEdgesCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::DenyChangeCheckBox ), NULL, this );
m_MarginCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::DenyChangeCheckBox ), NULL, this );
m_Eco1CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this );
m_Eco2CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this );
m_CommentsCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this );
@ -881,7 +871,6 @@ PANEL_SETUP_LAYERS_BASE::~PANEL_SETUP_LAYERS_BASE()
{
// Disconnect Events
m_addUserDefinedLayerButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::addUserDefinedLayer ), NULL, this );
m_CrtYdFrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::DenyChangeCheckBox ), NULL, this );
m_FabFrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this );
m_AdhesFrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this );
m_SoldPFrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this );
@ -924,9 +913,6 @@ PANEL_SETUP_LAYERS_BASE::~PANEL_SETUP_LAYERS_BASE()
m_SoldPBackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this );
m_AdhesBackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this );
m_FabBackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this );
m_CrtYdBackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::DenyChangeCheckBox ), NULL, this );
m_PCBEdgesCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::DenyChangeCheckBox ), NULL, this );
m_MarginCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::DenyChangeCheckBox ), NULL, this );
m_Eco1CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this );
m_Eco2CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this );
m_CommentsCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::OnCheckBox ), NULL, this );

268
pcbnew/dialogs/panel_setup_layers_base.fbp
View File

@ -284,69 +284,14 @@
<property name="permission">protected</property>
<property name="rows">0</property>
<property name="vgap">2</property>
<object class="sizeritem" expanded="0">
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">ID_CRTYDFRONTCHECKBOX</property>
<property name="label"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size">-1,-1</property>
<property name="moveable">1</property>
<property name="name">m_CrtYdFrontCheckBox</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="spacer" expanded="1">
<property name="height">0</property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size">-1,-1</property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip">If you want a courtyard layer for the front side of the board</property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnCheckBox">DenyChangeCheckBox</event>
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="1">
@ -8550,69 +8495,14 @@
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">ID_CRTYDBACKCHECKBOX</property>
<property name="label"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_CrtYdBackCheckBox</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="spacer" expanded="1">
<property name="height">0</property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip">If you want a courtyard layer for the back side of the board</property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnCheckBox">DenyChangeCheckBox</event>
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="1">
@ -8740,69 +8630,14 @@
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">ID_PCBEDGESCHECKBOX</property>
<property name="label"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_PCBEdgesCheckBox</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="spacer" expanded="1">
<property name="height">0</property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip">If you want a board perimeter layer</property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnCheckBox">DenyChangeCheckBox</event>
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="1">
@ -8930,69 +8765,14 @@
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">ID_MARGINCHECKBOX</property>
<property name="label"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_MarginCheckBox</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="spacer" expanded="1">
<property name="height">0</property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnCheckBox">DenyChangeCheckBox</event>
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="1">

264
pcbnew/dialogs/panel_setup_layers_base.h
View File

@ -21,145 +21,141 @@
#include <wx/settings.h>
#include <wx/sizer.h>
#include <wx/statline.h>
#include <wx/checkbox.h>
#include <wx/textctrl.h>
#include <wx/stattext.h>
#include <wx/checkbox.h>
#include <wx/choice.h>
#include <wx/scrolwin.h>
#include <wx/panel.h>
///////////////////////////////////////////////////////////////////////////
#define ID_CRTYDFRONTCHECKBOX 1000
#define ID_CRTYDFRONTCHOICE 1001
#define ID_FABFRONTCHECKBOX 1002
#define ID_FABFRONTCHOICE 1003
#define ID_ADHESFRONTCHECKBOX 1004
#define ID_ADHESFRONTCHOICE 1005
#define ID_SOLDPFRONTCHECKBOX 1006
#define ID_SOLDPFRONTCHOICE 1007
#define ID_SILKSFRONTCHECKBOX 1008
#define ID_SILKSFRONTCHOICE 1009
#define ID_MASKFRONTCHECKBOX 1010
#define ID_MASKFRONTCHOICE 1011
#define ID_FRONTCHECKBOX 1012
#define ID_FRONTNAME 1013
#define ID_FRONTCHOICE 1014
#define ID_IN1CHECKBOX 1015
#define ID_IN1NAME 1016
#define ID_IN1CHOICE 1017
#define ID_IN2CHECKBOX 1018
#define ID_IN2NAME 1019
#define ID_IN2CHOICE 1020
#define ID_IN3CHECKBOX 1021
#define ID_IN3NAME 1022
#define ID_IN3CHOICE 1023
#define ID_IN4CHECKBOX 1024
#define ID_IN4NAME 1025
#define ID_IN4CHOICE 1026
#define ID_IN5CHECKBOX 1027
#define ID_IN5NAME 1028
#define ID_IN5CHOICE 1029
#define ID_IN6CHECKBOX 1030
#define ID_IN6NAME 1031
#define ID_IN6CHOICE 1032
#define ID_IN7CHECKBOX 1033
#define ID_IN7NAME 1034
#define ID_IN7CHOICE 1035
#define ID_IN8CHECKBOX 1036
#define ID_IN8NAME 1037
#define ID_IN8CHOICE 1038
#define ID_IN9CHECKBOX 1039
#define ID_IN9NAME 1040
#define ID_IN9CHOICE 1041
#define ID_IN10CHECKBOX 1042
#define ID_IN10NAME 1043
#define ID_IN10CHOICE 1044
#define ID_IN11CHECKBOX 1045
#define ID_IN11NAME 1046
#define ID_IN11CHOICE 1047
#define ID_IN12CHECKBOX 1048
#define ID_IN12NAME 1049
#define ID_IN12CHOICE 1050
#define ID_IN13CHECKBOX 1051
#define ID_IN13NAME 1052
#define ID_IN13CHOICE 1053
#define ID_IN14CHECKBOX 1054
#define ID_IN14NAME 1055
#define ID_IN14CHOICE 1056
#define ID_IN15CHECKBOX 1057
#define ID_IN15NAME 1058
#define ID_IN15CHOICE 1059
#define ID_IN16CHECKBOX 1060
#define ID_IN16NAME 1061
#define ID_IN16CHOICE 1062
#define ID_IN17CHECKBOX 1063
#define ID_IN17NAME 1064
#define ID_IN17CHOICE 1065
#define ID_IN18CHECKBOX 1066
#define ID_IN18NAME 1067
#define ID_IN18CHOICE 1068
#define ID_IN19CHECKBOX 1069
#define ID_IN19NAME 1070
#define ID_IN19CHOICE 1071
#define ID_IN20CHECKBOX 1072
#define ID_IN20NAME 1073
#define ID_IN20CHOICE 1074
#define ID_IN21CHECKBOX 1075
#define ID_IN21NAME 1076
#define ID_IN21CHOICE 1077
#define ID_IN22CHECKBOX 1078
#define ID_IN22NAME 1079
#define ID_IN22CHOICE 1080
#define ID_IN23CHECKBOX 1081
#define ID_IN23NAME 1082
#define ID_IN24CHECKBOX 1083
#define ID_IN24NAME 1084
#define ID_IN24CHOICE 1085
#define ID_IN25CHECKBOX 1086
#define ID_IN25NAME 1087
#define ID_IN25CHOICE 1088
#define ID_IN26CHECKBOX 1089
#define ID_IN26NAME 1090
#define ID_IN26CHOICE 1091
#define ID_IN27CHECKBOX 1092
#define ID_IN27NAME 1093
#define ID_IN27CHOICE 1094
#define ID_IN28CHECKBOX 1095
#define ID_IN28NAME 1096
#define ID_IN28CHOICE 1097
#define ID_IN29CHECKBOX 1098
#define ID_IN29NAME 1099
#define ID_IN29CHOICE 1100
#define ID_IN30CHECKBOX 1101
#define ID_IN30NAME 1102
#define ID_IN30CHOICE 1103
#define ID_BACKCHECKBOX 1104
#define ID_BACKNAME 1105
#define ID_BACKCHOICE 1106
#define ID_MASKBACKCHECKBOX 1107
#define ID_MASKBACKCHOICE 1108
#define ID_SILKSBACKCHECKBOX 1109
#define ID_SILKSBACKCHOICE 1110
#define ID_SOLDPBACKCHECKBOX 1111
#define ID_SOLDPBACKCHOICE 1112
#define ID_ADHESBACKCHECKBOX 1113
#define ID_ADHESBACKCHOICE 1114
#define ID_FABBACKCHECKBOX 1115
#define ID_FABBACKCHOICE 1116
#define ID_CRTYDBACKCHECKBOX 1117
#define ID_CRTYDBACKCHOICE 1118
#define ID_PCBEDGESCHECKBOX 1119
#define ID_PCBEDGESCHOICE 1120
#define ID_MARGINCHECKBOX 1121
#define ID_ECO2CHOICE 1122
#define ID_ECO2CHECKBOX 1123
#define ID_ECO1CHECKBOX 1124
#define ID_ECO1CHOICE 1125
#define ID_COMMENTSCHECKBOX 1126
#define ID_COMMENTSCHOICE 1127
#define ID_DRAWINGSCHECKBOX 1128
#define ID_DRAWINGSCHOICE 1129
#define ID_CRTYDFRONTCHOICE 1000
#define ID_FABFRONTCHECKBOX 1001
#define ID_FABFRONTCHOICE 1002
#define ID_ADHESFRONTCHECKBOX 1003
#define ID_ADHESFRONTCHOICE 1004
#define ID_SOLDPFRONTCHECKBOX 1005
#define ID_SOLDPFRONTCHOICE 1006
#define ID_SILKSFRONTCHECKBOX 1007
#define ID_SILKSFRONTCHOICE 1008
#define ID_MASKFRONTCHECKBOX 1009
#define ID_MASKFRONTCHOICE 1010
#define ID_FRONTCHECKBOX 1011
#define ID_FRONTNAME 1012
#define ID_FRONTCHOICE 1013
#define ID_IN1CHECKBOX 1014
#define ID_IN1NAME 1015
#define ID_IN1CHOICE 1016
#define ID_IN2CHECKBOX 1017
#define ID_IN2NAME 1018
#define ID_IN2CHOICE 1019
#define ID_IN3CHECKBOX 1020
#define ID_IN3NAME 1021
#define ID_IN3CHOICE 1022
#define ID_IN4CHECKBOX 1023
#define ID_IN4NAME 1024
#define ID_IN4CHOICE 1025
#define ID_IN5CHECKBOX 1026
#define ID_IN5NAME 1027
#define ID_IN5CHOICE 1028
#define ID_IN6CHECKBOX 1029
#define ID_IN6NAME 1030
#define ID_IN6CHOICE 1031
#define ID_IN7CHECKBOX 1032
#define ID_IN7NAME 1033
#define ID_IN7CHOICE 1034
#define ID_IN8CHECKBOX 1035
#define ID_IN8NAME 1036
#define ID_IN8CHOICE 1037
#define ID_IN9CHECKBOX 1038
#define ID_IN9NAME 1039
#define ID_IN9CHOICE 1040
#define ID_IN10CHECKBOX 1041
#define ID_IN10NAME 1042
#define ID_IN10CHOICE 1043
#define ID_IN11CHECKBOX 1044
#define ID_IN11NAME 1045
#define ID_IN11CHOICE 1046
#define ID_IN12CHECKBOX 1047
#define ID_IN12NAME 1048
#define ID_IN12CHOICE 1049
#define ID_IN13CHECKBOX 1050
#define ID_IN13NAME 1051
#define ID_IN13CHOICE 1052
#define ID_IN14CHECKBOX 1053
#define ID_IN14NAME 1054
#define ID_IN14CHOICE 1055
#define ID_IN15CHECKBOX 1056
#define ID_IN15NAME 1057
#define ID_IN15CHOICE 1058
#define ID_IN16CHECKBOX 1059
#define ID_IN16NAME 1060
#define ID_IN16CHOICE 1061
#define ID_IN17CHECKBOX 1062
#define ID_IN17NAME 1063
#define ID_IN17CHOICE 1064
#define ID_IN18CHECKBOX 1065
#define ID_IN18NAME 1066
#define ID_IN18CHOICE 1067
#define ID_IN19CHECKBOX 1068
#define ID_IN19NAME 1069
#define ID_IN19CHOICE 1070
#define ID_IN20CHECKBOX 1071
#define ID_IN20NAME 1072
#define ID_IN20CHOICE 1073
#define ID_IN21CHECKBOX 1074
#define ID_IN21NAME 1075
#define ID_IN21CHOICE 1076
#define ID_IN22CHECKBOX 1077
#define ID_IN22NAME 1078
#define ID_IN22CHOICE 1079
#define ID_IN23CHECKBOX 1080
#define ID_IN23NAME 1081
#define ID_IN24CHECKBOX 1082
#define ID_IN24NAME 1083
#define ID_IN24CHOICE 1084
#define ID_IN25CHECKBOX 1085
#define ID_IN25NAME 1086
#define ID_IN25CHOICE 1087
#define ID_IN26CHECKBOX 1088
#define ID_IN26NAME 1089
#define ID_IN26CHOICE 1090
#define ID_IN27CHECKBOX 1091
#define ID_IN27NAME 1092
#define ID_IN27CHOICE 1093
#define ID_IN28CHECKBOX 1094
#define ID_IN28NAME 1095
#define ID_IN28CHOICE 1096
#define ID_IN29CHECKBOX 1097
#define ID_IN29NAME 1098
#define ID_IN29CHOICE 1099
#define ID_IN30CHECKBOX 1100
#define ID_IN30NAME 1101
#define ID_IN30CHOICE 1102
#define ID_BACKCHECKBOX 1103
#define ID_BACKNAME 1104
#define ID_BACKCHOICE 1105
#define ID_MASKBACKCHECKBOX 1106
#define ID_MASKBACKCHOICE 1107
#define ID_SILKSBACKCHECKBOX 1108
#define ID_SILKSBACKCHOICE 1109
#define ID_SOLDPBACKCHECKBOX 1110
#define ID_SOLDPBACKCHOICE 1111
#define ID_ADHESBACKCHECKBOX 1112
#define ID_ADHESBACKCHOICE 1113
#define ID_FABBACKCHECKBOX 1114
#define ID_FABBACKCHOICE 1115
#define ID_CRTYDBACKCHOICE 1116
#define ID_PCBEDGESCHOICE 1117
#define ID_ECO2CHOICE 1118
#define ID_ECO2CHECKBOX 1119
#define ID_ECO1CHECKBOX 1120
#define ID_ECO1CHOICE 1121
#define ID_COMMENTSCHECKBOX 1122
#define ID_COMMENTSCHOICE 1123
#define ID_DRAWINGSCHECKBOX 1124
#define ID_DRAWINGSCHOICE 1125
///////////////////////////////////////////////////////////////////////////////
/// Class PANEL_SETUP_LAYERS_BASE
@ -173,7 +169,6 @@ class PANEL_SETUP_LAYERS_BASE : public wxPanel
wxStaticLine* m_staticline2;
wxScrolledWindow* m_LayersListPanel;
wxFlexGridSizer* m_LayerListFlexGridSizer;
wxCheckBox* m_CrtYdFrontCheckBox;
wxTextCtrl* m_CrtYdFrontName;
wxStaticText* m_CrtYdFrontStaticText;
wxCheckBox* m_FabFrontCheckBox;
@ -302,13 +297,10 @@ class PANEL_SETUP_LAYERS_BASE : public wxPanel
wxCheckBox* m_FabBackCheckBox;
wxTextCtrl* m_FabBackName;
wxStaticText* m_FabBackStaticText;
wxCheckBox* m_CrtYdBackCheckBox;
wxTextCtrl* m_CrtYdBackName;
wxStaticText* m_CrtYdBackStaticText;
wxCheckBox* m_PCBEdgesCheckBox;
wxTextCtrl* m_PCBEdgesName;
wxStaticText* m_PCBEdgesStaticText;
wxCheckBox* m_MarginCheckBox;
wxTextCtrl* m_MarginName;
wxStaticText* m_MarginStaticText;
wxCheckBox* m_Eco1CheckBox;
@ -353,8 +345,8 @@ class PANEL_SETUP_LAYERS_BASE : public wxPanel
// Virtual event handlers, overide them in your derived class
virtual void addUserDefinedLayer( wxCommandEvent& event ) { event.Skip(); }
virtual void DenyChangeCheckBox( wxCommandEvent& event ) { event.Skip(); }
virtual void OnCheckBox( wxCommandEvent& event ) { event.Skip(); }
virtual void DenyChangeCheckBox( wxCommandEvent& event ) { event.Skip(); }
public: