Ref and Value for footprints: use now the layer color, not a specific color:... (aa9de21c) · Commits · Elphel / kicad-source-mirror

pcbnew/class_pcb_layer_widget.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -66,8 +66,8 @@ const LAYER_WIDGET::ROW PCB_LAYER_WIDGET::s_render_rows[] = {
		RR( _( "Pads Front" ), PAD_FR_VISIBLE, WHITE, _( "Show footprint pads on board's front" ) ),
		RR( _( "Pads Back" ), PAD_BK_VISIBLE, WHITE, _( "Show footprint pads on board's back" ) ),

		RR( _( "Text Front" ), MOD_TEXT_FR_VISIBLE, WHITE, _( "Show footprint text on board's front" ) ),
		RR( _( "Text Back" ), MOD_TEXT_BK_VISIBLE, WHITE, _( "Show footprint text on board's back" ) ),
		RR( _( "Text Front" ), MOD_TEXT_FR_VISIBLE, UNSPECIFIED_COLOR, _( "Show footprint text on board's front" ) ),
		RR( _( "Text Back" ), MOD_TEXT_BK_VISIBLE, UNSPECIFIED_COLOR, _( "Show footprint text on board's back" ) ),
		RR( _( "Hidden Text" ), MOD_TEXT_INVISIBLE, WHITE, _( "Show footprint text marked as invisible" ) ),

		RR( _( "Anchors" ), ANCHOR_VISIBLE, WHITE, _( "Show footprint and text origins as a cross" ) ),

pcbnew/class_text_mod.cpp

+9 −22

Original line number	Diff line number	Diff line
		@@ -250,9 +250,8 @@ void TEXTE_MODULE::Draw( EDA_DRAW_PANEL* panel, wxDC* DC, GR_DRAWMODE draw_mode,

		BOARD* brd = GetBoard( );

		/* Reference and values takes the color from the corresponding Visibles
		other texts take the color of the layer they are on */
		EDA_COLOR_T color;
		EDA_COLOR_T color = brd->GetLayerColor( GetLayer() );


		/* For reference and value suppress the element if the layer it is
		* on is on a disabled side, user text also has standard layer
		@@ -263,25 +262,13 @@ void TEXTE_MODULE::Draw( EDA_DRAW_PANEL* panel, wxDC* DC, GR_DRAWMODE draw_mode,
		(IsBackLayer( text_layer ) && !brd->IsElementVisible( MOD_TEXT_BK_VISIBLE )) )
		return;

		switch( GetType() )
		{
		case TEXT_is_REFERENCE:
		case TEXT_is_VALUE:
		if( IsFrontLayer( text_layer ) )
		color = brd->GetVisibleElementColor( MOD_TEXT_FR_VISIBLE );
		else
		color = brd->GetVisibleElementColor( MOD_TEXT_BK_VISIBLE );
		break;

		default: // Otherwise the compiler is not sure about initializing color
		case TEXT_is_DIVERS:
		if( brd->IsLayerVisible( m_Layer ) )
		color = brd->GetLayerColor( GetLayer() );
		else
		// text which are not ref or value are shown only if the layer is visible
		// ref or value have a specific display option
		if( GetType() == TEXT_is_DIVERS && ! brd->IsLayerVisible( m_Layer ) )
		return;
		}

		// 'Ghost' the element if forced show
		// Invisible texts are still drawn (not plotted) in MOD_TEXT_INVISIBLE
		// Just because we must have to edit them (at least to make them visible)
		if( m_NoShow )
		{
		if( !brd->IsElementVisible( MOD_TEXT_INVISIBLE ) )

pcbnew/dialogs/dialog_edit_module_text.cpp

+8 −2

Original line number	Diff line number	Diff line
		@@ -113,6 +113,11 @@ void DialogEditModuleText::initDlg( )

		m_ModuleInfoText->SetLabel( msg );

		// Create a list of not allowed layers.
		// could be slightly dependent of the type of footprint text.
		LSET forbiddenLayers( LSET::AllCuMask() );
		forbiddenLayers.set( Edge_Cuts ).set( Margin ).set( F_Paste ).set( B_Paste ).set( F_Mask ).set( B_Mask );

		switch( m_currentText->GetType() )
		{
		case TEXTE_MODULE::TEXT_is_VALUE:
		@@ -154,11 +159,11 @@ void DialogEditModuleText::initDlg( )
		m_Orient->SetSelection( 1 );

		if( !m_currentText->IsVisible() )
		m_Show->SetSelection( 1 );;
		m_Show->SetSelection( 1 );

		// Configure the layers list selector
		m_LayerSelectionCtrl->SetLayersHotkeys( false );
		m_LayerSelectionCtrl->SetLayerSet( LSET::InternalCuMask().set( Edge_Cuts ) );
		m_LayerSelectionCtrl->SetLayerSet( forbiddenLayers );
		m_LayerSelectionCtrl->SetBoardFrame( m_parent );
		m_LayerSelectionCtrl->Resync();

		@@ -238,6 +243,7 @@ void DialogEditModuleText::OnOkClick( wxCommandEvent& event )

		LAYER_NUM layer = m_LayerSelectionCtrl->GetLayerSelection();
		m_currentText->SetLayer( ToLAYER_ID( layer ) );
		m_currentText->SetMirrored( IsBackLayer( m_currentText->GetLayer() ) );

		#ifndef USE_WX_OVERLAY
		if( m_dc ) // Display new text

pcbnew/dialogs/dialog_layers_setup.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,8 @@ static LSEQ dlg_layers()
		// layers that are put out into the dialog UI, coordinate with wxformbuilder and
		// getCTLs( LAYER_NUM aLayerNumber )
		static const LAYER_ID layers[] = {
		F_CrtYd,
		F_Fab,
		F_Adhes,
		F_Paste,
		F_SilkS,
		@@ -117,6 +119,8 @@ static LSEQ dlg_layers()
		B_SilkS,
		B_Paste,
		B_Adhes,
		B_Fab,
		B_CrtYd,

		Edge_Cuts,
		Margin,
		@@ -257,6 +261,8 @@ CTLs DIALOG_LAYERS_SETUP::getCTLs( LAYER_NUM aLayerNumber )

		switch( aLayerNumber )
		{
		case F_CrtYd: RETAUX( m_CrtYdFront );
		case F_Fab: RETAUX( m_FabFront );
		case F_Adhes: RETAUX( m_AdhesFront );
		case F_Paste: RETAUX( m_SoldPFront );
		case F_SilkS: RETAUX( m_SilkSFront );
		@@ -300,6 +306,8 @@ CTLs DIALOG_LAYERS_SETUP::getCTLs( LAYER_NUM aLayerNumber )
		case B_SilkS: RETAUX( m_SilkSBack );
		case B_Paste: RETAUX( m_SoldPBack );
		case B_Adhes: RETAUX( m_AdhesBack );
		case B_Fab: RETAUX( m_FabBack );
		case B_CrtYd: RETAUX( m_CrtYdBack );

		case Edge_Cuts: RETAUX( m_PCBEdges );
		case Margin: RETAUX( m_Margin );

pcbnew/dialogs/dialog_layers_setup_base.cpp

+118 −11

Original line number	Diff line number	Diff line
		///////////////////////////////////////////////////////////////////////////
		// C++ code generated with wxFormBuilder (version Jun 6 2014)
		// C++ code generated with wxFormBuilder (version Nov 6 2013)
		// http://www.wxformbuilder.org/
		//
		// PLEASE DO "NOT" EDIT THIS FILE!
		@@ -45,7 +45,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID
		wxString m_CopperLayersChoiceChoices[] = { _("2"), _("4"), _("6"), _("8"), _("10"), _("12"), _("14"), _("16"), _("18"), _("20"), _("22"), _("24"), _("26"), _("28"), _("30"), _("32") };
		int m_CopperLayersChoiceNChoices = sizeof( m_CopperLayersChoiceChoices ) / sizeof( wxString );
		m_CopperLayersChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_CopperLayersChoiceNChoices, m_CopperLayersChoiceChoices, 0 );
		m_CopperLayersChoice->SetSelection( 3 );
		m_CopperLayersChoice->SetSelection( 2 );
		bCopperLayersSizer->Add( m_CopperLayersChoice, 0, wxEXPAND\|wxRIGHT\|wxLEFT, 5 );


		@@ -81,9 +81,59 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID
		m_LayerListFlexGridSizer->SetFlexibleDirection( wxHORIZONTAL );
		m_LayerListFlexGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );

		m_CrtYdFrontName = new wxStaticText( m_LayersListPanel, ID_CRTYDFRONTNAME, _("CrtYd_Front_later"), wxDefaultPosition, wxDefaultSize, 0 );
		m_CrtYdFrontName->Wrap( -1 );
		m_LayerListFlexGridSizer->Add( m_CrtYdFrontName, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );

		m_CrtYdFrontPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
		m_CrtYdFrontPanel->SetBackgroundColour( wxColour( 255, 233, 236 ) );

		wxBoxSizer* bSizer611;
		bSizer611 = new wxBoxSizer( wxVERTICAL );

		m_CrtYdFrontCheckBox = new wxCheckBox( m_CrtYdFrontPanel, ID_CRTYDFRONTCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		m_CrtYdFrontCheckBox->SetToolTip( _("If you want a courtyard layer for the front side of the board") );

		bSizer611->Add( m_CrtYdFrontCheckBox, 0, wxALIGN_CENTER_HORIZONTAL\|wxALIGN_CENTER_VERTICAL\|wxALL, 5 );


		m_CrtYdFrontPanel->SetSizer( bSizer611 );
		m_CrtYdFrontPanel->Layout();
		bSizer611->Fit( m_CrtYdFrontPanel );
		m_LayerListFlexGridSizer->Add( m_CrtYdFrontPanel, 1, wxEXPAND\|wxALIGN_CENTER_VERTICAL, 5 );

		m_CrtYdFrontStaticText = new wxStaticText( m_LayersListPanel, ID_CRTYDFRONTCHOICE, _("Off-board, testing"), wxDefaultPosition, wxDefaultSize, 0 );
		m_CrtYdFrontStaticText->Wrap( -1 );
		m_LayerListFlexGridSizer->Add( m_CrtYdFrontStaticText, 0, wxALL, 5 );

		m_FabFrontName = new wxStaticText( m_LayersListPanel, ID_FABFRONTNAME, _("Fab_Front_later"), wxDefaultPosition, wxDefaultSize, 0 );
		m_FabFrontName->Wrap( -1 );
		m_LayerListFlexGridSizer->Add( m_FabFrontName, 0, wxBOTTOM\|wxRIGHT\|wxLEFT\|wxALIGN_CENTER_VERTICAL, 5 );

		m_FabFrontPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
		m_FabFrontPanel->SetBackgroundColour( wxColour( 236, 233, 236 ) );

		wxBoxSizer* bSizer61;
		bSizer61 = new wxBoxSizer( wxVERTICAL );

		m_FabFrontCheckBox = new wxCheckBox( m_FabFrontPanel, ID_FABFRONTCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		m_FabFrontCheckBox->SetToolTip( _("If you want a fabrication layer for the front side of the board") );

		bSizer61->Add( m_FabFrontCheckBox, 0, wxALIGN_CENTER_HORIZONTAL\|wxALIGN_CENTER_VERTICAL\|wxALL, 5 );


		m_FabFrontPanel->SetSizer( bSizer61 );
		m_FabFrontPanel->Layout();
		bSizer61->Fit( m_FabFrontPanel );
		m_LayerListFlexGridSizer->Add( m_FabFrontPanel, 1, wxEXPAND\|wxALIGN_CENTER_VERTICAL, 5 );

		m_FabFrontStaticText = new wxStaticText( m_LayersListPanel, ID_FABFRONTCHOICE, _("Off-board, manufacturing"), wxDefaultPosition, wxDefaultSize, 0 );
		m_FabFrontStaticText->Wrap( -1 );
		m_LayerListFlexGridSizer->Add( m_FabFrontStaticText, 0, wxALL\|wxALIGN_CENTER_VERTICAL, 5 );

		m_AdhesFrontName = new wxStaticText( m_LayersListPanel, ID_ADHESFRONTNAME, _("Adhes_Front_later"), wxDefaultPosition, wxDefaultSize, 0 );
		m_AdhesFrontName->Wrap( -1 );
		m_LayerListFlexGridSizer->Add( m_AdhesFrontName, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );
		m_LayerListFlexGridSizer->Add( m_AdhesFrontName, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );

		m_AdhesFrontPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
		m_AdhesFrontPanel->SetBackgroundColour( wxColour( 236, 233, 236 ) );
		@@ -100,18 +150,18 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID
		m_AdhesFrontPanel->SetSizer( bSizer6 );
		m_AdhesFrontPanel->Layout();
		bSizer6->Fit( m_AdhesFrontPanel );
		m_LayerListFlexGridSizer->Add( m_AdhesFrontPanel, 1, wxEXPAND\|wxALIGN_CENTER_VERTICAL\|wxALIGN_CENTER_HORIZONTAL, 5 );
		m_LayerListFlexGridSizer->Add( m_AdhesFrontPanel, 1, wxALIGN_CENTER_VERTICAL\|wxALIGN_CENTER_HORIZONTAL\|wxEXPAND, 5 );

		m_AdhesFrontStaticText = new wxStaticText( m_LayersListPanel, ID_ADHESFRONTCHOICE, _("Off-board, manufacturing"), wxDefaultPosition, wxDefaultSize, 0 );
		m_AdhesFrontStaticText->Wrap( -1 );
		m_LayerListFlexGridSizer->Add( m_AdhesFrontStaticText, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );
		m_LayerListFlexGridSizer->Add( m_AdhesFrontStaticText, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );

		m_SoldPFrontName = new wxStaticText( m_LayersListPanel, ID_SOLDPFRONTNAME, _("SoldP_Front_later"), wxDefaultPosition, wxDefaultSize, 0 );
		m_SoldPFrontName->Wrap( -1 );
		m_LayerListFlexGridSizer->Add( m_SoldPFrontName, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );

		m_SoldPFrontPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
		m_SoldPFrontPanel->SetBackgroundColour( wxColour( 236, 233, 236 ) );
		m_SoldPFrontPanel->SetBackgroundColour( wxColour( 255, 253, 235 ) );

		wxBoxSizer* bSizer7;
		bSizer7 = new wxBoxSizer( wxVERTICAL );
		@@ -127,7 +177,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID
		bSizer7->Fit( m_SoldPFrontPanel );
		m_LayerListFlexGridSizer->Add( m_SoldPFrontPanel, 1, wxEXPAND\|wxALIGN_CENTER_VERTICAL\|wxALIGN_CENTER_HORIZONTAL, 5 );

		m_SoldPFrontStaticText = new wxStaticText( m_LayersListPanel, ID_SOLDPFRONTCHOICE, _("Off-board, manufacturing"), wxDefaultPosition, wxDefaultSize, 0 );
		m_SoldPFrontStaticText = new wxStaticText( m_LayersListPanel, ID_SOLDPFRONTCHOICE, _("On-board, non-copper"), wxDefaultPosition, wxDefaultSize, 0 );
		m_SoldPFrontStaticText->Wrap( -1 );
		m_LayerListFlexGridSizer->Add( m_SoldPFrontStaticText, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );

		@@ -1108,7 +1158,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID
		m_LayerListFlexGridSizer->Add( m_SoldPBackName, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );

		m_SoldPBackPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
		m_SoldPBackPanel->SetBackgroundColour( wxColour( 236, 233, 236 ) );
		m_SoldPBackPanel->SetBackgroundColour( wxColour( 255, 253, 235 ) );

		wxBoxSizer* bSizer26;
		bSizer26 = new wxBoxSizer( wxVERTICAL );
		@@ -1124,7 +1174,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID
		bSizer26->Fit( m_SoldPBackPanel );
		m_LayerListFlexGridSizer->Add( m_SoldPBackPanel, 1, wxEXPAND\|wxALIGN_CENTER_VERTICAL\|wxALIGN_CENTER_HORIZONTAL, 5 );

		m_SoldPBackStaticText = new wxStaticText( m_LayersListPanel, ID_SOLDPBACKCHOICE, _("Off-board, manufacturing"), wxDefaultPosition, wxDefaultSize, 0 );
		m_SoldPBackStaticText = new wxStaticText( m_LayersListPanel, ID_SOLDPBACKCHOICE, _("On-board, non-copper"), wxDefaultPosition, wxDefaultSize, 0 );
		m_SoldPBackStaticText->Wrap( -1 );
		m_LayerListFlexGridSizer->Add( m_SoldPBackStaticText, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );

		@@ -1153,6 +1203,56 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID
		m_AdhesBackStaticText->Wrap( -1 );
		m_LayerListFlexGridSizer->Add( m_AdhesBackStaticText, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );

		m_FabBackName = new wxStaticText( m_LayersListPanel, ID_FABBACKNAME, _("Fab_Back_later"), wxDefaultPosition, wxDefaultSize, 0 );
		m_FabBackName->Wrap( -1 );
		m_LayerListFlexGridSizer->Add( m_FabBackName, 0, wxBOTTOM\|wxRIGHT\|wxLEFT\|wxALIGN_CENTER_VERTICAL, 5 );

		m_FabBackPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
		m_FabBackPanel->SetBackgroundColour( wxColour( 236, 233, 236 ) );

		wxBoxSizer* bSizer281;
		bSizer281 = new wxBoxSizer( wxVERTICAL );

		m_FabBackCheckBox = new wxCheckBox( m_FabBackPanel, ID_FABBACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		m_FabBackCheckBox->SetToolTip( _("If you want a fabrication layer for the back side of the board") );

		bSizer281->Add( m_FabBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL\|wxALIGN_CENTER_VERTICAL\|wxALL, 5 );


		m_FabBackPanel->SetSizer( bSizer281 );
		m_FabBackPanel->Layout();
		bSizer281->Fit( m_FabBackPanel );
		m_LayerListFlexGridSizer->Add( m_FabBackPanel, 1, wxEXPAND, 5 );

		m_FabBackStaticText = new wxStaticText( m_LayersListPanel, ID_FABBACKCHOICE, _("Off-board, manufacturing"), wxDefaultPosition, wxDefaultSize, 0 );
		m_FabBackStaticText->Wrap( -1 );
		m_LayerListFlexGridSizer->Add( m_FabBackStaticText, 0, wxBOTTOM\|wxRIGHT\|wxLEFT\|wxALIGN_CENTER_VERTICAL, 5 );

		m_CrtYdBackName = new wxStaticText( m_LayersListPanel, ID_CRTYDBACKNAME, _("CrtYd_Back_later"), wxDefaultPosition, wxDefaultSize, 0 );
		m_CrtYdBackName->Wrap( -1 );
		m_LayerListFlexGridSizer->Add( m_CrtYdBackName, 0, wxBOTTOM\|wxRIGHT\|wxLEFT\|wxALIGN_CENTER_VERTICAL, 5 );

		m_CrtYdBackPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
		m_CrtYdBackPanel->SetBackgroundColour( wxColour( 255, 233, 236 ) );

		wxBoxSizer* bSizer6111;
		bSizer6111 = new wxBoxSizer( wxVERTICAL );

		m_CrtYdBackCheckBox = new wxCheckBox( m_CrtYdBackPanel, ID_CRTYDBACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		m_CrtYdBackCheckBox->SetToolTip( _("If you want a courtyard layer for the front side of the board") );

		bSizer6111->Add( m_CrtYdBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL\|wxALIGN_CENTER_VERTICAL\|wxALL, 5 );


		m_CrtYdBackPanel->SetSizer( bSizer6111 );
		m_CrtYdBackPanel->Layout();
		bSizer6111->Fit( m_CrtYdBackPanel );
		m_LayerListFlexGridSizer->Add( m_CrtYdBackPanel, 1, wxEXPAND\|wxALIGN_CENTER_VERTICAL, 5 );

		m_CrtYdBackStaticText = new wxStaticText( m_LayersListPanel, ID_CRTYDBACKCHOICE, _("Off-board, testing"), wxDefaultPosition, wxDefaultSize, 0 );
		m_CrtYdBackStaticText->Wrap( -1 );
		m_LayerListFlexGridSizer->Add( m_CrtYdBackStaticText, 0, wxALL, 5 );

		m_PCBEdgesName = new wxStaticText( m_LayersListPanel, ID_PCBEDGESNAME, _("PCB_Edges_later"), wxDefaultPosition, wxDefaultSize, 0 );
		m_PCBEdgesName->Wrap( -1 );
		m_LayerListFlexGridSizer->Add( m_PCBEdgesName, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );
		@@ -1301,7 +1401,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID
		m_LayersListPanel->SetSizer( m_LayerListFlexGridSizer );
		m_LayersListPanel->Layout();
		m_LayerListFlexGridSizer->Fit( m_LayersListPanel );
		b_layersListSizer->Add( m_LayersListPanel, 1, wxALL\|wxEXPAND, 5 );
		b_layersListSizer->Add( m_LayersListPanel, 1, wxEXPAND\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );


		bMainSizer->Add( b_layersListSizer, 1, wxEXPAND, 5 );
		@@ -1318,11 +1418,12 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID

		this->SetSizer( bMainSizer );
		this->Layout();
		bMainSizer->Fit( this );

		// Connect Events
		m_PresetsChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnPresetsChoice ), NULL, this );
		m_CopperLayersChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCopperLayersChoice ), NULL, this );
		m_CrtYdFrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_FabFrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_AdhesFrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_SoldPFrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_SilkSFrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		@@ -1363,6 +1464,8 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID
		m_SilkSBackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_SoldPBackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_AdhesBackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_FabBackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_CrtYdBackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_PCBEdgesCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_MarginCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_Eco1CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		@@ -1378,6 +1481,8 @@ DIALOG_LAYERS_SETUP_BASE::~DIALOG_LAYERS_SETUP_BASE()
		// Disconnect Events
		m_PresetsChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnPresetsChoice ), NULL, this );
		m_CopperLayersChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCopperLayersChoice ), NULL, this );
		m_CrtYdFrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_FabFrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_AdhesFrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_SoldPFrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_SilkSFrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		@@ -1418,6 +1523,8 @@ DIALOG_LAYERS_SETUP_BASE::~DIALOG_LAYERS_SETUP_BASE()
		m_SilkSBackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_SoldPBackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_AdhesBackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_FabBackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_CrtYdBackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_PCBEdgesCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_MarginCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );
		m_Eco1CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this );

Admin message