From 945551b8c8b2264101de400f7c464db65e4f9c86 Mon Sep 17 00:00:00 2001 From: dickelbeck Date: Mon, 7 Dec 2009 06:16:11 +0000 Subject: [PATCH] more layer setup dialog work --- pcbnew/class_board_design_settings.cpp | 13 +- pcbnew/dialog_layers_setup2.cpp | 284 +++++++++++++++++-------- pcbnew/dialog_layers_setup2.h | 15 +- pcbnew/dialog_layers_setup_base2.cpp | 92 ++++---- pcbnew/dialog_layers_setup_base2.fbp | 92 ++++---- pcbnew/dialog_layers_setup_base2.h | 156 +++++++------- 6 files changed, 387 insertions(+), 265 deletions(-) diff --git a/pcbnew/class_board_design_settings.cpp b/pcbnew/class_board_design_settings.cpp index 90c9fc9da0..cff03bfe2f 100644 --- a/pcbnew/class_board_design_settings.cpp +++ b/pcbnew/class_board_design_settings.cpp @@ -36,11 +36,12 @@ EDA_BoardDesignSettings::EDA_BoardDesignSettings() }; m_EnabledLayers = ALL_LAYERS; // All layers enabled at first. - // SetCopperLayerCount() will adjust thist. - m_VisibleLayers = 0xffffffff; // IMB: All layers visible at first. TODO: Use a macro for the initial value. - m_VisibleElements = 0x00000fff; // IMB: All elements visible at first. TODO: Use a macro for the initial value. + // SetCopperLayerCount() will adjust this. + m_VisibleLayers = 0xffffffff; // All layers visible at first. + m_VisibleElements = 0x00000fff; // All elements visible at first. TODO: Use a macro for the initial value. SetCopperLayerCount( 2 ); // Default design is a double sided board + m_CurrentViaType = VIA_THROUGH; // via type (VIA_BLIND_BURIED, VIA_THROUGH VIA_MICROVIA) m_UseConnectedTrackWidth = false; // if true, when creating a new track starting on an existing track, use this track width m_MicroViasAllowed = false; // true to allow micro vias @@ -53,6 +54,7 @@ EDA_BoardDesignSettings::EDA_BoardDesignSettings() m_ViasMinDrill = 200; // vias (not micro vias) min drill diameter m_MicroViasMinSize = 200; // micro vias (not vias) min diameter m_MicroViasMinDrill = 50; // micro vias (not vias) min drill diameter + // Global mask margins: m_SolderMaskMargin = 150; // Solder mask margin m_SolderPasteMargin = 0; // Solder paste margin absolute value @@ -111,11 +113,6 @@ void EDA_BoardDesignSettings::SetElementVisibility( int aElementCategory, bool a } -/** - * Function SetCopperLayerCount - * do what its name says... - * @param aNewLayerCount = The new number of enabled copper layers - */ void EDA_BoardDesignSettings::SetCopperLayerCount( int aNewLayerCount ) { m_CopperLayerCount = aNewLayerCount; diff --git a/pcbnew/dialog_layers_setup2.cpp b/pcbnew/dialog_layers_setup2.cpp index f7717dead8..8fdf5d934b 100644 --- a/pcbnew/dialog_layers_setup2.cpp +++ b/pcbnew/dialog_layers_setup2.cpp @@ -48,12 +48,6 @@ wxSize DIALOG_LAYERS_SETUP::s_LastSize; /* // Layer order on the list panel -// Real board order - -static const int LayerOrder[NB_LAYERS] = -{ 17, 19, 21, 23, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, - 3, 2, 1, 0, 22, 20, 18, 16, 28, 27, 26, 25, 24 }; - // This function translates from the dialog's layer order to Kicad's layer order. static int GetLayerNumber( int aRow ) @@ -127,6 +121,104 @@ static const int CopperMasks[] = }; +// The sequence of the layer oriented rows in the scrollPanel: +static const short layerOrder[NB_LAYERS] = { + ADHESIVE_N_CMP, + SOLDERPASTE_N_CMP, + SILKSCREEN_N_CMP, + SOLDERMASK_N_CMP, + LAYER_N_FRONT, + LAYER_N_2, + LAYER_N_3, + LAYER_N_4, + LAYER_N_5, + LAYER_N_6, + LAYER_N_7, + LAYER_N_8, + LAYER_N_9, + LAYER_N_10, + LAYER_N_11, + LAYER_N_12, + LAYER_N_13, + LAYER_N_14, + LAYER_N_15, + LAYER_N_BACK, + SOLDERMASK_N_CU, + SILKSCREEN_N_CU, + SOLDERPASTE_N_CU, + ADHESIVE_N_CU, + EDGE_N, + ECO2_N, + ECO1_N, + COMMENT_N, + DRAW_N, +}; + + +struct IDs +{ + IDs( int aName, int aCheckBox, int aChoice ) + { + name = aName; + checkbox = aCheckBox; + choice = aChoice; + } + + short name; + short checkbox; + short choice; +}; + + +/** + * Function getIDs + * maps \a aLayerNumber to the two wx IDs for that layer which are + * the layer name control ID and the checkbox control ID. + */ +static IDs getIDs( int aLayerNumber ) +{ +#define RET(x) return IDs( x##NAME, x##CHECKBOX, x##CHOICE ); + + switch( aLayerNumber ) + { + case ADHESIVE_N_CMP: RET( ID_ADHESFRONT ); + case SOLDERPASTE_N_CMP: RET( ID_SOLDPFRONT ); + case SILKSCREEN_N_CMP: RET( ID_SILKSFRONT ); + case SOLDERMASK_N_CMP: RET( ID_MASKFRONT ); + case LAYER_N_FRONT: RET( ID_FRONT ); + case LAYER_N_2: RET( ID_INNER2 ); + case LAYER_N_3: RET( ID_INNER3 ); + case LAYER_N_4: RET( ID_INNER4 ); + case LAYER_N_5: RET( ID_INNER5 ); + case LAYER_N_6: RET( ID_INNER6 ); + case LAYER_N_7: RET( ID_INNER7 ); + case LAYER_N_8: RET( ID_INNER8 ); + case LAYER_N_9: RET( ID_INNER9 ); + case LAYER_N_10: RET( ID_INNER10 ); + case LAYER_N_11: RET( ID_INNER11 ); + case LAYER_N_12: RET( ID_INNER12 ); + case LAYER_N_13: RET( ID_INNER13 ); + case LAYER_N_14: RET( ID_INNER14 ); + case LAYER_N_15: RET( ID_INNER15 ); + case LAYER_N_BACK: RET( ID_BACK ); + case SOLDERMASK_N_CU: RET( ID_MASKBACK ); + case SILKSCREEN_N_CU: RET( ID_SILKSBACK ); + case SOLDERPASTE_N_CU: RET( ID_SOLDPBACK ); + case ADHESIVE_N_CU: RET( ID_ADHESBACK ); + case EDGE_N: RET( ID_PCBEDGES ); + case ECO2_N: RET( ID_ECO2 ); + case ECO1_N: RET( ID_ECO1 ); + case COMMENT_N: RET( ID_COMMENTS ); + case DRAW_N: RET( ID_DRAWINGS ); + default: + // wxDEBUGMSG( "bad layer id" ); + return IDs( 0, 0, 0 ); + } + +#undef RET +} + + // Names for the types of copper layers /* @@ -160,6 +252,100 @@ DIALOG_LAYERS_SETUP::DIALOG_LAYERS_SETUP( WinEDA_PcbFrame* parent ) : } +bool DIALOG_LAYERS_SETUP::Show( bool show ) +{ + bool ret; + + if( show ) + { + if( s_LastPos.x != -1 ) + { + SetSize( s_LastPos.x, s_LastPos.y, s_LastSize.x, s_LastSize.y, 0 ); + } + ret = DIALOG_LAYERS_SETUP_BASE2::Show( show ); + } + else + { + // Save the dialog's position before hiding + s_LastPos = GetPosition(); + s_LastSize = GetSize(); + + ret = DIALOG_LAYERS_SETUP_BASE2::Show( show ); + } + + return ret; +} + + + + +void DIALOG_LAYERS_SETUP::showBoardLayerNames() +{ + // Establish all the board's layer names into the dialog presentation, by + // obtaining them from BOARD::GetLayerName() which calls + // BOARD::GetDefaultLayerName() for non-coppers. + + for( unsigned i=0; iGetLayerName( layer ); + + D(printf("layerName[%d]=%s\n", layer, CONV_TO_UTF8( lname ) );) + + if( ctl->IsKindOf( CLASSINFO(wxTextCtrl) ) ) + ((wxTextCtrl*)ctl)->SetValue( lname ); // wxTextCtrl + else + ctl->SetLabel( lname ); // wxStaticText + } + } +} + + +void DIALOG_LAYERS_SETUP::showSelectedLayerCheckBoxes() +{ + int enabledLayers = m_Pcb->GetEnabledLayers(); + + for( unsigned i=0; iSetValue( (1<SetSelection( m_Pcb->GetLayerType( copperLayer ) ); + } +} + + /********************************************************************/ void DIALOG_LAYERS_SETUP::init() /********************************************************************/ @@ -183,91 +369,11 @@ void DIALOG_LAYERS_SETUP::init() } } + showBoardLayerNames(); - // Establish all the board's layer names into the dialog presentation, by - // obtaining them from BOARD::GetLayerName() which calls - // BOARD::GetDefaultLayerName() for non-coppers. - static const short nameIds[] = { - ID_ADHESFRONTNAME, - ID_SOLDPFRONTNAME, - ID_SILKSFRONTNAME, - ID_MASKFRONTNAME, - ID_FRONTNAME, - ID_INNER2NAME, - ID_INNER3NAME, - ID_INNER4NAME, - ID_INNER5NAME, - ID_INNER6NAME, - ID_INNER7NAME, - ID_INNER8NAME, - ID_INNER9NAME, - ID_INNER10NAME, - ID_INNER11NAME, - ID_INNER12NAME, - ID_INNER13NAME, - ID_INNER14NAME, - ID_INNER15NAME, - ID_BACKNAME, - ID_MASKBACKNAME, - ID_SILKSBACKNAME, - ID_SOLDPBACKNAME, - ID_ADHESBACKNAME, - ID_PCBEDGESNAME, - ID_ECO2NAME, - ID_ECO1NAME, - ID_COMMENTSNAME, - ID_DRAWINGSNAME, - }; - - for( unsigned i=0; iSetLabel( m_Pcb->GetLayerName( layer ) ); - } + showSelectedLayerCheckBoxes(); + showLayerTypes(); /* names only: ID_ADHESFRONTNAME diff --git a/pcbnew/dialog_layers_setup2.h b/pcbnew/dialog_layers_setup2.h index e7117d5a7e..91ec84fb83 100644 --- a/pcbnew/dialog_layers_setup2.h +++ b/pcbnew/dialog_layers_setup2.h @@ -42,23 +42,28 @@ private: BOARD* m_Pcb; -private: - void init(); + void showBoardLayerNames(); + + void showSelectedLayerCheckBoxes(); + + void showLayerTypes(); + + void OnCancelButtonClick( wxCommandEvent& event ); void OnOkButtonClick( wxCommandEvent& event ); void OnLayerCountClick( wxCommandEvent& event ); -// void OnLayerGridLeftClick( wxGridEvent& event ){ event.Skip(); } -// void OnLayerGridRighttClick( wxGridEvent& event ){ event.Skip(); } + void SetRoutableLayerStatus( ); bool TestDataValidity(); - public: DIALOG_LAYERS_SETUP( WinEDA_PcbFrame* parent ); ~DIALOG_LAYERS_SETUP( ) { }; + bool Show( bool show ); // overload stock function + }; #endif //__dialog_layers_setup2_h_ diff --git a/pcbnew/dialog_layers_setup_base2.cpp b/pcbnew/dialog_layers_setup_base2.cpp index c412439a12..d8a8c6483d 100644 --- a/pcbnew/dialog_layers_setup_base2.cpp +++ b/pcbnew/dialog_layers_setup_base2.cpp @@ -91,14 +91,14 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_AdhesFrontCheckBox->SetToolTip( _("If you want an adhesive template for the front side of the board") ); - bSizer6->Add( m_AdhesFrontCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bSizer6->Add( m_AdhesFrontCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_AdhesFrontPanel->SetSizer( bSizer6 ); m_AdhesFrontPanel->Layout(); bSizer6->Fit( m_AdhesFrontPanel ); m_LayerListFlexGridSizer->Add( m_AdhesFrontPanel, 1, wxEXPAND, 5 ); - m_AdhesFrontStaticText = new wxStaticText( m_LayersListPanel, wxID_ANY, _("Off-board, manufacturing"), wxDefaultPosition, wxDefaultSize, 0 ); + 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 ); @@ -116,14 +116,14 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_SoldPFrontCheckBox->SetToolTip( _("If you want a solder paster layer for front side of the board") ); - bSizer7->Add( m_SoldPFrontCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bSizer7->Add( m_SoldPFrontCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_SoldPFrontPanel->SetSizer( bSizer7 ); m_SoldPFrontPanel->Layout(); bSizer7->Fit( m_SoldPFrontPanel ); m_LayerListFlexGridSizer->Add( m_SoldPFrontPanel, 1, wxEXPAND, 5 ); - m_SoldPFrontStaticText = new wxStaticText( m_LayersListPanel, wxID_ANY, _("Off-board, manufacturing"), wxDefaultPosition, wxDefaultSize, 0 ); + m_SoldPFrontStaticText = new wxStaticText( m_LayersListPanel, ID_SOLDPFRONTCHOICE, _("Off-board, manufacturing"), wxDefaultPosition, wxDefaultSize, 0 ); m_SoldPFrontStaticText->Wrap( -1 ); m_LayerListFlexGridSizer->Add( m_SoldPFrontStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); @@ -139,14 +139,14 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_SilkSFrontCheckBox = new wxCheckBox( m_SilkSFrontPanel, ID_SILKSFRONTCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer5->Add( m_SilkSFrontCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bSizer5->Add( m_SilkSFrontCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_SilkSFrontPanel->SetSizer( bSizer5 ); m_SilkSFrontPanel->Layout(); bSizer5->Fit( m_SilkSFrontPanel ); m_LayerListFlexGridSizer->Add( m_SilkSFrontPanel, 1, wxEXPAND, 5 ); - m_SilkSFrontStaticText = new wxStaticText( m_LayersListPanel, wxID_ANY, _("On-board, non-copper"), wxDefaultPosition, wxDefaultSize, 0 ); + m_SilkSFrontStaticText = new wxStaticText( m_LayersListPanel, ID_SILKSFRONTCHOICE, _("On-board, non-copper"), wxDefaultPosition, wxDefaultSize, 0 ); m_SilkSFrontStaticText->Wrap( -1 ); m_LayerListFlexGridSizer->Add( m_SilkSFrontStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); @@ -162,18 +162,18 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_MaskFrontCheckBox = new wxCheckBox( m_MaskFrontPanel, ID_MASKFRONTCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer8->Add( m_MaskFrontCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bSizer8->Add( m_MaskFrontCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_MaskFrontPanel->SetSizer( bSizer8 ); m_MaskFrontPanel->Layout(); bSizer8->Fit( m_MaskFrontPanel ); m_LayerListFlexGridSizer->Add( m_MaskFrontPanel, 1, wxEXPAND, 5 ); - m_MaskFrontStaticText = new wxStaticText( m_LayersListPanel, wxID_ANY, _("On-board, non-copper"), wxDefaultPosition, wxDefaultSize, 0 ); + m_MaskFrontStaticText = new wxStaticText( m_LayersListPanel, ID_MASKFRONTCHOICE, _("On-board, non-copper"), wxDefaultPosition, wxDefaultSize, 0 ); m_MaskFrontStaticText->Wrap( -1 ); m_LayerListFlexGridSizer->Add( m_MaskFrontStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - m_FrontName = new wxTextCtrl( m_LayersListPanel, ID_FRONTNAME, _("Front"), wxDefaultPosition, wxDefaultSize, 0 ); + m_FrontName = new wxTextCtrl( m_LayersListPanel, ID_FRONTNAME, _("Front_later"), wxDefaultPosition, wxDefaultSize, 0 ); m_FrontName->SetMaxLength( 20 ); m_LayerListFlexGridSizer->Add( m_FrontName, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); @@ -185,7 +185,7 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_FrontCheckBox = new wxCheckBox( m_FrontPanel, ID_FRONTCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer9->Add( m_FrontCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bSizer9->Add( m_FrontCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_FrontPanel->SetSizer( bSizer9 ); m_FrontPanel->Layout(); @@ -209,7 +209,7 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_Inner2CheckBox = new wxCheckBox( m_Inner2Panel, ID_INNER2CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bInner2Sizer->Add( m_Inner2CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bInner2Sizer->Add( m_Inner2CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_Inner2Panel->SetSizer( bInner2Sizer ); m_Inner2Panel->Layout(); @@ -233,7 +233,7 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_Inner3CheckBox = new wxCheckBox( m_Inner3Panel, ID_INNER3CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bInner3Sizer->Add( m_Inner3CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bInner3Sizer->Add( m_Inner3CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_Inner3Panel->SetSizer( bInner3Sizer ); m_Inner3Panel->Layout(); @@ -257,7 +257,7 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_Inner4CheckBox = new wxCheckBox( m_Inner4Panel, ID_INNER4CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bInner4Sizer->Add( m_Inner4CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bInner4Sizer->Add( m_Inner4CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_Inner4Panel->SetSizer( bInner4Sizer ); m_Inner4Panel->Layout(); @@ -281,7 +281,7 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_Inner5CheckBox = new wxCheckBox( m_Inner5Panel, ID_INNER5CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bInner5Sizer->Add( m_Inner5CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bInner5Sizer->Add( m_Inner5CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_Inner5Panel->SetSizer( bInner5Sizer ); m_Inner5Panel->Layout(); @@ -305,7 +305,7 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_Inner6CheckBox = new wxCheckBox( m_Inner6Panel, ID_INNER6CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bInner6Sizer->Add( m_Inner6CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bInner6Sizer->Add( m_Inner6CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_Inner6Panel->SetSizer( bInner6Sizer ); m_Inner6Panel->Layout(); @@ -329,7 +329,7 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_Inner7CheckBox = new wxCheckBox( m_Inner7Panel, ID_INNER7CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bInner7Sizer->Add( m_Inner7CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bInner7Sizer->Add( m_Inner7CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_Inner7Panel->SetSizer( bInner7Sizer ); m_Inner7Panel->Layout(); @@ -353,7 +353,7 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_Inner8CheckBox = new wxCheckBox( m_Inner8Panel, ID_INNER8CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bInner8Sizer->Add( m_Inner8CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bInner8Sizer->Add( m_Inner8CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_Inner8Panel->SetSizer( bInner8Sizer ); m_Inner8Panel->Layout(); @@ -377,7 +377,7 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_Inner9CheckBox = new wxCheckBox( m_Inner9Panel, ID_INNER9CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bInner9Sizer->Add( m_Inner9CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bInner9Sizer->Add( m_Inner9CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_Inner9Panel->SetSizer( bInner9Sizer ); m_Inner9Panel->Layout(); @@ -401,7 +401,7 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_Inner10CheckBox = new wxCheckBox( m_Inner10Panel, ID_INNER10CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bInner10Sizer->Add( m_Inner10CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bInner10Sizer->Add( m_Inner10CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_Inner10Panel->SetSizer( bInner10Sizer ); m_Inner10Panel->Layout(); @@ -425,7 +425,7 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_Inner11CheckBox = new wxCheckBox( m_Inner11Panel, ID_INNER11CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bInner11Sizer->Add( m_Inner11CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bInner11Sizer->Add( m_Inner11CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_Inner11Panel->SetSizer( bInner11Sizer ); m_Inner11Panel->Layout(); @@ -449,7 +449,7 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_Inner12CheckBox = new wxCheckBox( m_Inner12Panel, ID_INNER12CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bInner12Sizer->Add( m_Inner12CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bInner12Sizer->Add( m_Inner12CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_Inner12Panel->SetSizer( bInner12Sizer ); m_Inner12Panel->Layout(); @@ -473,7 +473,7 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_Inner13CheckBox = new wxCheckBox( m_Inner13Panel, ID_INNER13CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bInner13Sizer->Add( m_Inner13CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bInner13Sizer->Add( m_Inner13CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_Inner13Panel->SetSizer( bInner13Sizer ); m_Inner13Panel->Layout(); @@ -497,7 +497,7 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_Inner14CheckBox = new wxCheckBox( m_Inner14Panel, ID_INNER14CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bInner14Sizer->Add( m_Inner14CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bInner14Sizer->Add( m_Inner14CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_Inner14Panel->SetSizer( bInner14Sizer ); m_Inner14Panel->Layout(); @@ -521,7 +521,7 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_Inner15CheckBox = new wxCheckBox( m_Inner15Panel, ID_INNER15CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bInner15Sizer->Add( m_Inner15CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bInner15Sizer->Add( m_Inner15CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_Inner15Panel->SetSizer( bInner15Sizer ); m_Inner15Panel->Layout(); @@ -545,7 +545,7 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_BackCheckBox = new wxCheckBox( m_BackPanel, ID_BACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bBackSizer->Add( m_BackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bBackSizer->Add( m_BackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_BackPanel->SetSizer( bBackSizer ); m_BackPanel->Layout(); @@ -568,16 +568,16 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow wxBoxSizer* bSizer24; bSizer24 = new wxBoxSizer( wxVERTICAL ); - m_MaskBackCheckBox = new wxCheckBox( m_panel21, ID_MASKFRONTCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_MaskBackCheckBox = new wxCheckBox( m_panel21, ID_MASKBACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer24->Add( m_MaskBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bSizer24->Add( m_MaskBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_panel21->SetSizer( bSizer24 ); m_panel21->Layout(); bSizer24->Fit( m_panel21 ); m_LayerListFlexGridSizer->Add( m_panel21, 1, wxEXPAND, 5 ); - m_MaskBackStaticText = new wxStaticText( m_LayersListPanel, wxID_ANY, _("On-board, non-copper"), wxDefaultPosition, wxDefaultSize, 0 ); + m_MaskBackStaticText = new wxStaticText( m_LayersListPanel, ID_MASKBACKCHOICE, _("On-board, non-copper"), wxDefaultPosition, wxDefaultSize, 0 ); m_MaskBackStaticText->Wrap( -1 ); m_LayerListFlexGridSizer->Add( m_MaskBackStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); @@ -593,14 +593,14 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_SilkSBackCheckBox = new wxCheckBox( m_panel22, ID_SILKSBACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer25->Add( m_SilkSBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bSizer25->Add( m_SilkSBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_panel22->SetSizer( bSizer25 ); m_panel22->Layout(); bSizer25->Fit( m_panel22 ); m_LayerListFlexGridSizer->Add( m_panel22, 1, wxEXPAND, 5 ); - m_SilkSBackStaticText = new wxStaticText( m_LayersListPanel, wxID_ANY, _("On-board, non-copper"), wxDefaultPosition, wxDefaultSize, 0 ); + m_SilkSBackStaticText = new wxStaticText( m_LayersListPanel, ID_SILKSBACKCHOICE, _("On-board, non-copper"), wxDefaultPosition, wxDefaultSize, 0 ); m_SilkSBackStaticText->Wrap( -1 ); m_LayerListFlexGridSizer->Add( m_SilkSBackStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); @@ -616,14 +616,14 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_SoldPBackCheckBox = new wxCheckBox( m_panel23, ID_SOLDPBACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer26->Add( m_SoldPBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bSizer26->Add( m_SoldPBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_panel23->SetSizer( bSizer26 ); m_panel23->Layout(); bSizer26->Fit( m_panel23 ); m_LayerListFlexGridSizer->Add( m_panel23, 1, wxEXPAND, 5 ); - m_SoldPBackStaticText = new wxStaticText( m_LayersListPanel, wxID_ANY, _("Off-board, manufacturing"), wxDefaultPosition, wxDefaultSize, 0 ); + m_SoldPBackStaticText = new wxStaticText( m_LayersListPanel, ID_SOLDPBACKCHOICE, _("Off-board, manufacturing"), wxDefaultPosition, wxDefaultSize, 0 ); m_SoldPBackStaticText->Wrap( -1 ); m_LayerListFlexGridSizer->Add( m_SoldPBackStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); @@ -639,14 +639,14 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_AdhesBackCheckBox = new wxCheckBox( m_panel24, ID_ADHESBACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer27->Add( m_AdhesBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bSizer27->Add( m_AdhesBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_panel24->SetSizer( bSizer27 ); m_panel24->Layout(); bSizer27->Fit( m_panel24 ); m_LayerListFlexGridSizer->Add( m_panel24, 1, wxEXPAND, 5 ); - m_AdhesBackStaticText = new wxStaticText( m_LayersListPanel, wxID_ANY, _("Off-board, manufacturing"), wxDefaultPosition, wxDefaultSize, 0 ); + m_AdhesBackStaticText = new wxStaticText( m_LayersListPanel, ID_ADHESBACKCHOICE, _("Off-board, manufacturing"), wxDefaultPosition, wxDefaultSize, 0 ); m_AdhesBackStaticText->Wrap( -1 ); m_LayerListFlexGridSizer->Add( m_AdhesBackStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); @@ -662,14 +662,14 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_PCBEdgesCheckBox = new wxCheckBox( m_panel25, ID_PCBEDGESCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer28->Add( m_PCBEdgesCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bSizer28->Add( m_PCBEdgesCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_panel25->SetSizer( bSizer28 ); m_panel25->Layout(); bSizer28->Fit( m_panel25 ); m_LayerListFlexGridSizer->Add( m_panel25, 1, wxEXPAND, 5 ); - m_PCBEdgesStaticText = new wxStaticText( m_LayersListPanel, wxID_ANY, _("Board contour"), wxDefaultPosition, wxDefaultSize, 0 ); + m_PCBEdgesStaticText = new wxStaticText( m_LayersListPanel, ID_PCBEDGESCHOICE, _("Board contour"), wxDefaultPosition, wxDefaultSize, 0 ); m_PCBEdgesStaticText->Wrap( -1 ); m_LayerListFlexGridSizer->Add( m_PCBEdgesStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); @@ -683,16 +683,16 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow wxBoxSizer* bSizer29; bSizer29 = new wxBoxSizer( wxVERTICAL ); - m_Eco2CheckBox = new wxCheckBox( m_panel26, ID_ECHO2CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_Eco2CheckBox = new wxCheckBox( m_panel26, ID_ECO2CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer29->Add( m_Eco2CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bSizer29->Add( m_Eco2CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_panel26->SetSizer( bSizer29 ); m_panel26->Layout(); bSizer29->Fit( m_panel26 ); m_LayerListFlexGridSizer->Add( m_panel26, 1, wxEXPAND, 5 ); - m_Eco2StaticText = new wxStaticText( m_LayersListPanel, wxID_ANY, _("Auxiliary"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Eco2StaticText = new wxStaticText( m_LayersListPanel, ID_ECO2CHOICE, _("Auxiliary"), wxDefaultPosition, wxDefaultSize, 0 ); m_Eco2StaticText->Wrap( -1 ); m_LayerListFlexGridSizer->Add( m_Eco2StaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); @@ -708,14 +708,14 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_Eco1CheckBox = new wxCheckBox( m_panel27, ID_ECO1CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer30->Add( m_Eco1CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bSizer30->Add( m_Eco1CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_panel27->SetSizer( bSizer30 ); m_panel27->Layout(); bSizer30->Fit( m_panel27 ); m_LayerListFlexGridSizer->Add( m_panel27, 1, wxEXPAND, 5 ); - m_Eco1StaticText = new wxStaticText( m_LayersListPanel, wxID_ANY, _("Auxiliary"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Eco1StaticText = new wxStaticText( m_LayersListPanel, ID_ECO1CHOICE, _("Auxiliary"), wxDefaultPosition, wxDefaultSize, 0 ); m_Eco1StaticText->Wrap( -1 ); m_LayerListFlexGridSizer->Add( m_Eco1StaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); @@ -731,14 +731,14 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_CommentsCheckBox = new wxCheckBox( m_panel28, ID_COMMENTSCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer31->Add( m_CommentsCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bSizer31->Add( m_CommentsCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_panel28->SetSizer( bSizer31 ); m_panel28->Layout(); bSizer31->Fit( m_panel28 ); m_LayerListFlexGridSizer->Add( m_panel28, 1, wxEXPAND, 5 ); - m_CommentsStaticText = new wxStaticText( m_LayersListPanel, wxID_ANY, _("Auxiliary"), wxDefaultPosition, wxDefaultSize, 0 ); + m_CommentsStaticText = new wxStaticText( m_LayersListPanel, ID_COMMENTSCHOICE, _("Auxiliary"), wxDefaultPosition, wxDefaultSize, 0 ); m_CommentsStaticText->Wrap( -1 ); m_LayerListFlexGridSizer->Add( m_CommentsStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); @@ -754,16 +754,16 @@ DIALOG_LAYERS_SETUP_BASE2::DIALOG_LAYERS_SETUP_BASE2( wxWindow* parent, wxWindow m_DrawingsCheckBox = new wxCheckBox( m_panel29, ID_DRAWINGSCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer32->Add( m_DrawingsCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bSizer32->Add( m_DrawingsCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_panel29->SetSizer( bSizer32 ); m_panel29->Layout(); bSizer32->Fit( m_panel29 ); m_LayerListFlexGridSizer->Add( m_panel29, 1, wxEXPAND, 5 ); - m_DrawingsStaticText = new wxStaticText( m_LayersListPanel, wxID_ANY, _("Auxiliary"), wxDefaultPosition, wxDefaultSize, 0 ); + m_DrawingsStaticText = new wxStaticText( m_LayersListPanel, ID_DRAWINGSCHOICE, _("Auxiliary"), wxDefaultPosition, wxDefaultSize, 0 ); m_DrawingsStaticText->Wrap( -1 ); - m_LayerListFlexGridSizer->Add( m_DrawingsStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + m_LayerListFlexGridSizer->Add( m_DrawingsStaticText, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_LayersListPanel->SetSizer( m_LayerListFlexGridSizer ); m_LayersListPanel->Layout(); diff --git a/pcbnew/dialog_layers_setup_base2.fbp b/pcbnew/dialog_layers_setup_base2.fbp index e69819a1cb..4028bdbe1a 100644 --- a/pcbnew/dialog_layers_setup_base2.fbp +++ b/pcbnew/dialog_layers_setup_base2.fbp @@ -556,7 +556,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -620,7 +620,7 @@ 0 - wxID_ANY + ID_ADHESFRONTCHOICE Off-board, manufacturing @@ -764,7 +764,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -828,7 +828,7 @@ 0 - wxID_ANY + ID_SOLDPFRONTCHOICE Off-board, manufacturing @@ -972,7 +972,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -1036,7 +1036,7 @@ 0 - wxID_ANY + ID_SILKSFRONTCHOICE On-board, non-copper @@ -1180,7 +1180,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -1244,7 +1244,7 @@ 0 - wxID_ANY + ID_MASKFRONTCHOICE On-board, non-copper @@ -1306,7 +1306,7 @@ - Front + Front_later @@ -1392,7 +1392,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -1604,7 +1604,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -1816,7 +1816,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -2028,7 +2028,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -2240,7 +2240,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -2452,7 +2452,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -2664,7 +2664,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -2876,7 +2876,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -3088,7 +3088,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -3300,7 +3300,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -3512,7 +3512,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -3724,7 +3724,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -3936,7 +3936,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -4148,7 +4148,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -4360,7 +4360,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -4572,7 +4572,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -4780,7 +4780,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -4790,7 +4790,7 @@ 0 - ID_MASKFRONTCHECKBOX + ID_MASKBACKCHECKBOX @@ -4844,7 +4844,7 @@ 0 - wxID_ANY + ID_MASKBACKCHOICE On-board, non-copper @@ -4988,7 +4988,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -5052,7 +5052,7 @@ 0 - wxID_ANY + ID_SILKSBACKCHOICE On-board, non-copper @@ -5196,7 +5196,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -5260,7 +5260,7 @@ 0 - wxID_ANY + ID_SOLDPBACKCHOICE Off-board, manufacturing @@ -5404,7 +5404,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -5468,7 +5468,7 @@ 0 - wxID_ANY + ID_ADHESBACKCHOICE Off-board, manufacturing @@ -5612,7 +5612,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -5676,7 +5676,7 @@ 0 - wxID_ANY + ID_PCBEDGESCHOICE Board contour @@ -5820,7 +5820,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -5830,7 +5830,7 @@ 0 - ID_ECHO2CHECKBOX + ID_ECO2CHECKBOX @@ -5884,7 +5884,7 @@ 0 - wxID_ANY + ID_ECO2CHOICE Auxiliary @@ -6028,7 +6028,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -6092,7 +6092,7 @@ 0 - wxID_ANY + ID_ECO1CHOICE Auxiliary @@ -6236,7 +6236,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -6300,7 +6300,7 @@ 0 - wxID_ANY + ID_COMMENTSCHOICE Auxiliary @@ -6444,7 +6444,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -6499,7 +6499,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxALL 0 @@ -6508,7 +6508,7 @@ 0 - wxID_ANY + ID_DRAWINGSCHOICE Auxiliary diff --git a/pcbnew/dialog_layers_setup_base2.h b/pcbnew/dialog_layers_setup_base2.h index ddbe08fc89..7145533f9a 100644 --- a/pcbnew/dialog_layers_setup_base2.h +++ b/pcbnew/dialog_layers_setup_base2.h @@ -30,77 +30,91 @@ #define ID_ADHESFRONTNAME 1000 #define ID_ADHESFRONTCHECKBOX 1001 -#define ID_SOLDPFRONTNAME 1002 -#define ID_SOLDPFRONTCHECKBOX 1003 -#define ID_SILKSFRONTNAME 1004 -#define ID_SILKSFRONTCHECKBOX 1005 -#define ID_MASKFRONTNAME 1006 -#define ID_MASKFRONTCHECKBOX 1007 -#define ID_FRONTNAME 1008 -#define ID_FRONTCHECKBOX 1009 -#define ID_FRONTCHOICE 1010 -#define ID_INNER2NAME 1011 -#define ID_INNER2CHECKBOX 1012 -#define ID_INNER2CHOICE 1013 -#define ID_INNER3NAME 1014 -#define ID_INNER3CHECKBOX 1015 -#define ID_INNER3CHOICE 1016 -#define ID_INNER4NAME 1017 -#define ID_INNER4CHECKBOX 1018 -#define ID_INNER4CHOICE 1019 -#define ID_INNER5NAME 1020 -#define ID_INNER5CHECKBOX 1021 -#define ID_INNER5CHOICE 1022 -#define ID_INNER6NAME 1023 -#define ID_INNER6CHECKBOX 1024 -#define ID_INNER6CHOICE 1025 -#define ID_INNER7NAME 1026 -#define ID_INNER7CHECKBOX 1027 -#define ID_INNER7CHOICE 1028 -#define ID_INNER8NAME 1029 -#define ID_INNER8CHECKBOX 1030 -#define ID_INNER8CHOICE 1031 -#define ID_INNER9NAME 1032 -#define ID_INNER9CHECKBOX 1033 -#define ID_INNER9CHOICE 1034 -#define ID_INNER10NAME 1035 -#define ID_INNER10CHECKBOX 1036 -#define ID_INNER10CHOICE 1037 -#define ID_INNER11NAME 1038 -#define ID_INNER11CHECKBOX 1039 -#define ID_INNER11CHOICE 1040 -#define ID_INNER12NAME 1041 -#define ID_INNER12CHECKBOX 1042 -#define ID_INNER12CHOICE 1043 -#define ID_INNER13NAME 1044 -#define ID_INNER13CHECKBOX 1045 -#define ID_INNER13CHOICE 1046 -#define ID_INNER14NAME 1047 -#define ID_INNER14CHECKBOX 1048 -#define ID_INNER14CHOICE 1049 -#define ID_INNER15NAME 1050 -#define ID_INNER15CHECKBOX 1051 -#define ID_INNER15CHOICE 1052 -#define ID_BACKNAME 1053 -#define ID_BACKCHECKBOX 1054 -#define ID_BACKCHOICE 1055 -#define ID_MASKBACKNAME 1056 -#define ID_SILKSBACKNAME 1057 -#define ID_SILKSBACKCHECKBOX 1058 -#define ID_SOLDPBACKNAME 1059 -#define ID_SOLDPBACKCHECKBOX 1060 -#define ID_ADHESBACKNAME 1061 -#define ID_ADHESBACKCHECKBOX 1062 -#define ID_PCBEDGESNAME 1063 -#define ID_PCBEDGESCHECKBOX 1064 -#define ID_ECO2NAME 1065 -#define ID_ECHO2CHECKBOX 1066 -#define ID_ECO1NAME 1067 -#define ID_ECO1CHECKBOX 1068 -#define ID_COMMENTSNAME 1069 -#define ID_COMMENTSCHECKBOX 1070 -#define ID_DRAWINGSNAME 1071 -#define ID_DRAWINGSCHECKBOX 1072 +#define ID_ADHESFRONTCHOICE 1002 +#define ID_SOLDPFRONTNAME 1003 +#define ID_SOLDPFRONTCHECKBOX 1004 +#define ID_SOLDPFRONTCHOICE 1005 +#define ID_SILKSFRONTNAME 1006 +#define ID_SILKSFRONTCHECKBOX 1007 +#define ID_SILKSFRONTCHOICE 1008 +#define ID_MASKFRONTNAME 1009 +#define ID_MASKFRONTCHECKBOX 1010 +#define ID_MASKFRONTCHOICE 1011 +#define ID_FRONTNAME 1012 +#define ID_FRONTCHECKBOX 1013 +#define ID_FRONTCHOICE 1014 +#define ID_INNER2NAME 1015 +#define ID_INNER2CHECKBOX 1016 +#define ID_INNER2CHOICE 1017 +#define ID_INNER3NAME 1018 +#define ID_INNER3CHECKBOX 1019 +#define ID_INNER3CHOICE 1020 +#define ID_INNER4NAME 1021 +#define ID_INNER4CHECKBOX 1022 +#define ID_INNER4CHOICE 1023 +#define ID_INNER5NAME 1024 +#define ID_INNER5CHECKBOX 1025 +#define ID_INNER5CHOICE 1026 +#define ID_INNER6NAME 1027 +#define ID_INNER6CHECKBOX 1028 +#define ID_INNER6CHOICE 1029 +#define ID_INNER7NAME 1030 +#define ID_INNER7CHECKBOX 1031 +#define ID_INNER7CHOICE 1032 +#define ID_INNER8NAME 1033 +#define ID_INNER8CHECKBOX 1034 +#define ID_INNER8CHOICE 1035 +#define ID_INNER9NAME 1036 +#define ID_INNER9CHECKBOX 1037 +#define ID_INNER9CHOICE 1038 +#define ID_INNER10NAME 1039 +#define ID_INNER10CHECKBOX 1040 +#define ID_INNER10CHOICE 1041 +#define ID_INNER11NAME 1042 +#define ID_INNER11CHECKBOX 1043 +#define ID_INNER11CHOICE 1044 +#define ID_INNER12NAME 1045 +#define ID_INNER12CHECKBOX 1046 +#define ID_INNER12CHOICE 1047 +#define ID_INNER13NAME 1048 +#define ID_INNER13CHECKBOX 1049 +#define ID_INNER13CHOICE 1050 +#define ID_INNER14NAME 1051 +#define ID_INNER14CHECKBOX 1052 +#define ID_INNER14CHOICE 1053 +#define ID_INNER15NAME 1054 +#define ID_INNER15CHECKBOX 1055 +#define ID_INNER15CHOICE 1056 +#define ID_BACKNAME 1057 +#define ID_BACKCHECKBOX 1058 +#define ID_BACKCHOICE 1059 +#define ID_MASKBACKNAME 1060 +#define ID_MASKBACKCHECKBOX 1061 +#define ID_MASKBACKCHOICE 1062 +#define ID_SILKSBACKNAME 1063 +#define ID_SILKSBACKCHECKBOX 1064 +#define ID_SILKSBACKCHOICE 1065 +#define ID_SOLDPBACKNAME 1066 +#define ID_SOLDPBACKCHECKBOX 1067 +#define ID_SOLDPBACKCHOICE 1068 +#define ID_ADHESBACKNAME 1069 +#define ID_ADHESBACKCHECKBOX 1070 +#define ID_ADHESBACKCHOICE 1071 +#define ID_PCBEDGESNAME 1072 +#define ID_PCBEDGESCHECKBOX 1073 +#define ID_PCBEDGESCHOICE 1074 +#define ID_ECO2NAME 1075 +#define ID_ECO2CHECKBOX 1076 +#define ID_ECO2CHOICE 1077 +#define ID_ECO1NAME 1078 +#define ID_ECO1CHECKBOX 1079 +#define ID_ECO1CHOICE 1080 +#define ID_COMMENTSNAME 1081 +#define ID_COMMENTSCHECKBOX 1082 +#define ID_COMMENTSCHOICE 1083 +#define ID_DRAWINGSNAME 1084 +#define ID_DRAWINGSCHECKBOX 1085 +#define ID_DRAWINGSCHOICE 1086 /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_LAYERS_SETUP_BASE2