diff --git a/pcbnew/dialogs/dialog_SVG_print_base.cpp b/pcbnew/dialogs/dialog_SVG_print_base.cpp index 334a7538bd..34605e00a3 100644 --- a/pcbnew/dialogs/dialog_SVG_print_base.cpp +++ b/pcbnew/dialogs/dialog_SVG_print_base.cpp @@ -9,7 +9,7 @@ /////////////////////////////////////////////////////////////////////////// -DIALOG_SVG_PRINT_base::DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +DIALOG_SVG_PRINT_base::DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxSize( -1,350 ), wxDefaultSize ); diff --git a/pcbnew/dialogs/dialog_SVG_print_base.fbp b/pcbnew/dialogs/dialog_SVG_print_base.fbp index 9694a9854f..a267ca1193 100644 --- a/pcbnew/dialogs/dialog_SVG_print_base.fbp +++ b/pcbnew/dialogs/dialog_SVG_print_base.fbp @@ -44,7 +44,7 @@ 507,420 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + DIALOG_SHIM; dialog_shim.h Export SVG file diff --git a/pcbnew/dialogs/dialog_SVG_print_base.h b/pcbnew/dialogs/dialog_SVG_print_base.h index cbc292315e..4fc5db85fe 100644 --- a/pcbnew/dialogs/dialog_SVG_print_base.h +++ b/pcbnew/dialogs/dialog_SVG_print_base.h @@ -11,6 +11,7 @@ #include #include #include +#include "dialog_shim.h" #include #include #include @@ -30,7 +31,7 @@ /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_SVG_PRINT_base /////////////////////////////////////////////////////////////////////////////// -class DIALOG_SVG_PRINT_base : public wxDialog +class DIALOG_SVG_PRINT_base : public DIALOG_SHIM { private: diff --git a/pcbnew/dialogs/dialog_block_options_base.cpp b/pcbnew/dialogs/dialog_block_options_base.cpp index ff5d1afd49..cd83c51f40 100644 --- a/pcbnew/dialogs/dialog_block_options_base.cpp +++ b/pcbnew/dialogs/dialog_block_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 17 2010) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -9,7 +9,7 @@ /////////////////////////////////////////////////////////////////////////// -DIALOG_BLOCK_OPTIONS_BASE::DIALOG_BLOCK_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +DIALOG_BLOCK_OPTIONS_BASE::DIALOG_BLOCK_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); @@ -47,7 +47,8 @@ DIALOG_BLOCK_OPTIONS_BASE::DIALOG_BLOCK_OPTIONS_BASE( wxWindow* parent, wxWindow m_DrawBlockItems = new wxCheckBox( this, wxID_ANY, _("Draw selected items while moving"), wxDefaultPosition, wxDefaultSize, 0 ); gSizer1->Add( m_DrawBlockItems, 0, wxALL, 5 ); - sbSizer1->Add( gSizer1, 0, wxEXPAND, 5 ); + + sbSizer1->Add( gSizer1, 1, wxEXPAND, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); sbSizer1->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); @@ -55,6 +56,7 @@ DIALOG_BLOCK_OPTIONS_BASE::DIALOG_BLOCK_OPTIONS_BASE( wxWindow* parent, wxWindow m_checkBoxIncludeInvisible = new wxCheckBox( this, wxID_ANY, _("Include items on invisible layers"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer1->Add( m_checkBoxIncludeInvisible, 0, wxALL, 5 ); + bSizerMain->Add( sbSizer1, 1, wxALL|wxEXPAND, 5 ); m_sdbSizer1 = new wxStdDialogButtonSizer(); @@ -63,8 +65,10 @@ DIALOG_BLOCK_OPTIONS_BASE::DIALOG_BLOCK_OPTIONS_BASE( wxWindow* parent, wxWindow m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); + bSizerMain->Add( m_sdbSizer1, 0, wxALIGN_RIGHT|wxALL, 5 ); + this->SetSizer( bSizerMain ); this->Layout(); diff --git a/pcbnew/dialogs/dialog_block_options_base.fbp b/pcbnew/dialogs/dialog_block_options_base.fbp index 5dab3a6fdf..b3ccb7c35e 100644 --- a/pcbnew/dialogs/dialog_block_options_base.fbp +++ b/pcbnew/dialogs/dialog_block_options_base.fbp @@ -2,11 +2,13 @@ - + C++ 1 source_name + 0 0 + res UTF-8 connect dialog_block_options_base @@ -14,102 +16,78 @@ none 1 dialog_block_options_base - + . - + 1 + 1 1 0 0 - 1 - 1 - 1 - 1 0 - - - - 1 + wxAUI_MGR_DEFAULT + wxBOTH - 0 - 1 - + 1 - 0 - Dock - 0 - Left 1 impl_virtual - - - 1 - - 0 + + + 0 wxID_ANY - - 0 - - 0 - - 1 + + DIALOG_BLOCK_OPTIONS_BASE - 1 - - - 1 - - - Resizable - - 1 + 397,226 - wxDEFAULT_DIALOG_STYLE - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + DIALOG_SHIM; dialog_shim.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bSizerMain wxVERTICAL none @@ -120,19 +98,19 @@ wxID_ANY Options - + sbSizer1 wxVERTICAL none - + 5 wxEXPAND - 0 + 1 2 0 - + gSizer1 none 4 @@ -146,80 +124,83 @@ 1 1 1 - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Include modules - + 0 - + + 0 - + 1 m_Include_Modules 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - + + + + + checkBoxClicked - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -231,80 +212,83 @@ 1 1 1 - - - + + + + + + + 1 0 1 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Include text items - + 0 - + + 0 - + 1 m_Include_PcbTextes 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - + + + + + checkBoxClicked - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -316,80 +300,83 @@ 1 1 1 - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Include locked modules - + 0 - + + 0 - + 1 m_IncludeLockedModules 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - + + + + + checkBoxClicked - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -401,80 +388,83 @@ 1 1 1 - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Include drawings - + 0 - + + 0 - + 1 m_Include_Draw_Items 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - + + + + + checkBoxClicked - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -486,80 +476,83 @@ 1 1 1 - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Include tracks - + 0 - + + 0 - + 1 m_Include_Tracks 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - + + + + + checkBoxClicked - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -571,80 +564,83 @@ 1 1 1 - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Include board outline layer - + 0 - + + 0 - + 1 m_Include_Edges_Items 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - + + + + + checkBoxClicked - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -656,80 +652,83 @@ 1 1 1 - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Include zones - + 0 - + + 0 - + 1 m_Include_Zones 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - + + + + + checkBoxClicked - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -741,80 +740,83 @@ 1 1 1 - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Draw selected items while moving - + 0 - + + 0 - + 1 m_DrawBlockItems 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - + + + + + checkBoxClicked - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -828,77 +830,76 @@ 1 1 1 - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + + 0 - + 1 m_staticline1 1 - - + + protected 1 - - + Resizable - 1 - + wxLI_HORIZONTAL - + 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -910,80 +911,83 @@ 1 1 1 - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Include items on invisible layers - + 0 - + + 0 - + 1 m_checkBoxIncludeInvisible 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - + + + + + checkBoxClicked - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -1001,17 +1005,17 @@ 1 0 0 - + m_sdbSizer1 protected - + OnCancel - - - + + + ExecuteCommand - - + + diff --git a/pcbnew/dialogs/dialog_block_options_base.h b/pcbnew/dialogs/dialog_block_options_base.h index 2d2dff2abc..7877b111b9 100644 --- a/pcbnew/dialogs/dialog_block_options_base.h +++ b/pcbnew/dialogs/dialog_block_options_base.h @@ -1,15 +1,17 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 17 2010) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __dialog_block_options_base__ -#define __dialog_block_options_base__ +#ifndef __DIALOG_BLOCK_OPTIONS_BASE_H__ +#define __DIALOG_BLOCK_OPTIONS_BASE_H__ +#include +#include #include - +#include "dialog_shim.h" #include #include #include @@ -28,7 +30,7 @@ /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_BLOCK_OPTIONS_BASE /////////////////////////////////////////////////////////////////////////////// -class DIALOG_BLOCK_OPTIONS_BASE : public wxDialog +class DIALOG_BLOCK_OPTIONS_BASE : public DIALOG_SHIM { private: @@ -55,9 +57,9 @@ class DIALOG_BLOCK_OPTIONS_BASE : public wxDialog public: - DIALOG_BLOCK_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 397,226 ), long style = wxDEFAULT_DIALOG_STYLE ); + DIALOG_BLOCK_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 397,226 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_BLOCK_OPTIONS_BASE(); }; -#endif //__dialog_block_options_base__ +#endif //__DIALOG_BLOCK_OPTIONS_BASE_H__ diff --git a/pcbnew/dialogs/dialog_cleaning_options.h b/pcbnew/dialogs/dialog_cleaning_options.h index fba6a428e1..d32c969d7c 100644 --- a/pcbnew/dialogs/dialog_cleaning_options.h +++ b/pcbnew/dialogs/dialog_cleaning_options.h @@ -36,6 +36,7 @@ private: void OnCloseWindow( wxCloseEvent& event ) { GetOpts( ); + EndModal( wxID_CANCEL ); } void GetOpts( ) diff --git a/pcbnew/dialogs/dialog_cleaning_options_base.cpp b/pcbnew/dialogs/dialog_cleaning_options_base.cpp index f73d8a53df..bc95a5cd21 100644 --- a/pcbnew/dialogs/dialog_cleaning_options_base.cpp +++ b/pcbnew/dialogs/dialog_cleaning_options_base.cpp @@ -9,7 +9,7 @@ /////////////////////////////////////////////////////////////////////////// -DIALOG_CLEANING_OPTIONS_BASE::DIALOG_CLEANING_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +DIALOG_CLEANING_OPTIONS_BASE::DIALOG_CLEANING_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); diff --git a/pcbnew/dialogs/dialog_cleaning_options_base.fbp b/pcbnew/dialogs/dialog_cleaning_options_base.fbp index 1f7c56b07b..f6ef10ec86 100644 --- a/pcbnew/dialogs/dialog_cleaning_options_base.fbp +++ b/pcbnew/dialogs/dialog_cleaning_options_base.fbp @@ -44,7 +44,7 @@ 243,146 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + DIALOG_SHIM; dialog_shim.h Cleaning options diff --git a/pcbnew/dialogs/dialog_cleaning_options_base.h b/pcbnew/dialogs/dialog_cleaning_options_base.h index 31a83b2bf2..23e2ba30bb 100644 --- a/pcbnew/dialogs/dialog_cleaning_options_base.h +++ b/pcbnew/dialogs/dialog_cleaning_options_base.h @@ -11,6 +11,7 @@ #include #include #include +#include "dialog_shim.h" #include #include #include @@ -28,7 +29,7 @@ /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_CLEANING_OPTIONS_BASE /////////////////////////////////////////////////////////////////////////////// -class DIALOG_CLEANING_OPTIONS_BASE : public wxDialog +class DIALOG_CLEANING_OPTIONS_BASE : public DIALOG_SHIM { private: diff --git a/pcbnew/dialogs/dialog_design_rules.cpp b/pcbnew/dialogs/dialog_design_rules.cpp index d36f3baaac..e5d11fddc2 100644 --- a/pcbnew/dialogs/dialog_design_rules.cpp +++ b/pcbnew/dialogs/dialog_design_rules.cpp @@ -63,11 +63,7 @@ enum { const wxString DIALOG_DESIGN_RULES::wildCard = _( "* (Any)" ); // dialog should remember its previously selected tab -int DIALOG_DESIGN_RULES:: s_LastTabSelection = -1; - -// dialog should remember its previous screen position and size -wxPoint DIALOG_DESIGN_RULES:: s_LastPos( -1, -1 ); -wxSize DIALOG_DESIGN_RULES:: s_LastSize; +int DIALOG_DESIGN_RULES::s_LastTabSelection = -1; // methods for the helper class NETS_LIST_CTRL @@ -190,13 +186,7 @@ DIALOG_DESIGN_RULES::DIALOG_DESIGN_RULES( PCB_EDIT_FRAME* parent ) : GetSizer()->Fit( this ); GetSizer()->SetSizeHints( this ); - if( s_LastPos.x != -1 ) - { - SetSize( s_LastSize ); - SetPosition( s_LastPos ); - } - else - Center(); + Center(); } @@ -673,10 +663,6 @@ void DIALOG_DESIGN_RULES::OnCancelButtonClick( wxCommandEvent& event ) { s_LastTabSelection = m_DRnotebook->GetSelection(); - // Save the dialog's position before finishing - s_LastPos = GetPosition(); - s_LastSize = GetSize(); - EndModal( wxID_CANCEL ); } @@ -699,10 +685,6 @@ void DIALOG_DESIGN_RULES::OnOkButtonClick( wxCommandEvent& event ) m_Pcb->SetDesignSettings( m_BrdSettings ); - // Save the dialog's position before finishing - s_LastPos = GetPosition(); - s_LastSize = GetSize(); - EndModal( wxID_OK ); m_Pcb->SetCurrentNetClass( NETCLASS::Default ); diff --git a/pcbnew/dialogs/dialog_design_rules.h b/pcbnew/dialogs/dialog_design_rules.h index b26dc4ec80..3bfbfd8d57 100644 --- a/pcbnew/dialogs/dialog_design_rules.h +++ b/pcbnew/dialogs/dialog_design_rules.h @@ -44,9 +44,6 @@ private: static int s_LastTabSelection; ///< which tab user had open last - static wxSize s_LastSize; ///< last position and size - static wxPoint s_LastPos; - /** * A two column table which gets filled once and never loses any elements, so it is * basically constant, except that the NETCUP::clazz member can change for any diff --git a/pcbnew/dialogs/dialog_design_rules_base.cpp b/pcbnew/dialogs/dialog_design_rules_base.cpp index e84d3d62c1..3ba3a1ed1d 100644 --- a/pcbnew/dialogs/dialog_design_rules_base.cpp +++ b/pcbnew/dialogs/dialog_design_rules_base.cpp @@ -9,7 +9,7 @@ /////////////////////////////////////////////////////////////////////////// -DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize ); @@ -24,7 +24,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID wxStaticBoxSizer* sbSizerUpper; sbSizerUpper = new wxStaticBoxSizer( new wxStaticBox( m_panelNetClassesEditor, wxID_ANY, _("Net Classes:") ), wxVERTICAL ); - m_grid = new wxGrid( m_panelNetClassesEditor, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxSIMPLE_BORDER|wxVSCROLL ); + m_grid = new wxGrid( m_panelNetClassesEditor, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxSIMPLE_BORDER|wxTAB_TRAVERSAL|wxVSCROLL ); // Grid m_grid->CreateGrid( 1, 6 ); @@ -154,7 +154,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID m_panelNetClassesEditor->SetSizer( bpanelNetClassesSizer ); m_panelNetClassesEditor->Layout(); bpanelNetClassesSizer->Fit( m_panelNetClassesEditor ); - m_DRnotebook->AddPage( m_panelNetClassesEditor, _("Net Classes Editor"), false ); + m_DRnotebook->AddPage( m_panelNetClassesEditor, _("Net Classes Editor"), true ); m_panelGolbalDesignRules = new wxPanel( m_DRnotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL ); wxBoxSizer* bpanelGlobRulesSizer; bpanelGlobRulesSizer = new wxBoxSizer( wxVERTICAL ); @@ -182,7 +182,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID sbViasOptionSizer->Add( m_AllowMicroViaCtrl, 0, wxALL|wxEXPAND, 5 ); - bDesignRulesUpperSizer->Add( sbViasOptionSizer, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + bDesignRulesUpperSizer->Add( sbViasOptionSizer, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 5 ); wxStaticBoxSizer* sbMinSizesSizer; sbMinSizesSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelGolbalDesignRules, wxID_ANY, _("Minimum Allowed Values:") ), wxVERTICAL ); @@ -231,7 +231,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID fgMinValuesSizer->Add( m_SetMicroViasMinDrillCtrl, 0, wxEXPAND|wxALL, 5 ); - sbMinSizesSizer->Add( fgMinValuesSizer, 0, wxEXPAND, 5 ); + sbMinSizesSizer->Add( fgMinValuesSizer, 1, wxEXPAND, 5 ); bDesignRulesUpperSizer->Add( sbMinSizesSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); @@ -294,7 +294,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID // Cell Defaults m_gridViaSizeList->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); - sViaSizeBox->Add( m_gridViaSizeList, 0, wxALL|wxEXPAND, 5 ); + sViaSizeBox->Add( m_gridViaSizeList, 1, wxALL|wxEXPAND, 5 ); bDesignRulesLowerSizer->Add( sViaSizeBox, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 ); @@ -355,10 +355,10 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID // Cell Defaults m_gridTrackWidthList->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); - sbTracksListSizer->Add( m_gridTrackWidthList, 0, wxALL|wxEXPAND, 5 ); + sbTracksListSizer->Add( m_gridTrackWidthList, 1, wxALL|wxEXPAND, 5 ); - bDesignRulesLowerSizer->Add( sbTracksListSizer, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 ); + bDesignRulesLowerSizer->Add( sbTracksListSizer, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); bpanelGlobRulesSizer->Add( bDesignRulesLowerSizer, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); @@ -367,7 +367,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID m_panelGolbalDesignRules->SetSizer( bpanelGlobRulesSizer ); m_panelGolbalDesignRules->Layout(); bpanelGlobRulesSizer->Fit( m_panelGolbalDesignRules ); - m_DRnotebook->AddPage( m_panelGolbalDesignRules, _("Global Design Rules"), true ); + m_DRnotebook->AddPage( m_panelGolbalDesignRules, _("Global Design Rules"), false ); bMainSizer->Add( m_DRnotebook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); diff --git a/pcbnew/dialogs/dialog_design_rules_base.fbp b/pcbnew/dialogs/dialog_design_rules_base.fbp index efa8b990e1..7366270a2a 100644 --- a/pcbnew/dialogs/dialog_design_rules_base.fbp +++ b/pcbnew/dialogs/dialog_design_rules_base.fbp @@ -44,7 +44,7 @@ 777,697 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + DIALOG_SHIM; dialog_shim.h Design Rules Editor @@ -176,7 +176,7 @@ Net Classes Editor - 0 + 1 1 1 @@ -353,7 +353,7 @@ Net Class parameters - wxHSCROLL|wxSIMPLE_BORDER|wxVSCROLL + wxHSCROLL|wxSIMPLE_BORDER|wxTAB_TRAVERSAL|wxVSCROLL @@ -1485,7 +1485,7 @@ Global Design Rules - 1 + 0 1 1 @@ -1576,7 +1576,7 @@ none 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT|wxEXPAND 1 wxID_ANY @@ -1783,7 +1783,7 @@ 5 wxEXPAND - 0 + 1 2 wxBOTH @@ -2943,7 +2943,7 @@ 5 wxALL|wxEXPAND - 0 + 1 1 1 @@ -3087,7 +3087,7 @@ 5 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND + wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL 1 wxID_ANY @@ -3183,7 +3183,7 @@ 5 wxALL|wxEXPAND - 0 + 1 1 1 diff --git a/pcbnew/dialogs/dialog_design_rules_base.h b/pcbnew/dialogs/dialog_design_rules_base.h index e3f0a341d0..d1fba14b3a 100644 --- a/pcbnew/dialogs/dialog_design_rules_base.h +++ b/pcbnew/dialogs/dialog_design_rules_base.h @@ -12,6 +12,7 @@ #include #include #include "dialog_design_rules_aux_helper_class.h" +#include "dialog_shim.h" #include #include #include @@ -40,7 +41,7 @@ /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_DESIGN_RULES_BASE /////////////////////////////////////////////////////////////////////////////// -class DIALOG_DESIGN_RULES_BASE : public wxDialog +class DIALOG_DESIGN_RULES_BASE : public DIALOG_SHIM { private: diff --git a/pcbnew/dialogs/dialog_dimension_editor_base.cpp b/pcbnew/dialogs/dialog_dimension_editor_base.cpp index 3ee736e920..93246deb07 100644 --- a/pcbnew/dialogs/dialog_dimension_editor_base.cpp +++ b/pcbnew/dialogs/dialog_dimension_editor_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 30 2011) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -9,7 +9,7 @@ /////////////////////////////////////////////////////////////////////////// -DIALOG_DIMENSION_EDITOR_BASE::DIALOG_DIMENSION_EDITOR_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +DIALOG_DIMENSION_EDITOR_BASE::DIALOG_DIMENSION_EDITOR_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); @@ -66,6 +66,7 @@ DIALOG_DIMENSION_EDITOR_BASE::DIALOG_DIMENSION_EDITOR_BASE( wxWindow* parent, wx m_textCtrlPosY = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizerLeft->Add( m_textCtrlPosY, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bSizerUpper->Add( bSizerLeft, 1, wxEXPAND, 5 ); wxBoxSizer* bSizerRight; @@ -84,8 +85,10 @@ DIALOG_DIMENSION_EDITOR_BASE::DIALOG_DIMENSION_EDITOR_BASE( wxWindow* parent, wx m_SelLayerBox = new wxComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); bSizerRight->Add( m_SelLayerBox, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bSizerUpper->Add( bSizerRight, 0, wxALIGN_CENTER_VERTICAL, 5 ); + bSizerMain->Add( bSizerUpper, 1, wxEXPAND, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); @@ -97,8 +100,10 @@ DIALOG_DIMENSION_EDITOR_BASE::DIALOG_DIMENSION_EDITOR_BASE( wxWindow* parent, wx m_sdbSizerBtsCancel = new wxButton( this, wxID_CANCEL ); m_sdbSizerBts->AddButton( m_sdbSizerBtsCancel ); m_sdbSizerBts->Realize(); + bSizerMain->Add( m_sdbSizerBts, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + this->SetSizer( bSizerMain ); this->Layout(); diff --git a/pcbnew/dialogs/dialog_dimension_editor_base.fbp b/pcbnew/dialogs/dialog_dimension_editor_base.fbp index 2137edc19f..a6a2000e9d 100644 --- a/pcbnew/dialogs/dialog_dimension_editor_base.fbp +++ b/pcbnew/dialogs/dialog_dimension_editor_base.fbp @@ -1,11 +1,12 @@ - + C++ 1 source_name + 0 0 res UTF-8 @@ -19,66 +20,33 @@ . 1 + 1 1 0 0 - 1 - 1 - 1 - 1 0 - - + wxAUI_MGR_DEFAULT - - 1 wxBOTH - 0 - 1 1 - 0 - Dock - 0 - Left 1 impl_virtual - 1 - 0 0 wxID_ANY - - - 0 - - 0 - 1 DIALOG_DIMENSION_EDITOR_BASE - 1 - - - 1 - - Resizable - - 1 378,328 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + DIALOG_SHIM; dialog_shim.h Dimension Properties - 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -132,7 +100,10 @@ 1 1 1 + + + @@ -153,7 +124,6 @@ 0 wxID_ANY Text: - 0 @@ -168,19 +138,13 @@ protected 1 - Resizable - 1 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -219,7 +183,10 @@ 1 1 1 + + + @@ -239,7 +206,6 @@ 0 0 wxID_ANY - 0 @@ -255,9 +221,7 @@ protected 1 - Resizable - 1 @@ -328,7 +292,10 @@ 1 1 1 + + + @@ -349,7 +316,6 @@ 0 wxID_ANY Size X - 0 @@ -364,19 +330,13 @@ protected 1 - Resizable - 1 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -415,7 +375,10 @@ 1 1 1 + + + @@ -435,7 +398,6 @@ 0 0 wxID_ANY - 0 @@ -451,9 +413,7 @@ protected 1 - Resizable - 1 @@ -506,7 +466,10 @@ 1 1 1 + + + @@ -527,7 +490,6 @@ 0 wxID_ANY Size Y - 0 @@ -542,19 +504,13 @@ protected 1 - Resizable - 1 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -593,7 +549,10 @@ 1 1 1 + + + @@ -613,7 +572,6 @@ 0 0 wxID_ANY - 0 @@ -629,9 +587,7 @@ protected 1 - Resizable - 1 @@ -684,7 +640,10 @@ 1 1 1 + + + @@ -705,7 +664,6 @@ 0 wxID_ANY Width - 0 @@ -720,19 +678,13 @@ protected 1 - Resizable - 1 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -771,7 +723,10 @@ 1 1 1 + + + @@ -791,7 +746,6 @@ 0 0 wxID_ANY - 0 @@ -807,9 +761,7 @@ protected 1 - Resizable - 1 @@ -862,7 +814,10 @@ 1 1 1 + + + @@ -883,7 +838,6 @@ 0 wxID_ANY Text position X - 0 @@ -898,19 +852,13 @@ protected 1 - Resizable - 1 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -949,7 +897,10 @@ 1 1 1 + + + @@ -969,7 +920,6 @@ 0 0 wxID_ANY - 0 @@ -985,9 +935,7 @@ protected 1 - Resizable - 1 @@ -1040,7 +988,10 @@ 1 1 1 + + + @@ -1061,7 +1012,6 @@ 0 wxID_ANY Text position Y - 0 @@ -1076,19 +1026,13 @@ protected 1 - Resizable - 1 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -1127,7 +1071,10 @@ 1 1 1 + + + @@ -1147,7 +1094,6 @@ 0 0 wxID_ANY - 0 @@ -1163,9 +1109,7 @@ protected 1 - Resizable - 1 @@ -1229,7 +1173,10 @@ 1 1 1 + + + @@ -1251,7 +1198,6 @@ 0 wxID_ANY Display - 1 0 @@ -1267,9 +1213,7 @@ protected 1 - Resizable - 0 1 @@ -1319,7 +1263,10 @@ 1 1 1 + + + @@ -1340,7 +1287,6 @@ 0 wxID_ANY Layer: - 0 @@ -1355,19 +1301,13 @@ protected 1 - Resizable - 1 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -1406,7 +1346,10 @@ 1 1 1 + + + @@ -1427,7 +1370,6 @@ 0 0 wxID_ANY - 0 @@ -1442,9 +1384,8 @@ protected 1 - Resizable - + -1 1 @@ -1500,7 +1441,10 @@ 1 1 1 + + + @@ -1520,7 +1464,6 @@ 0 0 wxID_ANY - 0 @@ -1535,19 +1478,13 @@ protected 1 - Resizable - 1 wxLI_HORIZONTAL 0 - - wxFILTER_NONE - wxDefaultValidator - diff --git a/pcbnew/dialogs/dialog_dimension_editor_base.h b/pcbnew/dialogs/dialog_dimension_editor_base.h index beab63c95e..97bdda52c6 100644 --- a/pcbnew/dialogs/dialog_dimension_editor_base.h +++ b/pcbnew/dialogs/dialog_dimension_editor_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 30 2011) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -11,6 +11,7 @@ #include #include #include +#include "dialog_shim.h" #include #include #include @@ -31,7 +32,7 @@ /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_DIMENSION_EDITOR_BASE /////////////////////////////////////////////////////////////////////////////// -class DIALOG_DIMENSION_EDITOR_BASE : public wxDialog +class DIALOG_DIMENSION_EDITOR_BASE : public DIALOG_SHIM { private: diff --git a/pcbnew/dialogs/dialog_display_options_base.cpp b/pcbnew/dialogs/dialog_display_options_base.cpp index f3221e7413..929e85d6df 100644 --- a/pcbnew/dialogs/dialog_display_options_base.cpp +++ b/pcbnew/dialogs/dialog_display_options_base.cpp @@ -1,156 +1,164 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Sep 6 2011) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include "dialog_display_options_base.h" - -/////////////////////////////////////////////////////////////////////////// - -DIALOG_DISPLAY_OPTIONS_BASE::DIALOG_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) -{ - this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - - wxBoxSizer* bMainSizer; - bMainSizer = new wxBoxSizer( wxHORIZONTAL ); - - wxStaticBoxSizer* sLeftBoxSizer; - sLeftBoxSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Tracks and vias:") ), wxVERTICAL ); - - wxString m_OptDisplayTracksChoices[] = { _("Sketch"), _("Filled") }; - int m_OptDisplayTracksNChoices = sizeof( m_OptDisplayTracksChoices ) / sizeof( wxString ); - m_OptDisplayTracks = new wxRadioBox( this, wxID_DISPLAY_TRACK, _("Tracks:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayTracksNChoices, m_OptDisplayTracksChoices, 1, wxRA_SPECIFY_COLS ); - m_OptDisplayTracks->SetSelection( 1 ); - m_OptDisplayTracks->SetToolTip( _("Select how tracks are displayed") ); - - sLeftBoxSizer->Add( m_OptDisplayTracks, 0, wxALL|wxEXPAND, 5 ); - - wxString m_OptDisplayViasChoices[] = { _("Sketch"), _("Filled") }; - int m_OptDisplayViasNChoices = sizeof( m_OptDisplayViasChoices ) / sizeof( wxString ); - m_OptDisplayVias = new wxRadioBox( this, ID_VIAS_SHAPES, _("Via Shapes:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayViasNChoices, m_OptDisplayViasChoices, 1, wxRA_SPECIFY_COLS ); - m_OptDisplayVias->SetSelection( 1 ); - sLeftBoxSizer->Add( m_OptDisplayVias, 0, wxALL|wxEXPAND, 5 ); - - wxString m_OptDisplayViaHoleChoices[] = { _("Never"), _("Defined holes"), _("Always") }; - int m_OptDisplayViaHoleNChoices = sizeof( m_OptDisplayViaHoleChoices ) / sizeof( wxString ); - m_OptDisplayViaHole = new wxRadioBox( this, ID_VIAS_HOLES, _("Show Via Holes:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayViaHoleNChoices, m_OptDisplayViaHoleChoices, 1, wxRA_SPECIFY_COLS ); - m_OptDisplayViaHole->SetSelection( 1 ); - m_OptDisplayViaHole->SetToolTip( _("Show (or not) via holes.\nIf Defined Holes is selected, only the non default size holes are shown") ); - - sLeftBoxSizer->Add( m_OptDisplayViaHole, 0, wxALL|wxEXPAND, 5 ); - - bMainSizer->Add( sLeftBoxSizer, 0, wxEXPAND|wxALL, 5 ); - - wxStaticBoxSizer* sbMiddleLeftSizer; - sbMiddleLeftSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Routing help:") ), wxVERTICAL ); - - wxString m_ShowNetNamesOptionChoices[] = { _("Do not show"), _("On pads"), _("On tracks"), _("On pads and tracks") }; - int m_ShowNetNamesOptionNChoices = sizeof( m_ShowNetNamesOptionChoices ) / sizeof( wxString ); - m_ShowNetNamesOption = new wxRadioBox( this, wxID_ANY, _("Show Net Names:"), wxDefaultPosition, wxDefaultSize, m_ShowNetNamesOptionNChoices, m_ShowNetNamesOptionChoices, 1, wxRA_SPECIFY_COLS ); - m_ShowNetNamesOption->SetSelection( 3 ); - m_ShowNetNamesOption->SetToolTip( _("Show or not net names on pads and/or tracks") ); - - sbMiddleLeftSizer->Add( m_ShowNetNamesOption, 0, wxALL, 5 ); - - wxString m_OptDisplayTracksClearanceChoices[] = { _("Never"), _("New track"), _("New track with via area"), _("New and edited tracks with via area"), _("Always") }; - int m_OptDisplayTracksClearanceNChoices = sizeof( m_OptDisplayTracksClearanceChoices ) / sizeof( wxString ); - m_OptDisplayTracksClearance = new wxRadioBox( this, ID_SHOW_CLEARANCE, _("Show Tracks Clearance:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayTracksClearanceNChoices, m_OptDisplayTracksClearanceChoices, 1, wxRA_SPECIFY_COLS ); - m_OptDisplayTracksClearance->SetSelection( 3 ); - m_OptDisplayTracksClearance->SetToolTip( _("Show( or not) tracks clearance area.\nIf New track is selected, track clearance area is shown only when creating the track.") ); - - sbMiddleLeftSizer->Add( m_OptDisplayTracksClearance, 0, wxALL|wxEXPAND, 5 ); - - bMainSizer->Add( sbMiddleLeftSizer, 0, wxALL|wxEXPAND, 5 ); - - wxStaticBoxSizer* sMiddleRightSizer; - sMiddleRightSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Footprints:") ), wxHORIZONTAL ); - - wxBoxSizer* bLModuleSizer; - bLModuleSizer = new wxBoxSizer( wxVERTICAL ); - - wxString m_OptDisplayModEdgesChoices[] = { _("Line"), _("Filled"), _("Sketch") }; - int m_OptDisplayModEdgesNChoices = sizeof( m_OptDisplayModEdgesChoices ) / sizeof( wxString ); - m_OptDisplayModEdges = new wxRadioBox( this, ID_EDGES_MODULES, _("Module Edges:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayModEdgesNChoices, m_OptDisplayModEdgesChoices, 1, wxRA_SPECIFY_COLS ); - m_OptDisplayModEdges->SetSelection( 1 ); - bLModuleSizer->Add( m_OptDisplayModEdges, 0, wxALL|wxEXPAND, 5 ); - - wxString m_OptDisplayModTextsChoices[] = { _("Line"), _("Filled"), _("Sketch") }; - int m_OptDisplayModTextsNChoices = sizeof( m_OptDisplayModTextsChoices ) / sizeof( wxString ); - m_OptDisplayModTexts = new wxRadioBox( this, ID_TEXT_MODULES, _("Texts:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayModTextsNChoices, m_OptDisplayModTextsChoices, 1, wxRA_SPECIFY_COLS ); - m_OptDisplayModTexts->SetSelection( 1 ); - bLModuleSizer->Add( m_OptDisplayModTexts, 0, wxALL|wxEXPAND, 5 ); - - sMiddleRightSizer->Add( bLModuleSizer, 0, 0, 5 ); - - wxStaticBoxSizer* bRModuleSizer; - bRModuleSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Pad Options:") ), wxVERTICAL ); - - wxString m_OptDisplayPadsChoices[] = { _("Sketch"), _("Filled") }; - int m_OptDisplayPadsNChoices = sizeof( m_OptDisplayPadsChoices ) / sizeof( wxString ); - m_OptDisplayPads = new wxRadioBox( this, ID_PADS_SHAPES, _("Pad Shapes:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayPadsNChoices, m_OptDisplayPadsChoices, 1, wxRA_SPECIFY_COLS ); - m_OptDisplayPads->SetSelection( 1 ); - bRModuleSizer->Add( m_OptDisplayPads, 0, wxALL|wxEXPAND, 5 ); - - m_OptDisplayPadClearence = new wxCheckBox( this, wxID_ANY, _("Show pad clearance"), wxDefaultPosition, wxDefaultSize, 0 ); - bRModuleSizer->Add( m_OptDisplayPadClearence, 0, wxALL, 5 ); - - m_OptDisplayPadNumber = new wxCheckBox( this, wxID_ANY, _("Show pad number"), wxDefaultPosition, wxDefaultSize, 0 ); - m_OptDisplayPadNumber->SetValue(true); - bRModuleSizer->Add( m_OptDisplayPadNumber, 0, wxALL, 5 ); - - m_OptDisplayPadNoConn = new wxCheckBox( this, wxID_ANY, _("Show pad NoConnect"), wxDefaultPosition, wxDefaultSize, 0 ); - m_OptDisplayPadNoConn->SetValue(true); - bRModuleSizer->Add( m_OptDisplayPadNoConn, 0, wxALL, 5 ); - - sMiddleRightSizer->Add( bRModuleSizer, 0, 0, 5 ); - - bMainSizer->Add( sMiddleRightSizer, 0, wxEXPAND|wxALL, 5 ); - - wxBoxSizer* bRightSizer; - bRightSizer = new wxBoxSizer( wxVERTICAL ); - - wxStaticBoxSizer* sRightUpperSizer; - sRightUpperSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Others:") ), wxVERTICAL ); - - wxString m_OptDisplayDrawingsChoices[] = { _("Line"), _("Filled"), _("Sketch") }; - int m_OptDisplayDrawingsNChoices = sizeof( m_OptDisplayDrawingsChoices ) / sizeof( wxString ); - m_OptDisplayDrawings = new wxRadioBox( this, wxID_ANY, _("Display other items:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayDrawingsNChoices, m_OptDisplayDrawingsChoices, 1, wxRA_SPECIFY_COLS ); - m_OptDisplayDrawings->SetSelection( 1 ); - sRightUpperSizer->Add( m_OptDisplayDrawings, 0, wxALL|wxEXPAND, 5 ); - - wxString m_Show_Page_LimitsChoices[] = { _("Yes"), _("No") }; - int m_Show_Page_LimitsNChoices = sizeof( m_Show_Page_LimitsChoices ) / sizeof( wxString ); - m_Show_Page_Limits = new wxRadioBox( this, wxID_ANY, _("Show page limits"), wxDefaultPosition, wxDefaultSize, m_Show_Page_LimitsNChoices, m_Show_Page_LimitsChoices, 1, wxRA_SPECIFY_COLS ); - m_Show_Page_Limits->SetSelection( 0 ); - sRightUpperSizer->Add( m_Show_Page_Limits, 0, wxALL|wxEXPAND, 5 ); - - bRightSizer->Add( sRightUpperSizer, 1, wxEXPAND, 5 ); - - - bRightSizer->Add( 10, 10, 0, 0, 5 ); - - m_buttonOK = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 ); - bRightSizer->Add( m_buttonOK, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); - - m_buttonCANCEL = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - bRightSizer->Add( m_buttonCANCEL, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); - - bMainSizer->Add( bRightSizer, 0, wxEXPAND|wxALL, 5 ); - - this->SetSizer( bMainSizer ); - this->Layout(); - - // Connect Events - m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DISPLAY_OPTIONS_BASE::OnOkClick ), NULL, this ); - m_buttonCANCEL->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DISPLAY_OPTIONS_BASE::OnCancelClick ), NULL, this ); -} - -DIALOG_DISPLAY_OPTIONS_BASE::~DIALOG_DISPLAY_OPTIONS_BASE() -{ - // Disconnect Events - m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DISPLAY_OPTIONS_BASE::OnOkClick ), NULL, this ); - m_buttonCANCEL->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DISPLAY_OPTIONS_BASE::OnCancelClick ), NULL, this ); - -} +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Apr 10 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include "dialog_display_options_base.h" + +/////////////////////////////////////////////////////////////////////////// + +DIALOG_DISPLAY_OPTIONS_BASE::DIALOG_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* bMainSizer; + bMainSizer = new wxBoxSizer( wxHORIZONTAL ); + + wxStaticBoxSizer* sLeftBoxSizer; + sLeftBoxSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Tracks and vias:") ), wxVERTICAL ); + + wxString m_OptDisplayTracksChoices[] = { _("Sketch"), _("Filled") }; + int m_OptDisplayTracksNChoices = sizeof( m_OptDisplayTracksChoices ) / sizeof( wxString ); + m_OptDisplayTracks = new wxRadioBox( this, wxID_DISPLAY_TRACK, _("Tracks:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayTracksNChoices, m_OptDisplayTracksChoices, 1, wxRA_SPECIFY_COLS ); + m_OptDisplayTracks->SetSelection( 1 ); + m_OptDisplayTracks->SetToolTip( _("Select how tracks are displayed") ); + + sLeftBoxSizer->Add( m_OptDisplayTracks, 0, wxALL|wxEXPAND, 5 ); + + wxString m_OptDisplayViasChoices[] = { _("Sketch"), _("Filled") }; + int m_OptDisplayViasNChoices = sizeof( m_OptDisplayViasChoices ) / sizeof( wxString ); + m_OptDisplayVias = new wxRadioBox( this, ID_VIAS_SHAPES, _("Via Shapes:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayViasNChoices, m_OptDisplayViasChoices, 1, wxRA_SPECIFY_COLS ); + m_OptDisplayVias->SetSelection( 1 ); + sLeftBoxSizer->Add( m_OptDisplayVias, 0, wxALL|wxEXPAND, 5 ); + + wxString m_OptDisplayViaHoleChoices[] = { _("Never"), _("Defined holes"), _("Always") }; + int m_OptDisplayViaHoleNChoices = sizeof( m_OptDisplayViaHoleChoices ) / sizeof( wxString ); + m_OptDisplayViaHole = new wxRadioBox( this, ID_VIAS_HOLES, _("Show Via Holes:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayViaHoleNChoices, m_OptDisplayViaHoleChoices, 1, wxRA_SPECIFY_COLS ); + m_OptDisplayViaHole->SetSelection( 1 ); + m_OptDisplayViaHole->SetToolTip( _("Show (or not) via holes.\nIf Defined Holes is selected, only the non default size holes are shown") ); + + sLeftBoxSizer->Add( m_OptDisplayViaHole, 0, wxALL|wxEXPAND, 5 ); + + + bMainSizer->Add( sLeftBoxSizer, 0, wxEXPAND|wxALL, 5 ); + + wxStaticBoxSizer* sbMiddleLeftSizer; + sbMiddleLeftSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Routing help:") ), wxVERTICAL ); + + wxString m_ShowNetNamesOptionChoices[] = { _("Do not show"), _("On pads"), _("On tracks"), _("On pads and tracks") }; + int m_ShowNetNamesOptionNChoices = sizeof( m_ShowNetNamesOptionChoices ) / sizeof( wxString ); + m_ShowNetNamesOption = new wxRadioBox( this, wxID_ANY, _("Show Net Names:"), wxDefaultPosition, wxDefaultSize, m_ShowNetNamesOptionNChoices, m_ShowNetNamesOptionChoices, 1, wxRA_SPECIFY_COLS ); + m_ShowNetNamesOption->SetSelection( 3 ); + m_ShowNetNamesOption->SetToolTip( _("Show or not net names on pads and/or tracks") ); + + sbMiddleLeftSizer->Add( m_ShowNetNamesOption, 0, wxALL, 5 ); + + wxString m_OptDisplayTracksClearanceChoices[] = { _("Never"), _("New track"), _("New track with via area"), _("New and edited tracks with via area"), _("Always") }; + int m_OptDisplayTracksClearanceNChoices = sizeof( m_OptDisplayTracksClearanceChoices ) / sizeof( wxString ); + m_OptDisplayTracksClearance = new wxRadioBox( this, ID_SHOW_CLEARANCE, _("Show Tracks Clearance:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayTracksClearanceNChoices, m_OptDisplayTracksClearanceChoices, 1, wxRA_SPECIFY_COLS ); + m_OptDisplayTracksClearance->SetSelection( 3 ); + m_OptDisplayTracksClearance->SetToolTip( _("Show( or not) tracks clearance area.\nIf New track is selected, track clearance area is shown only when creating the track.") ); + + sbMiddleLeftSizer->Add( m_OptDisplayTracksClearance, 0, wxALL|wxEXPAND, 5 ); + + + bMainSizer->Add( sbMiddleLeftSizer, 0, wxALL|wxEXPAND, 5 ); + + wxStaticBoxSizer* sMiddleRightSizer; + sMiddleRightSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Footprints:") ), wxHORIZONTAL ); + + wxBoxSizer* bLModuleSizer; + bLModuleSizer = new wxBoxSizer( wxVERTICAL ); + + wxString m_OptDisplayModEdgesChoices[] = { _("Line"), _("Filled"), _("Sketch") }; + int m_OptDisplayModEdgesNChoices = sizeof( m_OptDisplayModEdgesChoices ) / sizeof( wxString ); + m_OptDisplayModEdges = new wxRadioBox( this, ID_EDGES_MODULES, _("Module Edges:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayModEdgesNChoices, m_OptDisplayModEdgesChoices, 1, wxRA_SPECIFY_COLS ); + m_OptDisplayModEdges->SetSelection( 1 ); + bLModuleSizer->Add( m_OptDisplayModEdges, 0, wxALL|wxEXPAND, 5 ); + + wxString m_OptDisplayModTextsChoices[] = { _("Line"), _("Filled"), _("Sketch") }; + int m_OptDisplayModTextsNChoices = sizeof( m_OptDisplayModTextsChoices ) / sizeof( wxString ); + m_OptDisplayModTexts = new wxRadioBox( this, ID_TEXT_MODULES, _("Texts:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayModTextsNChoices, m_OptDisplayModTextsChoices, 1, wxRA_SPECIFY_COLS ); + m_OptDisplayModTexts->SetSelection( 1 ); + bLModuleSizer->Add( m_OptDisplayModTexts, 0, wxALL|wxEXPAND, 5 ); + + + sMiddleRightSizer->Add( bLModuleSizer, 0, 0, 5 ); + + wxStaticBoxSizer* bRModuleSizer; + bRModuleSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Pad Options:") ), wxVERTICAL ); + + wxString m_OptDisplayPadsChoices[] = { _("Sketch"), _("Filled") }; + int m_OptDisplayPadsNChoices = sizeof( m_OptDisplayPadsChoices ) / sizeof( wxString ); + m_OptDisplayPads = new wxRadioBox( this, ID_PADS_SHAPES, _("Pad Shapes:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayPadsNChoices, m_OptDisplayPadsChoices, 1, wxRA_SPECIFY_COLS ); + m_OptDisplayPads->SetSelection( 1 ); + bRModuleSizer->Add( m_OptDisplayPads, 0, wxALL|wxEXPAND, 5 ); + + m_OptDisplayPadClearence = new wxCheckBox( this, wxID_ANY, _("Show pad clearance"), wxDefaultPosition, wxDefaultSize, 0 ); + bRModuleSizer->Add( m_OptDisplayPadClearence, 0, wxALL, 5 ); + + m_OptDisplayPadNumber = new wxCheckBox( this, wxID_ANY, _("Show pad number"), wxDefaultPosition, wxDefaultSize, 0 ); + m_OptDisplayPadNumber->SetValue(true); + bRModuleSizer->Add( m_OptDisplayPadNumber, 0, wxALL, 5 ); + + m_OptDisplayPadNoConn = new wxCheckBox( this, wxID_ANY, _("Show pad NoConnect"), wxDefaultPosition, wxDefaultSize, 0 ); + m_OptDisplayPadNoConn->SetValue(true); + bRModuleSizer->Add( m_OptDisplayPadNoConn, 0, wxALL, 5 ); + + + sMiddleRightSizer->Add( bRModuleSizer, 0, 0, 5 ); + + + bMainSizer->Add( sMiddleRightSizer, 0, wxEXPAND|wxALL, 5 ); + + wxBoxSizer* bRightSizer; + bRightSizer = new wxBoxSizer( wxVERTICAL ); + + wxStaticBoxSizer* sRightUpperSizer; + sRightUpperSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Others:") ), wxVERTICAL ); + + wxString m_OptDisplayDrawingsChoices[] = { _("Line"), _("Filled"), _("Sketch") }; + int m_OptDisplayDrawingsNChoices = sizeof( m_OptDisplayDrawingsChoices ) / sizeof( wxString ); + m_OptDisplayDrawings = new wxRadioBox( this, wxID_ANY, _("Display other items:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayDrawingsNChoices, m_OptDisplayDrawingsChoices, 1, wxRA_SPECIFY_COLS ); + m_OptDisplayDrawings->SetSelection( 1 ); + sRightUpperSizer->Add( m_OptDisplayDrawings, 0, wxALL|wxEXPAND, 5 ); + + wxString m_Show_Page_LimitsChoices[] = { _("Yes"), _("No") }; + int m_Show_Page_LimitsNChoices = sizeof( m_Show_Page_LimitsChoices ) / sizeof( wxString ); + m_Show_Page_Limits = new wxRadioBox( this, wxID_ANY, _("Show page limits"), wxDefaultPosition, wxDefaultSize, m_Show_Page_LimitsNChoices, m_Show_Page_LimitsChoices, 1, wxRA_SPECIFY_COLS ); + m_Show_Page_Limits->SetSelection( 0 ); + sRightUpperSizer->Add( m_Show_Page_Limits, 0, wxALL|wxEXPAND, 5 ); + + + bRightSizer->Add( sRightUpperSizer, 1, wxEXPAND, 5 ); + + + bRightSizer->Add( 10, 10, 0, 0, 5 ); + + m_buttonOK = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 ); + bRightSizer->Add( m_buttonOK, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + + m_buttonCANCEL = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); + bRightSizer->Add( m_buttonCANCEL, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + + + bMainSizer->Add( bRightSizer, 0, wxEXPAND|wxALL, 5 ); + + + this->SetSizer( bMainSizer ); + this->Layout(); + + // Connect Events + m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DISPLAY_OPTIONS_BASE::OnOkClick ), NULL, this ); + m_buttonCANCEL->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DISPLAY_OPTIONS_BASE::OnCancelClick ), NULL, this ); +} + +DIALOG_DISPLAY_OPTIONS_BASE::~DIALOG_DISPLAY_OPTIONS_BASE() +{ + // Disconnect Events + m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DISPLAY_OPTIONS_BASE::OnOkClick ), NULL, this ); + m_buttonCANCEL->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DISPLAY_OPTIONS_BASE::OnCancelClick ), NULL, this ); + +} diff --git a/pcbnew/dialogs/dialog_display_options_base.fbp b/pcbnew/dialogs/dialog_display_options_base.fbp index b0b2cb40bb..c10fe0f4ea 100644 --- a/pcbnew/dialogs/dialog_display_options_base.fbp +++ b/pcbnew/dialogs/dialog_display_options_base.fbp @@ -2,11 +2,13 @@ - + C++ 1 source_name + 0 0 + res UTF-8 connect dialog_display_options_base @@ -14,73 +16,78 @@ none 1 DialogDisplayOptions_base - + . - + 1 + 1 1 1 0 - - - + 0 + wxAUI_MGR_DEFAULT + + + 1 1 impl_virtual - - - + + + 0 wxID_ANY - - + + DIALOG_DISPLAY_OPTIONS_BASE - + 731,291 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + DIALOG_SHIM; dialog_shim.h Display options - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bMainSizer wxHORIZONTAL none @@ -91,68 +98,99 @@ wxID_ANY Tracks and vias: - + sLeftBoxSizer wxVERTICAL none - + 5 wxALL|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "Sketch" "Filled" - + 1 + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_DISPLAY_TRACK Tracks: 1 - - + + 0 + + + 0 + + 1 m_OptDisplayTracks + 1 + + protected - + 1 + + Resizable 1 - + 1 + wxRA_SPECIFY_COLS - + + 0 Select how tracks are displayed - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -160,58 +198,89 @@ wxALL|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "Sketch" "Filled" - + 1 + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_VIAS_SHAPES Via Shapes: 1 - - + + 0 + + + 0 + + 1 m_OptDisplayVias + 1 + + protected - + 1 + + Resizable 1 - + 1 + wxRA_SPECIFY_COLS - - - + + 0 + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -219,58 +288,89 @@ wxALL|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "Never" "Defined holes" "Always" - + 1 + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_VIAS_HOLES Show Via Holes: 1 - - + + 0 + + + 0 + + 1 m_OptDisplayViaHole + 1 + + protected - + 1 + + Resizable 1 - + 1 + wxRA_SPECIFY_COLS - + + 0 Show (or not) via holes. If Defined Holes is selected, only the non default size holes are shown - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -282,68 +382,99 @@ wxID_ANY Routing help: - + sbMiddleLeftSizer wxVERTICAL none - + 5 wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "Do not show" "On pads" "On tracks" "On pads and tracks" - + 1 + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Show Net Names: 1 - - + + 0 + + + 0 + + 1 m_ShowNetNamesOption + 1 + + protected - + 1 + + Resizable 3 - + 1 + wxRA_SPECIFY_COLS - + + 0 Show or not net names on pads and/or tracks - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -351,58 +482,89 @@ wxALL|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "Never" "New track" "New track with via area" "New and edited tracks with via area" "Always" - + 1 + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_SHOW_CLEARANCE Show Tracks Clearance: 1 - - + + 0 + + + 0 + + 1 m_OptDisplayTracksClearance + 1 + + protected - + 1 + + Resizable 3 - + 1 + wxRA_SPECIFY_COLS - + + 0 Show( or not) tracks clearance area. If New track is selected, track clearance area is shown only when creating the track. - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -414,17 +576,17 @@ wxID_ANY Footprints: - + sMiddleRightSizer wxHORIZONTAL none - + 5 - + 0 - + bLModuleSizer wxVERTICAL none @@ -433,58 +595,89 @@ wxALL|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "Line" "Filled" "Sketch" - + 1 + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_EDGES_MODULES Module Edges: 1 - - + + 0 + + + 0 + + 1 m_OptDisplayModEdges + 1 + + protected - + 1 + + Resizable 1 - + 1 + wxRA_SPECIFY_COLS - - - + + 0 + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -492,131 +685,193 @@ wxALL|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "Line" "Filled" "Sketch" - + 1 + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_TEXT_MODULES Texts: 1 - - + + 0 + + + 0 + + 1 m_OptDisplayModTexts + 1 + + protected - + 1 + + Resizable 1 - + 1 + wxRA_SPECIFY_COLS - - - + + 0 + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 - + 0 wxID_ANY Pad Options: - + bRModuleSizer wxVERTICAL none - + 5 wxALL|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "Sketch" "Filled" - + 1 + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_PADS_SHAPES Pad Shapes: 1 - - + + 0 + + + 0 + + 1 m_OptDisplayPads + 1 + + protected - + 1 + + Resizable 1 - + 1 + wxRA_SPECIFY_COLS - - - + + 0 + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -624,56 +879,87 @@ wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Show pad clearance - - + + 0 + + + 0 + + 1 m_OptDisplayPadClearence + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + + 0 + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -681,56 +967,87 @@ wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 1 - + 1 + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Show pad number - - + + 0 + + + 0 + + 1 m_OptDisplayPadNumber + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + + 0 + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -738,56 +1055,87 @@ wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 1 - + 1 + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Show pad NoConnect - - + + 0 + + + 0 + + 1 m_OptDisplayPadNoConn + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + + 0 + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -799,7 +1147,7 @@ wxEXPAND|wxALL 0 - + bRightSizer wxVERTICAL none @@ -810,68 +1158,99 @@ wxID_ANY Others: - + sRightUpperSizer wxVERTICAL none - + 5 wxALL|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "Line" "Filled" "Sketch" - + 1 + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Display other items: 1 - - + + 0 + + + 0 + + 1 m_OptDisplayDrawings + 1 + + protected - + 1 + + Resizable 1 - + 1 + wxRA_SPECIFY_COLS - - - + + 0 + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -879,65 +1258,96 @@ wxALL|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "Yes" "No" - + 1 + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Show page limits 1 - - + + 0 + + + 0 + + 1 m_Show_Page_Limits + 1 + + protected - + 1 + + Resizable 0 - + 1 + wxRA_SPECIFY_COLS - - - + + 0 + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 - + 0 10 @@ -950,56 +1360,87 @@ wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_OK OK - - + + 0 + + + 0 + + 1 m_buttonOK + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + + 0 + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnOkClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1007,56 +1448,87 @@ wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_CANCEL Cancel - - + + 0 + + + 0 + + 1 m_buttonCANCEL + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + + 0 + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnCancelClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcbnew/dialogs/dialog_display_options_base.h b/pcbnew/dialogs/dialog_display_options_base.h index c15398972d..0d91749243 100644 --- a/pcbnew/dialogs/dialog_display_options_base.h +++ b/pcbnew/dialogs/dialog_display_options_base.h @@ -1,75 +1,76 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Sep 6 2011) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __dialog_display_options_base__ -#define __dialog_display_options_base__ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -/////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_DISPLAY_OPTIONS_BASE -/////////////////////////////////////////////////////////////////////////////// -class DIALOG_DISPLAY_OPTIONS_BASE : public wxDialog -{ - private: - - protected: - enum - { - wxID_DISPLAY_TRACK = 1000, - ID_VIAS_SHAPES, - ID_VIAS_HOLES, - ID_SHOW_CLEARANCE, - ID_EDGES_MODULES, - ID_TEXT_MODULES, - ID_PADS_SHAPES, - }; - - wxRadioBox* m_OptDisplayTracks; - wxRadioBox* m_OptDisplayVias; - wxRadioBox* m_OptDisplayViaHole; - wxRadioBox* m_ShowNetNamesOption; - wxRadioBox* m_OptDisplayTracksClearance; - wxRadioBox* m_OptDisplayModEdges; - wxRadioBox* m_OptDisplayModTexts; - wxRadioBox* m_OptDisplayPads; - wxCheckBox* m_OptDisplayPadClearence; - wxCheckBox* m_OptDisplayPadNumber; - wxCheckBox* m_OptDisplayPadNoConn; - wxRadioBox* m_OptDisplayDrawings; - wxRadioBox* m_Show_Page_Limits; - - wxButton* m_buttonOK; - wxButton* m_buttonCANCEL; - - // Virtual event handlers, overide them in your derived class - virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } - - - public: - - DIALOG_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Display options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 731,291 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DIALOG_DISPLAY_OPTIONS_BASE(); - -}; - -#endif //__dialog_display_options_base__ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Apr 10 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#ifndef __DIALOG_DISPLAY_OPTIONS_BASE_H__ +#define __DIALOG_DISPLAY_OPTIONS_BASE_H__ + +#include +#include +#include +#include "dialog_shim.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +/// Class DIALOG_DISPLAY_OPTIONS_BASE +/////////////////////////////////////////////////////////////////////////////// +class DIALOG_DISPLAY_OPTIONS_BASE : public DIALOG_SHIM +{ + private: + + protected: + enum + { + wxID_DISPLAY_TRACK = 1000, + ID_VIAS_SHAPES, + ID_VIAS_HOLES, + ID_SHOW_CLEARANCE, + ID_EDGES_MODULES, + ID_TEXT_MODULES, + ID_PADS_SHAPES + }; + + wxRadioBox* m_OptDisplayTracks; + wxRadioBox* m_OptDisplayVias; + wxRadioBox* m_OptDisplayViaHole; + wxRadioBox* m_ShowNetNamesOption; + wxRadioBox* m_OptDisplayTracksClearance; + wxRadioBox* m_OptDisplayModEdges; + wxRadioBox* m_OptDisplayModTexts; + wxRadioBox* m_OptDisplayPads; + wxCheckBox* m_OptDisplayPadClearence; + wxCheckBox* m_OptDisplayPadNumber; + wxCheckBox* m_OptDisplayPadNoConn; + wxRadioBox* m_OptDisplayDrawings; + wxRadioBox* m_Show_Page_Limits; + wxButton* m_buttonOK; + wxButton* m_buttonCANCEL; + + // Virtual event handlers, overide them in your derived class + virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } + + + public: + + DIALOG_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Display options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 731,291 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_DISPLAY_OPTIONS_BASE(); + +}; + +#endif //__DIALOG_DISPLAY_OPTIONS_BASE_H__ diff --git a/pcbnew/dialogs/dialog_drc.cpp b/pcbnew/dialogs/dialog_drc.cpp index 69566433a2..c874e6b549 100644 --- a/pcbnew/dialogs/dialog_drc.cpp +++ b/pcbnew/dialogs/dialog_drc.cpp @@ -34,11 +34,6 @@ #include -// dialog should remember its previous screen position and size -wxPoint DIALOG_DRC_CONTROL::s_LastPos( -1, -1 ); -wxSize DIALOG_DRC_CONTROL::s_LastSize; - - /* class DIALOG_DRC_CONTROL: a dialog to set DRC parameters (clearance, min cooper size) * and run DRC tests */ @@ -62,30 +57,7 @@ DIALOG_DRC_CONTROL::DIALOG_DRC_CONTROL( DRC* aTester, PCB_EDIT_FRAME* parent ) : bool DIALOG_DRC_CONTROL::Show( bool show ) { - bool ret; - - if( show ) - { - ret = DIALOG_DRC_CONTROL_BASE::Show( show ); - - if( s_LastPos.x != -1 ) - { - SetSize( s_LastPos.x, s_LastPos.y, s_LastSize.x, s_LastSize.y, 0 ); - } - else - { - // Do nothing: last position not yet saved. - } - } - else - { - // Save the dialog's position before hiding - s_LastPos = GetPosition(); - s_LastSize = GetSize(); - ret = DIALOG_DRC_CONTROL_BASE::Show( show ); - } - - return ret; + return DIALOG_DRC_CONTROL_BASE::Show( show ); } diff --git a/pcbnew/dialogs/dialog_drc.h b/pcbnew/dialogs/dialog_drc.h index b96c3a936b..4aa1436854 100644 --- a/pcbnew/dialogs/dialog_drc.h +++ b/pcbnew/dialogs/dialog_drc.h @@ -69,11 +69,6 @@ public: private: - - static wxSize s_LastSize; ///< last position and size - static wxPoint s_LastPos; - - /** * Function writeReport * outputs the MARKER items and unconnecte DRC_ITEMs with commentary to an diff --git a/pcbnew/dialogs/dialog_drc_base.cpp b/pcbnew/dialogs/dialog_drc_base.cpp index 62092b5ab3..8dc6aa9e7d 100644 --- a/pcbnew/dialogs/dialog_drc_base.cpp +++ b/pcbnew/dialogs/dialog_drc_base.cpp @@ -9,7 +9,7 @@ /////////////////////////////////////////////////////////////////////////// -DIALOG_DRC_CONTROL_BASE::DIALOG_DRC_CONTROL_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +DIALOG_DRC_CONTROL_BASE::DIALOG_DRC_CONTROL_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); diff --git a/pcbnew/dialogs/dialog_drc_base.fbp b/pcbnew/dialogs/dialog_drc_base.fbp index 49a3ae26b7..cc8edd7db6 100644 --- a/pcbnew/dialogs/dialog_drc_base.fbp +++ b/pcbnew/dialogs/dialog_drc_base.fbp @@ -44,7 +44,7 @@ -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + DIALOG_SHIM; dialog_shim.h DRC Control diff --git a/pcbnew/dialogs/dialog_drc_base.h b/pcbnew/dialogs/dialog_drc_base.h index 8a9c6aae93..ec010aa5ce 100644 --- a/pcbnew/dialogs/dialog_drc_base.h +++ b/pcbnew/dialogs/dialog_drc_base.h @@ -12,6 +12,7 @@ #include #include #include "dialog_drclistbox.h" +#include "dialog_shim.h" #include #include #include @@ -45,7 +46,7 @@ /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_DRC_CONTROL_BASE /////////////////////////////////////////////////////////////////////////////// -class DIALOG_DRC_CONTROL_BASE : public wxDialog +class DIALOG_DRC_CONTROL_BASE : public DIALOG_SHIM { private: diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp index 7c8c4790d9..2ba75442e2 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp @@ -9,7 +9,7 @@ /////////////////////////////////////////////////////////////////////////// -DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp index 8528a0780f..f3f87018e6 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp @@ -44,7 +44,7 @@ 544,599 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + DIALOG_SHIM; dialog_shim.h Module properties diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h index e2894069f2..bed5085f97 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h @@ -11,6 +11,7 @@ #include #include #include +#include "dialog_shim.h" #include #include #include @@ -46,7 +47,7 @@ /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_MODULE_BOARD_EDITOR_BASE /////////////////////////////////////////////////////////////////////////////// -class DIALOG_MODULE_BOARD_EDITOR_BASE : public wxDialog +class DIALOG_MODULE_BOARD_EDITOR_BASE : public DIALOG_SHIM { private: wxBoxSizer* m_GeneralBoxSizer; diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp index 059f872fcf..eb8544ba5c 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -9,7 +9,7 @@ /////////////////////////////////////////////////////////////////////////// -DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); @@ -30,6 +30,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_DocCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); sbSizerDoc->Add( m_DocCtrl, 1, 0, 5 ); + PropLeftSizer->Add( sbSizerDoc, 0, wxEXPAND, 5 ); wxStaticBoxSizer* sbSizerKeysW; @@ -38,6 +39,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_KeywordCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); sbSizerKeysW->Add( m_KeywordCtrl, 1, 0, 5 ); + PropLeftSizer->Add( sbSizerKeysW, 0, wxEXPAND, 5 ); @@ -52,6 +54,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_button4 = new wxButton( m_PanelProperties, wxID_ANY, _("Edit"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); sbSizerRef->Add( m_button4, 0, 0, 5 ); + PropLeftSizer->Add( sbSizerRef, 0, wxEXPAND, 5 ); wxStaticBoxSizer* sbSizerValue; @@ -63,6 +66,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_button5 = new wxButton( m_PanelProperties, wxID_ANY, _("Edit"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); sbSizerValue->Add( m_button5, 0, 0, 5 ); + PropLeftSizer->Add( sbSizerValue, 0, wxEXPAND, 5 ); @@ -77,8 +81,10 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa sbSizerFootprintName->Add( 0, 0, 0, 0, 5 ); + PropLeftSizer->Add( sbSizerFootprintName, 0, wxEXPAND, 5 ); + m_PanelPropertiesBoxSizer->Add( PropLeftSizer, 1, wxEXPAND, 5 ); m_PropRightSizer = new wxBoxSizer( wxVERTICAL ); @@ -108,6 +114,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_CostRot90Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxSize( -1,-1 ), wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS ); bSizerRot90->Add( m_CostRot90Ctrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + sbSizerAutoplace->Add( bSizerRot90, 1, 0, 5 ); wxBoxSizer* bSizerRot180; @@ -120,8 +127,10 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_CostRot180Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS ); bSizerRot180->Add( m_CostRot180Ctrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + sbSizerAutoplace->Add( bSizerRot180, 1, 0, 5 ); + m_PropRightSizer->Add( sbSizerAutoplace, 1, wxEXPAND|wxALL, 5 ); wxStaticBoxSizer* sbSizer8; @@ -197,12 +206,16 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_SolderPasteRatioMarginUnits->Wrap( -1 ); fgSizer1->Add( m_SolderPasteRatioMarginUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + sbSizer8->Add( fgSizer1, 1, wxEXPAND, 5 ); + m_PropRightSizer->Add( sbSizer8, 0, wxEXPAND|wxALL, 5 ); + m_PanelPropertiesBoxSizer->Add( m_PropRightSizer, 0, 0, 5 ); + m_PanelProperties->SetSizer( m_PanelPropertiesBoxSizer ); m_PanelProperties->Layout(); m_PanelPropertiesBoxSizer->Fit( m_PanelProperties ); @@ -223,6 +236,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_Sizer3DValues = new wxStaticBoxSizer( new wxStaticBox( m_Panel3D, wxID_ANY, _("3D Scale and Pos") ), wxVERTICAL ); + bLowerSizer3D->Add( m_Sizer3DValues, 1, wxEXPAND, 5 ); wxBoxSizer* bSizer3DButtons; @@ -234,10 +248,13 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_buttonRemove = new wxButton( m_Panel3D, ID_REMOVE_3D_SHAPE, _("Remove 3D Shape"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer3DButtons->Add( m_buttonRemove, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bLowerSizer3D->Add( bSizer3DButtons, 0, wxALIGN_CENTER_VERTICAL, 5 ); + bSizerMain3D->Add( bLowerSizer3D, 1, wxEXPAND, 5 ); + m_Panel3D->SetSizer( bSizerMain3D ); m_Panel3D->Layout(); bSizerMain3D->Fit( m_Panel3D ); @@ -251,8 +268,10 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_sdbSizerStdButtonsCancel = new wxButton( this, wxID_CANCEL ); m_sdbSizerStdButtons->AddButton( m_sdbSizerStdButtonsCancel ); m_sdbSizerStdButtons->Realize(); + m_GeneralBoxSizer->Add( m_sdbSizerStdButtons, 0, wxEXPAND|wxALIGN_RIGHT|wxALL, 5 ); + this->SetSizer( m_GeneralBoxSizer ); this->Layout(); @@ -276,4 +295,5 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::~DIALOG_MODULE_MODULE_EDITOR_BASE() m_buttonRemove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::Remove3DShape ), NULL, this ); m_sdbSizerStdButtonsCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::OnCancelClick ), NULL, this ); m_sdbSizerStdButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::OnOkClick ), NULL, this ); + } diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp index e089cd1a8e..94bc792399 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp @@ -1,10 +1,14 @@ - + - + C++ 1 + source_name + 0 + 0 + res UTF-8 connect dialog_edit_module_for_Modedit_base @@ -12,66 +16,78 @@ none 1 dialog_edit_module_for_Modedit_base - + . - + 1 + 1 + 1 0 0 - - - + 0 + wxAUI_MGR_DEFAULT + + + + 1 1 - - - + impl_virtual + + + 0 wxID_ANY - - + + DIALOG_MODULE_MODULE_EDITOR_BASE - + 541,540 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + DIALOG_SHIM; dialog_shim.h Module properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + m_GeneralBoxSizer wxVERTICAL private @@ -80,99 +96,163 @@ wxEXPAND | wxALL 1 - - - + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_NOTEBOOK - - + + 0 + + + 0 + + 1 m_NoteBook + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + Properties 1 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_PanelProperties + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxSUNKEN_BORDER|wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + m_PanelPropertiesBoxSizer wxHORIZONTAL none @@ -183,11 +263,11 @@ wxID_ANY Fields: - + PropLeftSizer wxVERTICAL none - + 5 wxEXPAND @@ -199,60 +279,96 @@ sbSizerDoc wxHORIZONTAL none - + 5 - + 1 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_DocCtrl + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -264,71 +380,107 @@ wxID_ANY Keywords - + sbSizerKeysW wxHORIZONTAL none - + 5 - + 1 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_KeywordCtrl + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 - + 0 20 @@ -343,116 +495,188 @@ wxID_ANY Reference - + sbSizerRef wxHORIZONTAL none - + 5 - + 1 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_ReferenceCtrl + 1 + + protected - - + 1 + + Resizable + 1 + wxTE_READONLY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 - + 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Edit - - + + 0 + + + 0 + + 1 m_button4 + 1 + + protected - - + 1 + + Resizable + 1 + wxBU_EXACTFIT - - - - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + OnEditReference - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -464,123 +688,195 @@ wxID_ANY Value - + sbSizerValue wxHORIZONTAL none - + 5 - + 1 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_ValueCtrl + 1 + + protected - - + 1 + + Resizable + 1 + wxTE_READONLY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 - + 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Edit - - + + 0 + + + 0 + + 1 m_button5 + 1 + + protected - - + 1 + + Resizable + 1 + wxBU_EXACTFIT - - - - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + OnEditValue - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + 5 - + 0 20 @@ -595,69 +891,105 @@ wxID_ANY Footprint Name in Lib - + sbSizerFootprintName wxHORIZONTAL none - + 5 - + 1 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_FootprintNameCtrl + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 - + 0 0 @@ -671,10 +1003,10 @@ 5 - + 0 - + m_PropRightSizer wxVERTICAL private @@ -683,53 +1015,89 @@ wxALL|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "Normal" "Normal+Insert" "Virtual" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Attributs: 1 - - + + 0 + + + 0 + + 1 m_AttributsCtrl + 1 + + protected - + 1 + + Resizable 0 - + 1 + wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -737,53 +1105,89 @@ wxALL|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "Free" "Locked" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Move and Auto Place 1 - - + + 0 + + + 0 + + 1 m_AutoPlaceCtrl + 1 + + protected - + 1 + + Resizable 0 - + 1 + wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -793,17 +1197,17 @@ wxID_ANY Auto Move and Place - + sbSizerAutoplace wxHORIZONTAL none - + 5 - + 1 - + bSizerRot90 wxVERTICAL none @@ -812,50 +1216,82 @@ wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Rotation 90 degree - - + + 0 + + + 0 + + 1 m_staticText11 + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -863,81 +1299,117 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY 10 - + + 0 + 0 + + 0 -1,-1 + 1 m_CostRot90Ctrl + 1 + + protected - + 1 + + Resizable + 1 -1,-1 wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 - + 1 - + bSizerRot180 wxVERTICAL none @@ -946,50 +1418,82 @@ wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Rotation 180 degree - - + + 0 + + + 0 + + 1 m_staticText12 + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -997,71 +1501,107 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY 10 - + + 0 + 0 + + 0 -1,-1 + 1 m_CostRot180Ctrl + 1 + + protected - - + 1 + + Resizable + 1 + wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1075,60 +1615,92 @@ wxID_ANY Masks clearances local values: - + sbSizer8 wxVERTICAL none - + 5 wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - + + 1 ,90,92,-1,70,0 + 0 0 wxID_ANY Set these values to 0 to use global values - - + + 0 + + + 0 + + 1 m_staticTextInfo + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1138,10 +1710,10 @@ 3 wxBOTH - - + + 0 - + fgSizer1 wxFLEX_GROWMODE_SPECIFIED none @@ -1152,50 +1724,82 @@ wxLEFT|wxALIGN_CENTER_VERTICAL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY All pads nets clearance - - + + 0 + + + 0 + + 1 m_staticTextNetClearance + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1203,54 +1807,90 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_NetClearanceValueCtrl + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1258,50 +1898,82 @@ wxRIGHT|wxALIGN_CENTER_VERTICAL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Inch - - + + 0 + + + 0 + + 1 m_NetClearanceUnits + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1309,48 +1981,80 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_staticline1 + 1 + + protected - - + 1 + + Resizable + 1 + wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1358,48 +2062,80 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_staticline2 + 1 + + protected - - + 1 + + Resizable + 1 + wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1407,48 +2143,80 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_staticline3 + 1 + + protected - - + 1 + + Resizable + 1 + wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1456,50 +2224,82 @@ wxALIGN_CENTER_VERTICAL|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Solder mask clearance: - - + + 0 + + + 0 + + 1 m_MaskClearanceTitle + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 This is the local clearance between pads and the solder mask for this footprint This value can be superseded by a pad local value. If 0, the global value is used - - - + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1507,54 +2307,90 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_SolderMaskMarginCtrl + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1562,50 +2398,82 @@ wxALIGN_CENTER_VERTICAL|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY inch - - + + 0 + + + 0 + + 1 m_SolderMaskMarginUnits + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1613,50 +2481,82 @@ wxALIGN_CENTER_VERTICAL|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Solder paste clearance: - - + + 0 + + + 0 + + 1 m_staticTextSolderPaste + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 This is the local clearance between pads and the solder paste for this footprint. This value can be superseded by a pad local values. The final clearance value is the sum of this value and the clearance value ratio A negative value means a smaller mask size than pad size - - - + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1664,54 +2564,90 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_SolderPasteMarginCtrl + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1719,50 +2655,82 @@ wxALIGN_CENTER_VERTICAL|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Inch - - + + 0 + + + 0 + + 1 m_SolderPasteMarginUnits + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1770,50 +2738,82 @@ wxALIGN_CENTER_VERTICAL|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Solder mask ratio clearance: - - + + 0 + + + 0 + + 1 m_staticTextRatio + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 This is the local clearance ratio in per cent between pads and the solder paste for this footprint. A value of 10 means the clearance value is 10 per cent of the pad size This value can be superseded by a pad local value. The final clearance value is the sum of this value and the clearance value A negative value means a smaller mask size than pad size. - - - + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1821,54 +2821,90 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_SolderPasteMarginRatioCtrl + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1876,50 +2912,82 @@ wxALIGN_CENTER_VERTICAL|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY % - - + + 0 + + + 0 + + 1 m_SolderPasteRatioMarginUnits + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1932,53 +3000,85 @@ - + 3D settings 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_Panel3D + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxSUNKEN_BORDER|wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bSizerMain3D wxVERTICAL none @@ -1987,50 +3087,82 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY 3D Shape Name - - + + 0 + + + 0 + + 1 m_staticText3Dname + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2038,51 +3170,87 @@ wxALL|wxEXPAND 0 - - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_3D_ShapeNameListBox + 1 + + protected - - + 1 + + Resizable + 1 + wxLB_SINGLE - - - - - - - - - - - - - - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + On3DShapeNameSelected - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -2090,7 +3258,7 @@ wxEXPAND 1 - + bLowerSizer3D wxHORIZONTAL none @@ -2101,11 +3269,11 @@ wxID_ANY 3D Scale and Pos - + m_Sizer3DValues wxVERTICAL public - + @@ -2113,7 +3281,7 @@ wxALIGN_CENTER_VERTICAL 0 - + bSizer3DButtons wxVERTICAL none @@ -2122,51 +3290,87 @@ wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_BROWSE_3D_LIB Add 3D Shape - - + + 0 + + + 0 + + 1 m_buttonBrowse + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + BrowseAndAdd3DLib - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2174,51 +3378,87 @@ wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_REMOVE_3D_SHAPE Remove 3D Shape - - + + 0 + + + 0 + + 1 m_buttonRemove + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + Remove3DShape - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2243,17 +3483,17 @@ 1 0 0 - + m_sdbSizerStdButtons protected - + OnCancelClick - - - + + + OnOkClick - - + + diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h index fab290ce9c..2645e7d27e 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h @@ -1,15 +1,17 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __dialog_edit_module_for_Modedit_base__ -#define __dialog_edit_module_for_Modedit_base__ +#ifndef __DIALOG_EDIT_MODULE_FOR_MODEDIT_BASE_H__ +#define __DIALOG_EDIT_MODULE_FOR_MODEDIT_BASE_H__ +#include +#include #include - +#include "dialog_shim.h" #include #include #include @@ -40,7 +42,7 @@ /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_MODULE_MODULE_EDITOR_BASE /////////////////////////////////////////////////////////////////////////////// -class DIALOG_MODULE_MODULE_EDITOR_BASE : public wxDialog +class DIALOG_MODULE_MODULE_EDITOR_BASE : public DIALOG_SHIM { private: wxBoxSizer* m_GeneralBoxSizer; @@ -51,14 +53,11 @@ class DIALOG_MODULE_MODULE_EDITOR_BASE : public wxDialog wxPanel* m_PanelProperties; wxTextCtrl* m_DocCtrl; wxTextCtrl* m_KeywordCtrl; - wxTextCtrl* m_ReferenceCtrl; wxButton* m_button4; wxTextCtrl* m_ValueCtrl; wxButton* m_button5; - wxTextCtrl* m_FootprintNameCtrl; - wxRadioBox* m_AttributsCtrl; wxRadioBox* m_AutoPlaceCtrl; wxStaticText* m_staticText11; @@ -91,20 +90,21 @@ class DIALOG_MODULE_MODULE_EDITOR_BASE : public wxDialog wxButton* m_sdbSizerStdButtonsCancel; // Virtual event handlers, overide them in your derived class - virtual void OnEditReference( wxCommandEvent& event ){ event.Skip(); } - virtual void OnEditValue( wxCommandEvent& event ){ event.Skip(); } - virtual void On3DShapeNameSelected( wxCommandEvent& event ){ event.Skip(); } - virtual void BrowseAndAdd3DLib( wxCommandEvent& event ){ event.Skip(); } - virtual void Remove3DShape( wxCommandEvent& event ){ event.Skip(); } - virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); } + virtual void OnEditReference( wxCommandEvent& event ) { event.Skip(); } + virtual void OnEditValue( wxCommandEvent& event ) { event.Skip(); } + virtual void On3DShapeNameSelected( wxCommandEvent& event ) { event.Skip(); } + virtual void BrowseAndAdd3DLib( wxCommandEvent& event ) { event.Skip(); } + virtual void Remove3DShape( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } public: wxStaticBoxSizer* m_Sizer3DValues; - DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Module properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 541,540 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Module properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 541,540 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_MODULE_MODULE_EDITOR_BASE(); }; -#endif //__dialog_edit_module_for_Modedit_base__ +#endif //__DIALOG_EDIT_MODULE_FOR_MODEDIT_BASE_H__ diff --git a/pcbnew/dialogs/dialog_edit_module_text_base.cpp b/pcbnew/dialogs/dialog_edit_module_text_base.cpp index 4cc4eed638..5f183f3746 100644 --- a/pcbnew/dialogs/dialog_edit_module_text_base.cpp +++ b/pcbnew/dialogs/dialog_edit_module_text_base.cpp @@ -1,129 +1,135 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include "dialog_edit_module_text_base.h" - -/////////////////////////////////////////////////////////////////////////// - -DialogEditModuleText_base::DialogEditModuleText_base( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) -{ - this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - - wxBoxSizer* bMainSizer; - bMainSizer = new wxBoxSizer( wxVERTICAL ); - - m_ModuleInfoText = new wxStaticText( this, wxID_ANY, _("Module %s (%s) orient %.1f"), wxDefaultPosition, wxDefaultSize, 0 ); - m_ModuleInfoText->Wrap( -1 ); - bMainSizer->Add( m_ModuleInfoText, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bMainSizer->Add( m_staticline1, 0, wxALL|wxEXPAND, 5 ); - - m_TextDataTitle = new wxStaticText( this, wxID_ANY, _("Reference:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_TextDataTitle->Wrap( -1 ); - bMainSizer->Add( m_TextDataTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_Name = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bMainSizer->Add( m_Name, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - wxBoxSizer* bSizer2; - bSizer2 = new wxBoxSizer( wxHORIZONTAL ); - - wxBoxSizer* bSizer3; - bSizer3 = new wxBoxSizer( wxVERTICAL ); - - m_SizeXTitle = new wxStaticText( this, wxID_ANY, _("Size X"), wxDefaultPosition, wxDefaultSize, 0 ); - m_SizeXTitle->Wrap( -1 ); - bSizer3->Add( m_SizeXTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_TxtSizeCtrlX = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer3->Add( m_TxtSizeCtrlX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - m_SizeYTitle = new wxStaticText( this, wxID_ANY, _("Size Y"), wxDefaultPosition, wxDefaultSize, 0 ); - m_SizeYTitle->Wrap( -1 ); - bSizer3->Add( m_SizeYTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_TxtSizeCtrlY = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer3->Add( m_TxtSizeCtrlY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - m_PosXTitle = new wxStaticText( this, wxID_ANY, _("Offset X"), wxDefaultPosition, wxDefaultSize, 0 ); - m_PosXTitle->Wrap( -1 ); - bSizer3->Add( m_PosXTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_TxtPosCtrlX = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer3->Add( m_TxtPosCtrlX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - m_PosYTitle = new wxStaticText( this, wxID_ANY, _("Offset Y"), wxDefaultPosition, wxDefaultSize, 0 ); - m_PosYTitle->Wrap( -1 ); - bSizer3->Add( m_PosYTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_TxtPosCtrlY = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer3->Add( m_TxtPosCtrlY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - bSizer2->Add( bSizer3, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer4; - bSizer4 = new wxBoxSizer( wxVERTICAL ); - - m_WidthTitle = new wxStaticText( this, wxID_ANY, _("Thickness"), wxDefaultPosition, wxDefaultSize, 0 ); - m_WidthTitle->Wrap( -1 ); - bSizer4->Add( m_WidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_TxtWidthCtlr = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer4->Add( m_TxtWidthCtlr, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - wxString m_OrientChoices[] = { _("horizontal"), _("vertical") }; - int m_OrientNChoices = sizeof( m_OrientChoices ) / sizeof( wxString ); - m_Orient = new wxRadioBox( this, wxID_ANY, _("Orientation"), wxDefaultPosition, wxDefaultSize, m_OrientNChoices, m_OrientChoices, 1, wxRA_SPECIFY_COLS ); - m_Orient->SetSelection( 0 ); - bSizer4->Add( m_Orient, 0, wxALL|wxEXPAND, 5 ); - - wxString m_ShowChoices[] = { _("Visible"), _("Invisible") }; - int m_ShowNChoices = sizeof( m_ShowChoices ) / sizeof( wxString ); - m_Show = new wxRadioBox( this, wxID_ANY, _("Display"), wxDefaultPosition, wxDefaultSize, m_ShowNChoices, m_ShowChoices, 1, wxRA_SPECIFY_COLS ); - m_Show->SetSelection( 0 ); - bSizer4->Add( m_Show, 0, wxALL|wxEXPAND, 5 ); - - bSizer2->Add( bSizer4, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer5; - bSizer5 = new wxBoxSizer( wxVERTICAL ); - - wxString m_StyleChoices[] = { _("Normal"), _("Italic") }; - int m_StyleNChoices = sizeof( m_StyleChoices ) / sizeof( wxString ); - m_Style = new wxRadioBox( this, wxID_ANY, _("Style"), wxDefaultPosition, wxDefaultSize, m_StyleNChoices, m_StyleChoices, 1, wxRA_SPECIFY_COLS ); - m_Style->SetSelection( 0 ); - bSizer5->Add( m_Style, 0, wxALL|wxEXPAND, 5 ); - - - bSizer5->Add( 10, 10, 0, 0, 5 ); - - m_buttonOK = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 ); - m_buttonOK->SetDefault(); - bSizer5->Add( m_buttonOK, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - m_buttonCANCEL = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer5->Add( m_buttonCANCEL, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - bSizer2->Add( bSizer5, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - - bMainSizer->Add( bSizer2, 1, wxEXPAND, 5 ); - - this->SetSizer( bMainSizer ); - this->Layout(); - - // Connect Events - m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogEditModuleText_base::OnOkClick ), NULL, this ); - m_buttonCANCEL->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogEditModuleText_base::OnCancelClick ), NULL, this ); -} - -DialogEditModuleText_base::~DialogEditModuleText_base() -{ - // Disconnect Events - m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogEditModuleText_base::OnOkClick ), NULL, this ); - m_buttonCANCEL->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogEditModuleText_base::OnCancelClick ), NULL, this ); -} +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Apr 10 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include "dialog_edit_module_text_base.h" + +/////////////////////////////////////////////////////////////////////////// + +DialogEditModuleText_base::DialogEditModuleText_base( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* bMainSizer; + bMainSizer = new wxBoxSizer( wxVERTICAL ); + + m_ModuleInfoText = new wxStaticText( this, wxID_ANY, _("Module %s (%s) orient %.1f"), wxDefaultPosition, wxDefaultSize, 0 ); + m_ModuleInfoText->Wrap( -1 ); + bMainSizer->Add( m_ModuleInfoText, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + bMainSizer->Add( m_staticline1, 0, wxALL|wxEXPAND, 5 ); + + m_TextDataTitle = new wxStaticText( this, wxID_ANY, _("Reference:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_TextDataTitle->Wrap( -1 ); + bMainSizer->Add( m_TextDataTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_Name = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bMainSizer->Add( m_Name, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + wxBoxSizer* bSizer2; + bSizer2 = new wxBoxSizer( wxHORIZONTAL ); + + wxBoxSizer* bSizer3; + bSizer3 = new wxBoxSizer( wxVERTICAL ); + + m_SizeXTitle = new wxStaticText( this, wxID_ANY, _("Size X"), wxDefaultPosition, wxDefaultSize, 0 ); + m_SizeXTitle->Wrap( -1 ); + bSizer3->Add( m_SizeXTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_TxtSizeCtrlX = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bSizer3->Add( m_TxtSizeCtrlX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + + m_SizeYTitle = new wxStaticText( this, wxID_ANY, _("Size Y"), wxDefaultPosition, wxDefaultSize, 0 ); + m_SizeYTitle->Wrap( -1 ); + bSizer3->Add( m_SizeYTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_TxtSizeCtrlY = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bSizer3->Add( m_TxtSizeCtrlY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + + m_PosXTitle = new wxStaticText( this, wxID_ANY, _("Offset X"), wxDefaultPosition, wxDefaultSize, 0 ); + m_PosXTitle->Wrap( -1 ); + bSizer3->Add( m_PosXTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_TxtPosCtrlX = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bSizer3->Add( m_TxtPosCtrlX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + + m_PosYTitle = new wxStaticText( this, wxID_ANY, _("Offset Y"), wxDefaultPosition, wxDefaultSize, 0 ); + m_PosYTitle->Wrap( -1 ); + bSizer3->Add( m_PosYTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_TxtPosCtrlY = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bSizer3->Add( m_TxtPosCtrlY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + + + bSizer2->Add( bSizer3, 1, wxEXPAND, 5 ); + + wxBoxSizer* bSizer4; + bSizer4 = new wxBoxSizer( wxVERTICAL ); + + m_WidthTitle = new wxStaticText( this, wxID_ANY, _("Thickness"), wxDefaultPosition, wxDefaultSize, 0 ); + m_WidthTitle->Wrap( -1 ); + bSizer4->Add( m_WidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_TxtWidthCtlr = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bSizer4->Add( m_TxtWidthCtlr, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + + wxString m_OrientChoices[] = { _("horizontal"), _("vertical") }; + int m_OrientNChoices = sizeof( m_OrientChoices ) / sizeof( wxString ); + m_Orient = new wxRadioBox( this, wxID_ANY, _("Orientation"), wxDefaultPosition, wxDefaultSize, m_OrientNChoices, m_OrientChoices, 1, wxRA_SPECIFY_COLS ); + m_Orient->SetSelection( 0 ); + bSizer4->Add( m_Orient, 0, wxALL|wxEXPAND, 5 ); + + wxString m_ShowChoices[] = { _("Visible"), _("Invisible") }; + int m_ShowNChoices = sizeof( m_ShowChoices ) / sizeof( wxString ); + m_Show = new wxRadioBox( this, wxID_ANY, _("Display"), wxDefaultPosition, wxDefaultSize, m_ShowNChoices, m_ShowChoices, 1, wxRA_SPECIFY_COLS ); + m_Show->SetSelection( 0 ); + bSizer4->Add( m_Show, 0, wxALL|wxEXPAND, 5 ); + + + bSizer2->Add( bSizer4, 1, wxEXPAND, 5 ); + + wxBoxSizer* bSizer5; + bSizer5 = new wxBoxSizer( wxVERTICAL ); + + wxString m_StyleChoices[] = { _("Normal"), _("Italic") }; + int m_StyleNChoices = sizeof( m_StyleChoices ) / sizeof( wxString ); + m_Style = new wxRadioBox( this, wxID_ANY, _("Style"), wxDefaultPosition, wxDefaultSize, m_StyleNChoices, m_StyleChoices, 1, wxRA_SPECIFY_COLS ); + m_Style->SetSelection( 0 ); + bSizer5->Add( m_Style, 0, wxALL|wxEXPAND, 5 ); + + + bSizer5->Add( 10, 10, 0, 0, 5 ); + + m_buttonOK = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 ); + m_buttonOK->SetDefault(); + bSizer5->Add( m_buttonOK, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + m_buttonCANCEL = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer5->Add( m_buttonCANCEL, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + + bSizer2->Add( bSizer5, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + + + bMainSizer->Add( bSizer2, 1, wxEXPAND, 5 ); + + + this->SetSizer( bMainSizer ); + this->Layout(); + + // Connect Events + m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogEditModuleText_base::OnOkClick ), NULL, this ); + m_buttonCANCEL->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogEditModuleText_base::OnCancelClick ), NULL, this ); +} + +DialogEditModuleText_base::~DialogEditModuleText_base() +{ + // Disconnect Events + m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogEditModuleText_base::OnOkClick ), NULL, this ); + m_buttonCANCEL->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogEditModuleText_base::OnCancelClick ), NULL, this ); + +} diff --git a/pcbnew/dialogs/dialog_edit_module_text_base.fbp b/pcbnew/dialogs/dialog_edit_module_text_base.fbp index 78ada15364..7487048524 100644 --- a/pcbnew/dialogs/dialog_edit_module_text_base.fbp +++ b/pcbnew/dialogs/dialog_edit_module_text_base.fbp @@ -1,10 +1,14 @@ - + - + C++ 1 + source_name + 0 + 0 + res UTF-8 connect dialog_edit_module_text_base @@ -12,66 +16,78 @@ none 1 DialogEditModuleText_base - + . - + 1 + 1 + 1 1 0 - - - + 0 + wxAUI_MGR_DEFAULT + + + + 1 1 - - - + impl_virtual + + + 0 wxID_ANY - - + + DialogEditModuleText_base - + 357,299 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + DIALOG_SHIM; dialog_shim.h Footprint text properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bMainSizer wxVERTICAL none @@ -80,50 +96,82 @@ wxALL|wxALIGN_CENTER_HORIZONTAL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Module %s (%s) orient %.1f - - + + 0 + + + 0 + + 1 m_ModuleInfoText + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -131,48 +179,80 @@ wxALL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_staticline1 + 1 + + protected - - + 1 + + Resizable + 1 + wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -180,50 +260,82 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Reference: - - + + 0 + + + 0 + + 1 m_TextDataTitle + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -231,54 +343,90 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_Name + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -286,7 +434,7 @@ wxEXPAND 1 - + bSizer2 wxHORIZONTAL none @@ -295,7 +443,7 @@ wxEXPAND 1 - + bSizer3 wxVERTICAL none @@ -304,50 +452,82 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Size X - - + + 0 + + + 0 + + 1 m_SizeXTitle + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -355,54 +535,90 @@ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_TxtSizeCtrlX + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -410,50 +626,82 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Size Y - - + + 0 + + + 0 + + 1 m_SizeYTitle + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -461,54 +709,90 @@ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_TxtSizeCtrlY + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -516,50 +800,82 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Offset X - - + + 0 + + + 0 + + 1 m_PosXTitle + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -567,54 +883,90 @@ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_TxtPosCtrlX + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -622,50 +974,82 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Offset Y - - + + 0 + + + 0 + + 1 m_PosYTitle + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -673,54 +1057,90 @@ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_TxtPosCtrlY + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -730,7 +1150,7 @@ wxEXPAND 1 - + bSizer4 wxVERTICAL none @@ -739,50 +1159,82 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Thickness - - + + 0 + + + 0 + + 1 m_WidthTitle + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -790,54 +1242,90 @@ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_TxtWidthCtlr + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -845,53 +1333,89 @@ wxALL|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "horizontal" "vertical" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Orientation 1 - - + + 0 + + + 0 + + 1 m_Orient + 1 + + protected - + 1 + + Resizable 0 - + 1 + wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -899,53 +1423,89 @@ wxALL|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "Visible" "Invisible" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Display 1 - - + + 0 + + + 0 + + 1 m_Show + 1 + + protected - + 1 + + Resizable 0 - + 1 + wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -955,7 +1515,7 @@ wxALIGN_CENTER_VERTICAL|wxEXPAND 0 - + bSizer5 wxVERTICAL none @@ -964,58 +1524,94 @@ wxALL|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "Normal" "Italic" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Style 1 - - + + 0 + + + 0 + + 1 m_Style + 1 + + protected - + 1 + + Resizable 0 - + 1 + wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 - + 0 10 @@ -1028,51 +1624,87 @@ wxALL|wxALIGN_CENTER_HORIZONTAL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_OK OK - - + + 0 + + + 0 + + 1 m_buttonOK + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + OnOkClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1080,51 +1712,87 @@ wxALL|wxALIGN_CENTER_HORIZONTAL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_CANCEL Cancel - - + + 0 + + + 0 + + 1 m_buttonCANCEL + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + OnCancelClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcbnew/dialogs/dialog_edit_module_text_base.h b/pcbnew/dialogs/dialog_edit_module_text_base.h index d5a375e1ac..560637d073 100644 --- a/pcbnew/dialogs/dialog_edit_module_text_base.h +++ b/pcbnew/dialogs/dialog_edit_module_text_base.h @@ -1,68 +1,70 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __dialog_edit_module_text_base__ -#define __dialog_edit_module_text_base__ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -/////////////////////////////////////////////////////////////////////////////// -/// Class DialogEditModuleText_base -/////////////////////////////////////////////////////////////////////////////// -class DialogEditModuleText_base : public wxDialog -{ - private: - - protected: - wxStaticText* m_ModuleInfoText; - wxStaticLine* m_staticline1; - wxStaticText* m_TextDataTitle; - wxTextCtrl* m_Name; - wxStaticText* m_SizeXTitle; - wxTextCtrl* m_TxtSizeCtrlX; - wxStaticText* m_SizeYTitle; - wxTextCtrl* m_TxtSizeCtrlY; - wxStaticText* m_PosXTitle; - wxTextCtrl* m_TxtPosCtrlX; - wxStaticText* m_PosYTitle; - wxTextCtrl* m_TxtPosCtrlY; - wxStaticText* m_WidthTitle; - wxTextCtrl* m_TxtWidthCtlr; - wxRadioBox* m_Orient; - wxRadioBox* m_Show; - wxRadioBox* m_Style; - - wxButton* m_buttonOK; - wxButton* m_buttonCANCEL; - - // Virtual event handlers, overide them in your derived class - virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); } - - - public: - DialogEditModuleText_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint text properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 357,299 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DialogEditModuleText_base(); - -}; - -#endif //__dialog_edit_module_text_base__ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Apr 10 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#ifndef __DIALOG_EDIT_MODULE_TEXT_BASE_H__ +#define __DIALOG_EDIT_MODULE_TEXT_BASE_H__ + +#include +#include +#include +#include "dialog_shim.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +/// Class DialogEditModuleText_base +/////////////////////////////////////////////////////////////////////////////// +class DialogEditModuleText_base : public DIALOG_SHIM +{ + private: + + protected: + wxStaticText* m_ModuleInfoText; + wxStaticLine* m_staticline1; + wxStaticText* m_TextDataTitle; + wxTextCtrl* m_Name; + wxStaticText* m_SizeXTitle; + wxTextCtrl* m_TxtSizeCtrlX; + wxStaticText* m_SizeYTitle; + wxTextCtrl* m_TxtSizeCtrlY; + wxStaticText* m_PosXTitle; + wxTextCtrl* m_TxtPosCtrlX; + wxStaticText* m_PosYTitle; + wxTextCtrl* m_TxtPosCtrlY; + wxStaticText* m_WidthTitle; + wxTextCtrl* m_TxtWidthCtlr; + wxRadioBox* m_Orient; + wxRadioBox* m_Show; + wxRadioBox* m_Style; + wxButton* m_buttonOK; + wxButton* m_buttonCANCEL; + + // Virtual event handlers, overide them in your derived class + virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } + + + public: + + DialogEditModuleText_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint text properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 357,299 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DialogEditModuleText_base(); + +}; + +#endif //__DIALOG_EDIT_MODULE_TEXT_BASE_H__ diff --git a/pcbnew/dialogs/dialog_export_3Dfiles_base.cpp b/pcbnew/dialogs/dialog_export_3Dfiles_base.cpp index 9a5c86a35a..a4ea819f54 100644 --- a/pcbnew/dialogs/dialog_export_3Dfiles_base.cpp +++ b/pcbnew/dialogs/dialog_export_3Dfiles_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -9,7 +9,7 @@ /////////////////////////////////////////////////////////////////////////// -DIALOG_EXPORT_3DFILE_BASE::DIALOG_EXPORT_3DFILE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +DIALOG_EXPORT_3DFILE_BASE::DIALOG_EXPORT_3DFILE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); @@ -34,6 +34,7 @@ DIALOG_EXPORT_3DFILE_BASE::DIALOG_EXPORT_3DFILE_BASE( wxWindow* parent, wxWindow m_SubdirNameCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bUpperSizer->Add( m_SubdirNameCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bSizer1->Add( bUpperSizer, 0, wxEXPAND, 5 ); wxBoxSizer* bLowerSizer; @@ -51,6 +52,7 @@ DIALOG_EXPORT_3DFILE_BASE::DIALOG_EXPORT_3DFILE_BASE( wxWindow* parent, wxWindow m_rb3DFilesOption->SetSelection( 1 ); bLowerSizer->Add( m_rb3DFilesOption, 1, wxALL|wxEXPAND, 5 ); + bSizer1->Add( bLowerSizer, 1, wxEXPAND, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); @@ -62,8 +64,10 @@ DIALOG_EXPORT_3DFILE_BASE::DIALOG_EXPORT_3DFILE_BASE( wxWindow* parent, wxWindow m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); + bSizer1->Add( m_sdbSizer1, 0, wxEXPAND|wxALL, 5 ); + this->SetSizer( bSizer1 ); this->Layout(); @@ -77,4 +81,5 @@ DIALOG_EXPORT_3DFILE_BASE::~DIALOG_EXPORT_3DFILE_BASE() // Disconnect Events m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXPORT_3DFILE_BASE::OnCancelClick ), NULL, this ); m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXPORT_3DFILE_BASE::OnOkClick ), NULL, this ); + } diff --git a/pcbnew/dialogs/dialog_export_3Dfiles_base.fbp b/pcbnew/dialogs/dialog_export_3Dfiles_base.fbp index ba97d1ac4d..4a5ca7490c 100644 --- a/pcbnew/dialogs/dialog_export_3Dfiles_base.fbp +++ b/pcbnew/dialogs/dialog_export_3Dfiles_base.fbp @@ -2,9 +2,13 @@ - + C++ 1 + source_name + 0 + 0 + res UTF-8 connect dialog_export_3Dfiles_base @@ -12,64 +16,76 @@ none 1 dialog_export_3Dfiles - + . - + 1 + 1 + 1 1 0 - - - + 0 + wxAUI_MGR_DEFAULT + + + + 1 1 - - - + impl_virtual + + + 0 wxID_ANY - - + + DIALOG_EXPORT_3DFILE_BASE - + 370,252 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + DIALOG_SHIM; dialog_shim.h Vrml Board Export Options: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1,-1 bSizer1 @@ -89,50 +105,82 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Vrml main file filename: - - + + 0 + + + 0 + + 1 m_staticText1 + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -140,52 +188,88 @@ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + Save VRML Board File + + 0 -1,-1 + 1 m_filePicker + 1 + + protected - - + 1 + + Resizable + 1 + wxFLP_SAVE|wxFLP_USE_TEXTCTRL - - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + *.wrl - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -193,50 +277,82 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Vrml 3D footprints shapes subdir: - - + + 0 + + + 0 + + 1 m_staticText3 + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -244,54 +360,90 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_SubdirNameCtrl + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -301,7 +453,7 @@ wxEXPAND 1 - + bLowerSizer wxHORIZONTAL none @@ -310,53 +462,89 @@ wxALL|wxEXPAND 1 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "Inch" "mm" "Meter" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Units: 1 - - + + 0 + + + 0 + + 1 m_rbSelectUnits + 1 + + protected - + 1 + + Resizable 0 - + 1 + wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -364,53 +552,89 @@ wxALL|wxEXPAND 1 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "Copy 3D Shapes Files in Subdir" "Use Absolute Path in Vrml File " - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY 3D Shapes Files Option: 1 - - + + 0 + + + 0 + + 1 m_rb3DFilesOption + 1 + + protected - + 1 + + Resizable 1 - + 1 + wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -420,48 +644,80 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_staticline1 + 1 + + protected - - + 1 + + Resizable + 1 + wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -477,17 +733,17 @@ 1 0 0 - + m_sdbSizer1 protected - + OnCancelClick - - - + + + OnOkClick - - + + diff --git a/pcbnew/dialogs/dialog_export_3Dfiles_base.h b/pcbnew/dialogs/dialog_export_3Dfiles_base.h index cb1f5ce540..c3d915695c 100644 --- a/pcbnew/dialogs/dialog_export_3Dfiles_base.h +++ b/pcbnew/dialogs/dialog_export_3Dfiles_base.h @@ -1,15 +1,17 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __dialog_export_3Dfiles_base__ -#define __dialog_export_3Dfiles_base__ +#ifndef __DIALOG_EXPORT_3DFILES_BASE_H__ +#define __DIALOG_EXPORT_3DFILES_BASE_H__ +#include +#include #include - +#include "dialog_shim.h" #include #include #include @@ -29,7 +31,7 @@ /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_EXPORT_3DFILE_BASE /////////////////////////////////////////////////////////////////////////////// -class DIALOG_EXPORT_3DFILE_BASE : public wxDialog +class DIALOG_EXPORT_3DFILE_BASE : public DIALOG_SHIM { private: @@ -46,14 +48,15 @@ class DIALOG_EXPORT_3DFILE_BASE : public wxDialog wxButton* m_sdbSizer1Cancel; // Virtual event handlers, overide them in your derived class - virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); } + virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } public: - DIALOG_EXPORT_3DFILE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Vrml Board Export Options:"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 370,252 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_EXPORT_3DFILE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Vrml Board Export Options:"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 370,252 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_EXPORT_3DFILE_BASE(); }; -#endif //__dialog_export_3Dfiles_base__ +#endif //__DIALOG_EXPORT_3DFILES_BASE_H__ diff --git a/pcbnew/dialogs/dialog_footprint_wizard_list.fbp b/pcbnew/dialogs/dialog_footprint_wizard_list.fbp index 3c31fb3a71..ea4218b74e 100644 --- a/pcbnew/dialogs/dialog_footprint_wizard_list.fbp +++ b/pcbnew/dialogs/dialog_footprint_wizard_list.fbp @@ -1,263 +1,328 @@ - - - - - - C++ - 1 - source_name - 0 - UTF-8 - connect - dialog_footprint_wizard_list_base - 1000 - none - 1 - DIALOG_FOOTPRINT_WIZARD_LIST_BASE - - . - - 1 - 1 - 0 - 0 - - - wxBOTH - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - - - DIALOG_FOOTPRINT_WIZARD_LIST_BASE - - - wxDEFAULT_DIALOG_STYLE - - Footprint Wizards - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer4 - wxVERTICAL - none - - 5 - wxALL - 1 - - 0 - 1 - - - - wxALIGN_LEFT - - wxALIGN_TOP - wxALIGN_LEFT - 20 - "Preview" "Name" "Description" - wxALIGN_CENTRE - 3 - 80,80,325 - - 1 - 0 - 1 - 0 - 1 - 0 - 1 - - - - 1 - 0 - wxID_ANY - - - - 0 - 0 - - -1,120 - m_footprintWizardsGrid - protected - - wxALIGN_CENTRE - 1 - - wxALIGN_CENTRE - - 0 - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - OnCellWizardClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER|wxALL - 0 - - - - 1 - 0 - 1 - - - 0 - wxID_ANY - Open - - - m_btOpen - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnOpenButtonClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + C++ + 1 + source_name + 0 + 0 + res + UTF-8 + connect + dialog_footprint_wizard_list_base + 1000 + none + 1 + DIALOG_FOOTPRINT_WIZARD_LIST_BASE + + . + + 1 + 1 + 1 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + wxBOTH + + 1 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + DIALOG_FOOTPRINT_WIZARD_LIST_BASE + + + wxDEFAULT_DIALOG_STYLE + DIALOG_SHIM; dialog_shim.h + Footprint Wizards + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bSizer4 + wxVERTICAL + none + + 5 + wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + 0 + 1 + + + + 1 + + + wxALIGN_LEFT + + wxALIGN_TOP + 0 + 1 + wxALIGN_LEFT + 20 + "Preview" "Name" "Description" + wxALIGN_CENTRE + 3 + 80,80,325 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + 0 + 1 + 0 + 1 + + 1 + + + 1 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + + + 0 + -1,120 + 1 + m_footprintWizardsGrid + 1 + + + protected + 1 + + Resizable + wxALIGN_CENTRE + 1 + + wxALIGN_CENTRE + + 0 + 1 + + + 0 + + + + + + + + + OnCellWizardClick + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Open + + 0 + + + 0 + + 1 + m_btOpen + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnOpenButtonClick + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp b/pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp index c273fad1fb..6bdf498878 100644 --- a/pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp +++ b/pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp @@ -1,74 +1,75 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Sep 8 2010) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include "dialog_footprint_wizard_list_base.h" - -/////////////////////////////////////////////////////////////////////////// - -DIALOG_FOOTPRINT_WIZARD_LIST_BASE::DIALOG_FOOTPRINT_WIZARD_LIST_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) -{ - this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - - wxBoxSizer* bSizer4; - bSizer4 = new wxBoxSizer( wxVERTICAL ); - - m_footprintWizardsGrid = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - - // Grid - m_footprintWizardsGrid->CreateGrid( 0, 3 ); - m_footprintWizardsGrid->EnableEditing( false ); - m_footprintWizardsGrid->EnableGridLines( true ); - m_footprintWizardsGrid->EnableDragGridSize( false ); - m_footprintWizardsGrid->SetMargins( 0, 0 ); - - // Columns - m_footprintWizardsGrid->SetColSize( 0, 80 ); - m_footprintWizardsGrid->SetColSize( 1, 80 ); - m_footprintWizardsGrid->SetColSize( 2, 325 ); - m_footprintWizardsGrid->EnableDragColMove( false ); - m_footprintWizardsGrid->EnableDragColSize( true ); - m_footprintWizardsGrid->SetColLabelSize( 20 ); - m_footprintWizardsGrid->SetColLabelValue( 0, _("Preview") ); - m_footprintWizardsGrid->SetColLabelValue( 1, _("Name") ); - m_footprintWizardsGrid->SetColLabelValue( 2, _("Description") ); - m_footprintWizardsGrid->SetColLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE ); - - // Rows - m_footprintWizardsGrid->AutoSizeRows(); - m_footprintWizardsGrid->EnableDragRowSize( true ); - m_footprintWizardsGrid->SetRowLabelSize( 1 ); - m_footprintWizardsGrid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - - // Label Appearance - - // Cell Defaults - m_footprintWizardsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); - m_footprintWizardsGrid->SetMinSize( wxSize( -1,120 ) ); - - bSizer4->Add( m_footprintWizardsGrid, 1, wxALL, 5 ); - - m_btOpen = new wxButton( this, wxID_ANY, _("Open"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer4->Add( m_btOpen, 0, wxALIGN_CENTER|wxALL, 5 ); - - this->SetSizer( bSizer4 ); - this->Layout(); - bSizer4->Fit( this ); - - this->Centre( wxBOTH ); - - // Connect Events - m_footprintWizardsGrid->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( DIALOG_FOOTPRINT_WIZARD_LIST_BASE::OnCellWizardClick ), NULL, this ); - m_btOpen->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_WIZARD_LIST_BASE::OnOpenButtonClick ), NULL, this ); -} - -DIALOG_FOOTPRINT_WIZARD_LIST_BASE::~DIALOG_FOOTPRINT_WIZARD_LIST_BASE() -{ - // Disconnect Events - m_footprintWizardsGrid->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( DIALOG_FOOTPRINT_WIZARD_LIST_BASE::OnCellWizardClick ), NULL, this ); - m_btOpen->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_WIZARD_LIST_BASE::OnOpenButtonClick ), NULL, this ); - -} +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Apr 10 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include "dialog_footprint_wizard_list_base.h" + +/////////////////////////////////////////////////////////////////////////// + +DIALOG_FOOTPRINT_WIZARD_LIST_BASE::DIALOG_FOOTPRINT_WIZARD_LIST_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* bSizer4; + bSizer4 = new wxBoxSizer( wxVERTICAL ); + + m_footprintWizardsGrid = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + + // Grid + m_footprintWizardsGrid->CreateGrid( 0, 3 ); + m_footprintWizardsGrid->EnableEditing( false ); + m_footprintWizardsGrid->EnableGridLines( true ); + m_footprintWizardsGrid->EnableDragGridSize( false ); + m_footprintWizardsGrid->SetMargins( 0, 0 ); + + // Columns + m_footprintWizardsGrid->SetColSize( 0, 80 ); + m_footprintWizardsGrid->SetColSize( 1, 80 ); + m_footprintWizardsGrid->SetColSize( 2, 325 ); + m_footprintWizardsGrid->EnableDragColMove( false ); + m_footprintWizardsGrid->EnableDragColSize( true ); + m_footprintWizardsGrid->SetColLabelSize( 20 ); + m_footprintWizardsGrid->SetColLabelValue( 0, _("Preview") ); + m_footprintWizardsGrid->SetColLabelValue( 1, _("Name") ); + m_footprintWizardsGrid->SetColLabelValue( 2, _("Description") ); + m_footprintWizardsGrid->SetColLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE ); + + // Rows + m_footprintWizardsGrid->AutoSizeRows(); + m_footprintWizardsGrid->EnableDragRowSize( true ); + m_footprintWizardsGrid->SetRowLabelSize( 1 ); + m_footprintWizardsGrid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); + + // Label Appearance + + // Cell Defaults + m_footprintWizardsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); + m_footprintWizardsGrid->SetMinSize( wxSize( -1,120 ) ); + + bSizer4->Add( m_footprintWizardsGrid, 1, wxALL, 5 ); + + m_btOpen = new wxButton( this, wxID_ANY, _("Open"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer4->Add( m_btOpen, 0, wxALIGN_CENTER|wxALL, 5 ); + + + this->SetSizer( bSizer4 ); + this->Layout(); + bSizer4->Fit( this ); + + this->Centre( wxBOTH ); + + // Connect Events + m_footprintWizardsGrid->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( DIALOG_FOOTPRINT_WIZARD_LIST_BASE::OnCellWizardClick ), NULL, this ); + m_btOpen->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_WIZARD_LIST_BASE::OnOpenButtonClick ), NULL, this ); +} + +DIALOG_FOOTPRINT_WIZARD_LIST_BASE::~DIALOG_FOOTPRINT_WIZARD_LIST_BASE() +{ + // Disconnect Events + m_footprintWizardsGrid->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( DIALOG_FOOTPRINT_WIZARD_LIST_BASE::OnCellWizardClick ), NULL, this ); + m_btOpen->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_WIZARD_LIST_BASE::OnOpenButtonClick ), NULL, this ); + +} diff --git a/pcbnew/dialogs/dialog_footprint_wizard_list_base.h b/pcbnew/dialogs/dialog_footprint_wizard_list_base.h index 2d35c9e058..974728e6b4 100644 --- a/pcbnew/dialogs/dialog_footprint_wizard_list_base.h +++ b/pcbnew/dialogs/dialog_footprint_wizard_list_base.h @@ -1,49 +1,51 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Sep 8 2010) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __dialog_footprint_wizard_list_base__ -#define __dialog_footprint_wizard_list_base__ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - - -/////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_FOOTPRINT_WIZARD_LIST_BASE -/////////////////////////////////////////////////////////////////////////////// -class DIALOG_FOOTPRINT_WIZARD_LIST_BASE : public wxDialog -{ - private: - - protected: - wxGrid* m_footprintWizardsGrid; - wxButton* m_btOpen; - - // Virtual event handlers, overide them in your derived class - virtual void OnCellWizardClick( wxGridEvent& event ) { event.Skip(); } - virtual void OnOpenButtonClick( wxCommandEvent& event ) { event.Skip(); } - - - public: - - DIALOG_FOOTPRINT_WIZARD_LIST_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Wizards"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); - ~DIALOG_FOOTPRINT_WIZARD_LIST_BASE(); - -}; - -#endif //__dialog_footprint_wizard_list_base__ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Apr 10 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#ifndef __DIALOG_FOOTPRINT_WIZARD_LIST_BASE_H__ +#define __DIALOG_FOOTPRINT_WIZARD_LIST_BASE_H__ + +#include +#include +#include +#include "dialog_shim.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////////////// +/// Class DIALOG_FOOTPRINT_WIZARD_LIST_BASE +/////////////////////////////////////////////////////////////////////////////// +class DIALOG_FOOTPRINT_WIZARD_LIST_BASE : public DIALOG_SHIM +{ + private: + + protected: + wxGrid* m_footprintWizardsGrid; + wxButton* m_btOpen; + + // Virtual event handlers, overide them in your derived class + virtual void OnCellWizardClick( wxGridEvent& event ) { event.Skip(); } + virtual void OnOpenButtonClick( wxCommandEvent& event ) { event.Skip(); } + + + public: + + DIALOG_FOOTPRINT_WIZARD_LIST_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Wizards"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); + ~DIALOG_FOOTPRINT_WIZARD_LIST_BASE(); + +}; + +#endif //__DIALOG_FOOTPRINT_WIZARD_LIST_BASE_H__ diff --git a/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp b/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp index 003e120dc0..21a3d826b2 100644 --- a/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp +++ b/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp @@ -1,142 +1,152 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 29 2008) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include "dialog_freeroute_exchange_base.h" - -/////////////////////////////////////////////////////////////////////////// - -DIALOG_FREEROUTE_BASE::DIALOG_FREEROUTE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) -{ - this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - - wxBoxSizer* bMainSizer; - bMainSizer = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bUpperSizer; - bUpperSizer = new wxBoxSizer( wxHORIZONTAL ); - - wxBoxSizer* bLeftSizer; - bLeftSizer = new wxBoxSizer( wxVERTICAL ); - - m_staticText2 = new wxStaticText( this, wxID_ANY, _("Export/Import to/from FreeRoute:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText2->Wrap( -1 ); - m_staticText2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - - bLeftSizer->Add( m_staticText2, 0, wxALL, 5 ); - - wxBoxSizer* bLeftSubSizerSizer; - bLeftSubSizerSizer = new wxBoxSizer( wxHORIZONTAL ); - - - bLeftSubSizerSizer->Add( 20, 20, 0, 0, 5 ); - - wxBoxSizer* bLeftButtonsSizer; - bLeftButtonsSizer = new wxBoxSizer( wxVERTICAL ); - - m_ExportDSN = new wxButton( this, ID_BUTTON_EXPORT_DSN, _("Export a Specctra Design (*.dsn) File"), wxDefaultPosition, wxDefaultSize, 0 ); - m_ExportDSN->SetToolTip( _("Export a Specctra DSN file (to FreeRouter)") ); - - bLeftButtonsSizer->Add( m_ExportDSN, 0, wxALL|wxEXPAND, 5 ); - - m_buttonLaunchFreeroute = new wxButton( this, wxID_BUTTON_LAUNCH, _("Launch FreeRouter via Java Web Start"), wxDefaultPosition, wxDefaultSize, 0 ); - m_buttonLaunchFreeroute->SetToolTip( _("Use Java Web Start function to run FreeRouter via Internet (or your Browser if not found)") ); - - bLeftButtonsSizer->Add( m_buttonLaunchFreeroute, 0, wxALL|wxEXPAND, 5 ); - - m_buttonImport = new wxButton( this, wxID_BUTTON_IMPORT, _("Back Import the Specctra Session (*.ses) File"), wxDefaultPosition, wxDefaultSize, 0 ); - m_buttonImport->SetToolTip( _("Merge a session file created by FreeRouter with the current board.") ); - - bLeftButtonsSizer->Add( m_buttonImport, 0, wxALL|wxEXPAND, 5 ); - - bLeftSubSizerSizer->Add( bLeftButtonsSizer, 1, wxEXPAND, 5 ); - - bLeftSizer->Add( bLeftSubSizerSizer, 1, wxALL|wxEXPAND, 5 ); - - bUpperSizer->Add( bLeftSizer, 1, wxALIGN_TOP|wxALL|wxEXPAND, 5 ); - - m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); - bUpperSizer->Add( m_staticline2, 0, wxALL|wxEXPAND, 5 ); - - wxBoxSizer* bRightSizer; - bRightSizer = new wxBoxSizer( wxVERTICAL ); - - m_staticText3 = new wxStaticText( this, wxID_ANY, _("FreeRoute Info:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText3->Wrap( -1 ); - m_staticText3->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - - bRightSizer->Add( m_staticText3, 0, wxALL, 5 ); - - wxBoxSizer* bRightSubSizer; - bRightSubSizer = new wxBoxSizer( wxHORIZONTAL ); - - - bRightSubSizer->Add( 20, 20, 0, 0, 5 ); - - wxBoxSizer* bRightButtonsSizer; - bRightButtonsSizer = new wxBoxSizer( wxVERTICAL ); - - m_buttonVisit = new wxButton( this, wxID_BUTTON_VISIT, _("Visit the FreeRouting.net Website with your Browser"), wxDefaultPosition, wxDefaultSize, 0 ); - bRightButtonsSizer->Add( m_buttonVisit, 0, wxALL|wxEXPAND, 5 ); - - m_staticText1 = new wxStaticText( this, wxID_ANY, _("FreeRouting.net URL"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText1->Wrap( -1 ); - bRightButtonsSizer->Add( m_staticText1, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_FreerouteURLName = new wxTextCtrl( this, wxID_TEXT_URL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_FreerouteURLName->SetToolTip( _("The URL of the FreeRouting.net website") ); - - bRightButtonsSizer->Add( m_FreerouteURLName, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - m_buttonHelp = new wxButton( this, wxID_BUTTON_HELP, _("Help"), wxDefaultPosition, wxDefaultSize, 0 ); - bRightButtonsSizer->Add( m_buttonHelp, 0, wxALL|wxEXPAND, 5 ); - - bRightSubSizer->Add( bRightButtonsSizer, 1, wxEXPAND, 5 ); - - bRightSizer->Add( bRightSubSizer, 1, wxEXPAND, 5 ); - - bUpperSizer->Add( bRightSizer, 1, wxALIGN_TOP|wxALL|wxEXPAND, 5 ); - - bMainSizer->Add( bUpperSizer, 1, wxEXPAND, 5 ); - - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bMainSizer->Add( m_staticline1, 0, wxEXPAND|wxALL, 5 ); - - m_sdbSizer1 = new wxStdDialogButtonSizer(); - m_sdbSizer1OK = new wxButton( this, wxID_OK ); - m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); - m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); - m_sdbSizer1->Realize(); - bMainSizer->Add( m_sdbSizer1, 0, wxEXPAND|wxALL, 5 ); - - this->SetSizer( bMainSizer ); - this->Layout(); - bMainSizer->Fit( this ); - - // Connect Events - m_ExportDSN->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnExportButtonClick ), NULL, this ); - m_buttonLaunchFreeroute->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnLaunchButtonClick ), NULL, this ); - m_buttonImport->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnImportButtonClick ), NULL, this ); - m_buttonVisit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnVisitButtonClick ), NULL, this ); - m_FreerouteURLName->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnTextEditFrUrlUpdated ), NULL, this ); - m_buttonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnHelpButtonClick ), NULL, this ); - m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnCancelButtonClick ), NULL, this ); - m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnOKButtonClick ), NULL, this ); -} - -DIALOG_FREEROUTE_BASE::~DIALOG_FREEROUTE_BASE() -{ - // Disconnect Events - m_ExportDSN->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnExportButtonClick ), NULL, this ); - m_buttonLaunchFreeroute->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnLaunchButtonClick ), NULL, this ); - m_buttonImport->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnImportButtonClick ), NULL, this ); - m_buttonVisit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnVisitButtonClick ), NULL, this ); - m_FreerouteURLName->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnTextEditFrUrlUpdated ), NULL, this ); - m_buttonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnHelpButtonClick ), NULL, this ); - m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnCancelButtonClick ), NULL, this ); - m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnOKButtonClick ), NULL, this ); -} +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Apr 10 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include "dialog_freeroute_exchange_base.h" + +/////////////////////////////////////////////////////////////////////////// + +DIALOG_FREEROUTE_BASE::DIALOG_FREEROUTE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* bMainSizer; + bMainSizer = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer* bUpperSizer; + bUpperSizer = new wxBoxSizer( wxHORIZONTAL ); + + wxBoxSizer* bLeftSizer; + bLeftSizer = new wxBoxSizer( wxVERTICAL ); + + m_staticText2 = new wxStaticText( this, wxID_ANY, _("Export/Import to/from FreeRoute:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText2->Wrap( -1 ); + m_staticText2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + + bLeftSizer->Add( m_staticText2, 0, wxALL, 5 ); + + wxBoxSizer* bLeftSubSizerSizer; + bLeftSubSizerSizer = new wxBoxSizer( wxHORIZONTAL ); + + + bLeftSubSizerSizer->Add( 20, 20, 0, 0, 5 ); + + wxBoxSizer* bLeftButtonsSizer; + bLeftButtonsSizer = new wxBoxSizer( wxVERTICAL ); + + m_ExportDSN = new wxButton( this, ID_BUTTON_EXPORT_DSN, _("Export a Specctra Design (*.dsn) File"), wxDefaultPosition, wxDefaultSize, 0 ); + m_ExportDSN->SetToolTip( _("Export a Specctra DSN file (to FreeRouter)") ); + + bLeftButtonsSizer->Add( m_ExportDSN, 0, wxALL|wxEXPAND, 5 ); + + m_buttonLaunchFreeroute = new wxButton( this, wxID_BUTTON_LAUNCH, _("Launch FreeRouter via Java Web Start"), wxDefaultPosition, wxDefaultSize, 0 ); + m_buttonLaunchFreeroute->SetToolTip( _("Use Java Web Start function to run FreeRouter via Internet (or your Browser if not found)") ); + + bLeftButtonsSizer->Add( m_buttonLaunchFreeroute, 0, wxALL|wxEXPAND, 5 ); + + m_buttonImport = new wxButton( this, wxID_BUTTON_IMPORT, _("Back Import the Specctra Session (*.ses) File"), wxDefaultPosition, wxDefaultSize, 0 ); + m_buttonImport->SetToolTip( _("Merge a session file created by FreeRouter with the current board.") ); + + bLeftButtonsSizer->Add( m_buttonImport, 0, wxALL|wxEXPAND, 5 ); + + + bLeftSubSizerSizer->Add( bLeftButtonsSizer, 1, wxEXPAND, 5 ); + + + bLeftSizer->Add( bLeftSubSizerSizer, 1, wxALL|wxEXPAND, 5 ); + + + bUpperSizer->Add( bLeftSizer, 1, wxALIGN_TOP|wxALL|wxEXPAND, 5 ); + + m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); + bUpperSizer->Add( m_staticline2, 0, wxALL|wxEXPAND, 5 ); + + wxBoxSizer* bRightSizer; + bRightSizer = new wxBoxSizer( wxVERTICAL ); + + m_staticText3 = new wxStaticText( this, wxID_ANY, _("FreeRoute Info:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText3->Wrap( -1 ); + m_staticText3->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + + bRightSizer->Add( m_staticText3, 0, wxALL, 5 ); + + wxBoxSizer* bRightSubSizer; + bRightSubSizer = new wxBoxSizer( wxHORIZONTAL ); + + + bRightSubSizer->Add( 20, 20, 0, 0, 5 ); + + wxBoxSizer* bRightButtonsSizer; + bRightButtonsSizer = new wxBoxSizer( wxVERTICAL ); + + m_buttonVisit = new wxButton( this, wxID_BUTTON_VISIT, _("Visit the FreeRouting.net Website with your Browser"), wxDefaultPosition, wxDefaultSize, 0 ); + bRightButtonsSizer->Add( m_buttonVisit, 0, wxALL|wxEXPAND, 5 ); + + m_staticText1 = new wxStaticText( this, wxID_ANY, _("FreeRouting.net URL"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText1->Wrap( -1 ); + bRightButtonsSizer->Add( m_staticText1, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_FreerouteURLName = new wxTextCtrl( this, wxID_TEXT_URL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_FreerouteURLName->SetToolTip( _("The URL of the FreeRouting.net website") ); + + bRightButtonsSizer->Add( m_FreerouteURLName, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_buttonHelp = new wxButton( this, wxID_BUTTON_HELP, _("Help"), wxDefaultPosition, wxDefaultSize, 0 ); + bRightButtonsSizer->Add( m_buttonHelp, 0, wxALL|wxEXPAND, 5 ); + + + bRightSubSizer->Add( bRightButtonsSizer, 1, wxEXPAND, 5 ); + + + bRightSizer->Add( bRightSubSizer, 1, wxEXPAND, 5 ); + + + bUpperSizer->Add( bRightSizer, 1, wxALIGN_TOP|wxALL|wxEXPAND, 5 ); + + + bMainSizer->Add( bUpperSizer, 1, wxEXPAND, 5 ); + + m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + bMainSizer->Add( m_staticline1, 0, wxEXPAND|wxALL, 5 ); + + m_sdbSizer1 = new wxStdDialogButtonSizer(); + m_sdbSizer1OK = new wxButton( this, wxID_OK ); + m_sdbSizer1->AddButton( m_sdbSizer1OK ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); + m_sdbSizer1->Realize(); + + bMainSizer->Add( m_sdbSizer1, 0, wxEXPAND|wxALL, 5 ); + + + this->SetSizer( bMainSizer ); + this->Layout(); + bMainSizer->Fit( this ); + + // Connect Events + m_ExportDSN->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnExportButtonClick ), NULL, this ); + m_buttonLaunchFreeroute->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnLaunchButtonClick ), NULL, this ); + m_buttonImport->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnImportButtonClick ), NULL, this ); + m_buttonVisit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnVisitButtonClick ), NULL, this ); + m_FreerouteURLName->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnTextEditFrUrlUpdated ), NULL, this ); + m_buttonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnHelpButtonClick ), NULL, this ); + m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnCancelButtonClick ), NULL, this ); + m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnOKButtonClick ), NULL, this ); +} + +DIALOG_FREEROUTE_BASE::~DIALOG_FREEROUTE_BASE() +{ + // Disconnect Events + m_ExportDSN->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnExportButtonClick ), NULL, this ); + m_buttonLaunchFreeroute->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnLaunchButtonClick ), NULL, this ); + m_buttonImport->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnImportButtonClick ), NULL, this ); + m_buttonVisit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnVisitButtonClick ), NULL, this ); + m_FreerouteURLName->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnTextEditFrUrlUpdated ), NULL, this ); + m_buttonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnHelpButtonClick ), NULL, this ); + m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnCancelButtonClick ), NULL, this ); + m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnOKButtonClick ), NULL, this ); + +} diff --git a/pcbnew/dialogs/dialog_freeroute_exchange_base.fbp b/pcbnew/dialogs/dialog_freeroute_exchange_base.fbp index 72ac33d808..5f0a47d4ba 100644 --- a/pcbnew/dialogs/dialog_freeroute_exchange_base.fbp +++ b/pcbnew/dialogs/dialog_freeroute_exchange_base.fbp @@ -1,10 +1,14 @@ - + - + C++ 1 + source_name + 0 + 0 + res UTF-8 connect dialog_freeroute_exchange_base @@ -12,66 +16,78 @@ none 1 dialog_freeroute_exchange_base - + . - + 1 + 1 + 1 0 0 - - - + 0 + wxAUI_MGR_DEFAULT + + + + 1 1 - - - + impl_virtual + + + 0 wxID_ANY - - + + DIALOG_FREEROUTE_BASE - + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + DIALOG_SHIM; dialog_shim.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bMainSizer wxVERTICAL none @@ -80,7 +96,7 @@ wxEXPAND 1 - + bUpperSizer wxHORIZONTAL none @@ -89,7 +105,7 @@ wxALIGN_TOP|wxALL|wxEXPAND 1 - + bLeftSizer wxVERTICAL none @@ -98,50 +114,82 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - + + 1 ,90,92,-1,70,0 + 0 0 wxID_ANY Export/Import to/from FreeRoute: - - + + 0 + + + 0 + + 1 m_staticText2 + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -149,13 +197,13 @@ wxALL|wxEXPAND 1 - + bLeftSubSizerSizer wxHORIZONTAL none 5 - + 0 20 @@ -168,7 +216,7 @@ wxEXPAND 1 - + bLeftButtonsSizer wxVERTICAL none @@ -177,51 +225,87 @@ wxALL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_BUTTON_EXPORT_DSN Export a Specctra Design (*.dsn) File - - + + 0 + + + 0 + + 1 m_ExportDSN + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 Export a Specctra DSN file (to FreeRouter) - - - + + wxFILTER_NONE + wxDefaultValidator + + + + OnExportButtonClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -229,51 +313,87 @@ wxALL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_BUTTON_LAUNCH Launch FreeRouter via Java Web Start - - + + 0 + + + 0 + + 1 m_buttonLaunchFreeroute + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 Use Java Web Start function to run FreeRouter via Internet (or your Browser if not found) - - - + + wxFILTER_NONE + wxDefaultValidator + + + + OnLaunchButtonClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -281,51 +401,87 @@ wxALL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_BUTTON_IMPORT Back Import the Specctra Session (*.ses) File - - + + 0 + + + 0 + + 1 m_buttonImport + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 Merge a session file created by FreeRouter with the current board. - - - + + wxFILTER_NONE + wxDefaultValidator + + + + OnImportButtonClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -339,48 +495,80 @@ wxALL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_staticline2 + 1 + + protected - - + 1 + + Resizable + 1 + wxLI_VERTICAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -388,7 +576,7 @@ wxALIGN_TOP|wxALL|wxEXPAND 1 - + bRightSizer wxVERTICAL none @@ -397,50 +585,82 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - + + 1 ,90,92,-1,70,0 + 0 0 wxID_ANY FreeRoute Info: - - + + 0 + + + 0 + + 1 m_staticText3 + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -448,13 +668,13 @@ wxEXPAND 1 - + bRightSubSizer wxHORIZONTAL none 5 - + 0 20 @@ -467,7 +687,7 @@ wxEXPAND 1 - + bRightButtonsSizer wxVERTICAL none @@ -476,51 +696,87 @@ wxALL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_BUTTON_VISIT Visit the FreeRouting.net Website with your Browser - - + + 0 + + + 0 + + 1 m_buttonVisit + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + OnVisitButtonClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -528,50 +784,82 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY FreeRouting.net URL - - + + 0 + + + 0 + + 1 m_staticText1 + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -579,54 +867,90 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_TEXT_URL - + + 0 + 0 - + + 0 + + 1 m_FreerouteURLName + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 The URL of the FreeRouting.net website - - - - - - - - - - - - - - - - - - - - - - - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + OnTextEditFrUrlUpdated - - - - + + + + @@ -634,51 +958,87 @@ wxALL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_BUTTON_HELP Help - - + + 0 + + + 0 + + 1 m_buttonHelp + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + OnHelpButtonClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -694,48 +1054,80 @@ wxEXPAND|wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_staticline1 + 1 + + protected - - + 1 + + Resizable + 1 + wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -751,17 +1143,17 @@ 1 0 0 - + m_sdbSizer1 protected - + OnCancelButtonClick - - - + + + OnOKButtonClick - - + + diff --git a/pcbnew/dialogs/dialog_freeroute_exchange_base.h b/pcbnew/dialogs/dialog_freeroute_exchange_base.h index 61dc9b00fa..fba49aeecd 100644 --- a/pcbnew/dialogs/dialog_freeroute_exchange_base.h +++ b/pcbnew/dialogs/dialog_freeroute_exchange_base.h @@ -1,74 +1,77 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 29 2008) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __dialog_freeroute_exchange_base__ -#define __dialog_freeroute_exchange_base__ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -#define ID_BUTTON_EXPORT_DSN 1000 -#define wxID_BUTTON_LAUNCH 1001 -#define wxID_BUTTON_IMPORT 1002 -#define wxID_BUTTON_VISIT 1003 -#define wxID_TEXT_URL 1004 -#define wxID_BUTTON_HELP 1005 - -/////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_FREEROUTE_BASE -/////////////////////////////////////////////////////////////////////////////// -class DIALOG_FREEROUTE_BASE : public wxDialog -{ - private: - - protected: - wxStaticText* m_staticText2; - - wxButton* m_ExportDSN; - wxButton* m_buttonLaunchFreeroute; - wxButton* m_buttonImport; - wxStaticLine* m_staticline2; - wxStaticText* m_staticText3; - - wxButton* m_buttonVisit; - wxStaticText* m_staticText1; - wxTextCtrl* m_FreerouteURLName; - wxButton* m_buttonHelp; - wxStaticLine* m_staticline1; - wxStdDialogButtonSizer* m_sdbSizer1; - wxButton* m_sdbSizer1OK; - wxButton* m_sdbSizer1Cancel; - - // Virtual event handlers, overide them in your derived class - virtual void OnExportButtonClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnLaunchButtonClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnImportButtonClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnVisitButtonClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnTextEditFrUrlUpdated( wxCommandEvent& event ){ event.Skip(); } - virtual void OnHelpButtonClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnCancelButtonClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnOKButtonClick( wxCommandEvent& event ){ event.Skip(); } - - - public: - DIALOG_FREEROUTE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DIALOG_FREEROUTE_BASE(); - -}; - -#endif //__dialog_freeroute_exchange_base__ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Apr 10 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#ifndef __DIALOG_FREEROUTE_EXCHANGE_BASE_H__ +#define __DIALOG_FREEROUTE_EXCHANGE_BASE_H__ + +#include +#include +#include +#include "dialog_shim.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +#define ID_BUTTON_EXPORT_DSN 1000 +#define wxID_BUTTON_LAUNCH 1001 +#define wxID_BUTTON_IMPORT 1002 +#define wxID_BUTTON_VISIT 1003 +#define wxID_TEXT_URL 1004 +#define wxID_BUTTON_HELP 1005 + +/////////////////////////////////////////////////////////////////////////////// +/// Class DIALOG_FREEROUTE_BASE +/////////////////////////////////////////////////////////////////////////////// +class DIALOG_FREEROUTE_BASE : public DIALOG_SHIM +{ + private: + + protected: + wxStaticText* m_staticText2; + wxButton* m_ExportDSN; + wxButton* m_buttonLaunchFreeroute; + wxButton* m_buttonImport; + wxStaticLine* m_staticline2; + wxStaticText* m_staticText3; + wxButton* m_buttonVisit; + wxStaticText* m_staticText1; + wxTextCtrl* m_FreerouteURLName; + wxButton* m_buttonHelp; + wxStaticLine* m_staticline1; + wxStdDialogButtonSizer* m_sdbSizer1; + wxButton* m_sdbSizer1OK; + wxButton* m_sdbSizer1Cancel; + + // Virtual event handlers, overide them in your derived class + virtual void OnExportButtonClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnLaunchButtonClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnImportButtonClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnVisitButtonClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnTextEditFrUrlUpdated( wxCommandEvent& event ) { event.Skip(); } + virtual void OnHelpButtonClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); } + + + public: + + DIALOG_FREEROUTE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_FREEROUTE_BASE(); + +}; + +#endif //__DIALOG_FREEROUTE_EXCHANGE_BASE_H__ diff --git a/pcbnew/dialogs/dialog_gen_module_position_file_base.fbp b/pcbnew/dialogs/dialog_gen_module_position_file_base.fbp index 3b7ab06836..2a1e5acf90 100644 --- a/pcbnew/dialogs/dialog_gen_module_position_file_base.fbp +++ b/pcbnew/dialogs/dialog_gen_module_position_file_base.fbp @@ -1,842 +1,804 @@ - - - - - - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - dialog_gen_module_position_file_base - 1000 - none - 1 - Dialog_Gen_Modules_Positions_base - - . - - 1 - 1 - 1 - 1 - 0 - - 1 - 1 - 1 - 1 - - 0 - - - - - - - 1 - wxBOTH - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - impl_virtual - - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - -1,-1 - 1 - DIALOG_GEN_MODULE_POSITION_BASE - 1 - - - 1 - - Resizable - 1 - -1,-1 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - DIALOG_SHIM; dialog_shim.h - Position Files: - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - OnClose - - - - - - OnInitDialog - - - - - - - - - - - - - - - - - - - - - - - m_MainSizer - wxVERTICAL - protected - - 5 - wxEXPAND - 0 - - - bUpperSizer - wxHORIZONTAL - none - - 5 - - 1 - - - bDirSizer - wxVERTICAL - none - - 5 - wxEXPAND|wxTOP|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Output directory: - - 0 - - - 0 - - 1 - m_staticTextDir - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - bSizerdirBrowse - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - 350,-1 - 1 - m_outputDirectoryName - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Target directory for plot files. Can be absolute or relative to the board file location. - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Browse... - - 0 - - - 0 - - 1 - m_browseButton - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnOutputDirectoryBrowseClicked - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxTOP|wxBOTTOM - 0 - - - bSizerOptions - wxHORIZONTAL - none - - 5 - wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Inches" "mm" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Units: - 1 - - 0 - - - 0 - - 1 - m_radioBoxUnits - 1 - - - protected - 1 - - Resizable - 0 - 1 - - wxRA_SPECIFY_COLS - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "One file per side" "One file for board" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Files: - 1 - - 0 - - - 0 - - 1 - m_radioBoxFilesCount - 1 - - - protected - 1 - - Resizable - 0 - 1 - - wxRA_SPECIFY_COLS - - 0 - Creates 2 files: one for each board side or Creates only one file containing all footprints to place - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "With INSERT attribute set" "Force INSERT attribute for all SMD footprints" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Footprints Selection: - 1 - - 0 - - - 0 - - 1 - m_radioBoxForceSmd - 1 - - - protected - 1 - - Resizable - 0 - 1 - - wxRA_SPECIFY_COLS - - 0 - Only footprints with option INSERT are listed in placement file. This option can force this option for all footprints having only SMD pads. Warning: this options will modify the board. - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - wxID_ANY - Messages: - - sbSizerMsg - wxVERTICAL - none - - - 5 - wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - -1,70 - 1 - m_messagesBox - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_MULTILINE|wxTE_READONLY - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxRIGHT - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizerButtons - protected - - OnCancelButton - - - - OnOKButton - - - - - - - - + + + + + + C++ + 1 + source_name + 0 + 0 + res + UTF-8 + connect + dialog_gen_module_position_file_base + 1000 + none + 1 + Dialog_Gen_Modules_Positions_base + + . + + 1 + 1 + 1 + 1 + 0 + + 0 + wxAUI_MGR_DEFAULT + + wxBOTH + + 1 + 1 + impl_virtual + + + + 0 + wxID_ANY + + -1,-1 + DIALOG_GEN_MODULE_POSITION_BASE + + -1,-1 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + DIALOG_SHIM; dialog_shim.h + Position Files: + + + + + + + + + + + + + + OnClose + + + + + + OnInitDialog + + + + + + + + + + + + + + + + + + + + + + + m_MainSizer + wxVERTICAL + protected + + 5 + wxEXPAND + 0 + + + bUpperSizer + wxHORIZONTAL + none + + 5 + + 1 + + + bDirSizer + wxVERTICAL + none + + 5 + wxEXPAND|wxTOP|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Output directory: + + 0 + + + 0 + + 1 + m_staticTextDir + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + bSizerdirBrowse + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 350,-1 + 1 + m_outputDirectoryName + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Target directory for plot files. Can be absolute or relative to the board file location. + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Browse... + + 0 + + + 0 + + 1 + m_browseButton + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnOutputDirectoryBrowseClicked + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxTOP|wxBOTTOM + 0 + + + bSizerOptions + wxHORIZONTAL + none + + 5 + wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Inches" "mm" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Units: + 1 + + 0 + + + 0 + + 1 + m_radioBoxUnits + 1 + + + protected + 1 + + Resizable + 0 + 1 + + wxRA_SPECIFY_COLS + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "One file per side" "One file for board" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Files: + 1 + + 0 + + + 0 + + 1 + m_radioBoxFilesCount + 1 + + + protected + 1 + + Resizable + 0 + 1 + + wxRA_SPECIFY_COLS + + 0 + Creates 2 files: one for each board side or Creates only one file containing all footprints to place + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "With INSERT attribute set" "Force INSERT attribute for all SMD footprints" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Footprints Selection: + 1 + + 0 + + + 0 + + 1 + m_radioBoxForceSmd + 1 + + + protected + 1 + + Resizable + 0 + 1 + + wxRA_SPECIFY_COLS + + 0 + Only footprints with option INSERT are listed in placement file. This option can force this option for all footprints having only SMD pads. Warning: this options will modify the board. + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY + Messages: + + sbSizerMsg + wxVERTICAL + none + + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + -1,70 + 1 + m_messagesBox + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_MULTILINE|wxTE_READONLY + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxRIGHT + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizerButtons + protected + + OnCancelButton + + + + OnOKButton + + + + + + + + diff --git a/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp b/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp index c0c475ab80..580a7e0238 100644 --- a/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp +++ b/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 17 2012) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -9,7 +9,7 @@ /////////////////////////////////////////////////////////////////////////// -DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE::DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE::DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); diff --git a/pcbnew/dialogs/dialog_general_options_BoardEditor_base.fbp b/pcbnew/dialogs/dialog_general_options_BoardEditor_base.fbp index ec41ef731a..a0ca3e7a60 100644 --- a/pcbnew/dialogs/dialog_general_options_BoardEditor_base.fbp +++ b/pcbnew/dialogs/dialog_general_options_BoardEditor_base.fbp @@ -44,7 +44,7 @@ 611,346 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + DIALOG_SHIM; dialog_shim.h General settings diff --git a/pcbnew/dialogs/dialog_general_options_BoardEditor_base.h b/pcbnew/dialogs/dialog_general_options_BoardEditor_base.h index fce8addba9..1fb3caf993 100644 --- a/pcbnew/dialogs/dialog_general_options_BoardEditor_base.h +++ b/pcbnew/dialogs/dialog_general_options_BoardEditor_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 17 2012) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -11,6 +11,7 @@ #include #include #include +#include "dialog_shim.h" #include #include #include @@ -32,7 +33,7 @@ /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE /////////////////////////////////////////////////////////////////////////////// -class DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE : public wxDialog +class DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE : public DIALOG_SHIM { private: diff --git a/pcbnew/dialogs/dialog_global_deletion_base.cpp b/pcbnew/dialogs/dialog_global_deletion_base.cpp index 53f5d5b01c..29ce125595 100644 --- a/pcbnew/dialogs/dialog_global_deletion_base.cpp +++ b/pcbnew/dialogs/dialog_global_deletion_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 30 2011) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -9,7 +9,7 @@ /////////////////////////////////////////////////////////////////////////// -DIALOG_GLOBAL_DELETION_BASE::DIALOG_GLOBAL_DELETION_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +DIALOG_GLOBAL_DELETION_BASE::DIALOG_GLOBAL_DELETION_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); @@ -46,6 +46,7 @@ DIALOG_GLOBAL_DELETION_BASE::DIALOG_GLOBAL_DELETION_BASE( wxWindow* parent, wxWi m_DelAlls = new wxCheckBox( this, wxID_ANY, _("Clear Board"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizerLeft->Add( m_DelAlls, 0, wxALL, 5 ); + bSizerUpper->Add( sbSizerLeft, 1, wxEXPAND|wxALL, 5 ); wxBoxSizer* bSizerRight; @@ -68,6 +69,7 @@ DIALOG_GLOBAL_DELETION_BASE::DIALOG_GLOBAL_DELETION_BASE( wxWindow* parent, wxWi m_TrackFilterVias->SetValue(true); sbTrackFilter->Add( m_TrackFilterVias, 0, wxALL, 5 ); + bSizerRight->Add( sbTrackFilter, 0, wxALL|wxEXPAND, 5 ); wxString m_rbLayersOptionChoices[] = { _("All Layers"), _("Current Layer Only") }; @@ -83,8 +85,10 @@ DIALOG_GLOBAL_DELETION_BASE::DIALOG_GLOBAL_DELETION_BASE( wxWindow* parent, wxWi m_textCtrlCurrLayer = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); bSizerRight->Add( m_textCtrlCurrLayer, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bSizerUpper->Add( bSizerRight, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + bSizerMain->Add( bSizerUpper, 0, wxEXPAND, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); @@ -96,8 +100,10 @@ DIALOG_GLOBAL_DELETION_BASE::DIALOG_GLOBAL_DELETION_BASE( wxWindow* parent, wxWi m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); + bSizerMain->Add( m_sdbSizer1, 0, wxEXPAND, 5 ); + this->SetSizer( bSizerMain ); this->Layout(); diff --git a/pcbnew/dialogs/dialog_global_deletion_base.fbp b/pcbnew/dialogs/dialog_global_deletion_base.fbp index b2d308aff3..2c6aef17c3 100644 --- a/pcbnew/dialogs/dialog_global_deletion_base.fbp +++ b/pcbnew/dialogs/dialog_global_deletion_base.fbp @@ -1,11 +1,12 @@ - + C++ 1 source_name + 0 0 res UTF-8 @@ -19,66 +20,33 @@ . 1 + 1 1 0 0 - 1 - 1 - 1 - 1 0 - - + wxAUI_MGR_DEFAULT - - 1 wxBOTH - 0 - 1 1 - 0 - Dock - 0 - Left 1 impl_virtual - 1 - 0 0 wxID_ANY - - - 0 - - 0 - 1 DIALOG_GLOBAL_DELETION_BASE - 1 - - - 1 - - Resizable - - 1 365,292 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + DIALOG_SHIM; dialog_shim.h - 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -153,7 +121,10 @@ 1 1 1 + + + @@ -175,7 +146,6 @@ 0 wxID_ANY Delete Zones - 0 @@ -190,9 +160,7 @@ protected 1 - Resizable - 1 @@ -241,7 +209,10 @@ 1 1 1 + + + @@ -263,7 +234,6 @@ 0 wxID_ANY Delete Texts - 0 @@ -278,9 +248,7 @@ protected 1 - Resizable - 1 @@ -329,7 +297,10 @@ 1 1 1 + + + @@ -351,7 +322,6 @@ 0 wxID_ANY Delete Board Outlines - 0 @@ -366,9 +336,7 @@ protected 1 - Resizable - 1 @@ -417,7 +385,10 @@ 1 1 1 + + + @@ -439,7 +410,6 @@ 0 wxID_ANY Delete Drawings - 0 @@ -454,9 +424,7 @@ protected 1 - Resizable - 1 @@ -505,7 +473,10 @@ 1 1 1 + + + @@ -527,7 +498,6 @@ 0 wxID_ANY Delete Modules - 0 @@ -542,9 +512,7 @@ protected 1 - Resizable - 1 @@ -593,7 +561,10 @@ 1 1 1 + + + @@ -615,7 +586,6 @@ 0 wxID_ANY Delete Tracks - 0 @@ -630,9 +600,7 @@ protected 1 - Resizable - 1 @@ -681,7 +649,10 @@ 1 1 1 + + + @@ -703,7 +674,6 @@ 0 wxID_ANY Delete Markers - 0 @@ -718,9 +688,7 @@ protected 1 - Resizable - 1 @@ -769,7 +737,10 @@ 1 1 1 + + + @@ -791,7 +762,6 @@ 0 wxID_ANY Clear Board - 0 @@ -806,9 +776,7 @@ protected 1 - Resizable - 1 @@ -880,7 +848,10 @@ 1 1 1 + + + @@ -902,7 +873,6 @@ 0 wxID_ANY AutoRouted Tracks - 0 @@ -917,9 +887,7 @@ protected 1 - Resizable - 1 @@ -968,7 +936,10 @@ 1 1 1 + + + @@ -990,7 +961,6 @@ 0 wxID_ANY Locked Tracks - 0 @@ -1005,9 +975,7 @@ protected 1 - Resizable - 1 @@ -1056,7 +1024,10 @@ 1 1 1 + + + @@ -1078,7 +1049,6 @@ 0 wxID_ANY Normal Tracks - 0 @@ -1093,9 +1063,7 @@ protected 1 - Resizable - 1 @@ -1144,7 +1112,10 @@ 1 1 1 + + + @@ -1166,7 +1137,6 @@ 0 wxID_ANY Vias - 0 @@ -1181,9 +1151,7 @@ protected 1 - Resizable - 1 @@ -1234,7 +1202,10 @@ 1 1 1 + + + @@ -1256,7 +1227,6 @@ 0 wxID_ANY Layers Filter - 1 0 @@ -1272,9 +1242,7 @@ protected 1 - Resizable - 0 1 @@ -1324,7 +1292,10 @@ 1 1 1 + + + @@ -1345,7 +1316,6 @@ 0 wxID_ANY Current layer: - 0 @@ -1360,19 +1330,13 @@ protected 1 - Resizable - 1 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -1411,7 +1375,10 @@ 1 1 1 + + + @@ -1431,7 +1398,6 @@ 0 0 wxID_ANY - 0 @@ -1447,9 +1413,7 @@ protected 1 - Resizable - 1 wxTE_READONLY @@ -1506,7 +1470,10 @@ 1 1 1 + + + @@ -1526,7 +1493,6 @@ 0 0 wxID_ANY - 0 @@ -1541,19 +1507,13 @@ protected 1 - Resizable - 1 wxLI_HORIZONTAL 0 - - wxFILTER_NONE - wxDefaultValidator - diff --git a/pcbnew/dialogs/dialog_global_deletion_base.h b/pcbnew/dialogs/dialog_global_deletion_base.h index 241a3e2bee..40985848df 100644 --- a/pcbnew/dialogs/dialog_global_deletion_base.h +++ b/pcbnew/dialogs/dialog_global_deletion_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 30 2011) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -11,6 +11,7 @@ #include #include #include +#include "dialog_shim.h" #include #include #include @@ -32,7 +33,7 @@ /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_GLOBAL_DELETION_BASE /////////////////////////////////////////////////////////////////////////////// -class DIALOG_GLOBAL_DELETION_BASE : public wxDialog +class DIALOG_GLOBAL_DELETION_BASE : public DIALOG_SHIM { private: diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp index c774108e20..910dbed412 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp @@ -1,182 +1,192 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include "dialog_global_edit_tracks_and_vias_base.h" - -/////////////////////////////////////////////////////////////////////////// - -DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) -{ - this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - - wxBoxSizer* bMainSizer; - bMainSizer = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizerCurrSettings; - bSizerCurrSettings = new wxBoxSizer( wxVERTICAL ); - - m_staticText12 = new wxStaticText( this, wxID_ANY, _("Current Settings:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText12->Wrap( -1 ); - m_staticText12->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - - bSizerCurrSettings->Add( m_staticText12, 0, wxALL, 5 ); - - wxBoxSizer* bSizerCurrSettingsLeft; - bSizerCurrSettingsLeft = new wxBoxSizer( wxHORIZONTAL ); - - - bSizerCurrSettingsLeft->Add( 20, 0, 0, 0, 5 ); - - wxBoxSizer* bSizerGrids; - bSizerGrids = new wxBoxSizer( wxVERTICAL ); - - wxFlexGridSizer* fgSizeNetInfo; - fgSizeNetInfo = new wxFlexGridSizer( 2, 2, 0, 0 ); - fgSizeNetInfo->SetFlexibleDirection( wxBOTH ); - fgSizeNetInfo->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_CurrentNetText = new wxStaticText( this, wxID_ANY, _("Current Net:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_CurrentNetText->Wrap( -1 ); - fgSizeNetInfo->Add( m_CurrentNetText, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_CurrentNetName = new wxStaticText( this, wxID_ANY, _("NetName"), wxDefaultPosition, wxDefaultSize, 0 ); - m_CurrentNetName->Wrap( -1 ); - m_CurrentNetName->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - - fgSizeNetInfo->Add( m_CurrentNetName, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_CurrentNetclassText = new wxStaticText( this, wxID_ANY, _("Current NetClass:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_CurrentNetclassText->Wrap( -1 ); - fgSizeNetInfo->Add( m_CurrentNetclassText, 0, wxALL, 5 ); - - m_CurrentNetclassName = new wxStaticText( this, wxID_ANY, _("NetClassName"), wxDefaultPosition, wxDefaultSize, 0 ); - m_CurrentNetclassName->Wrap( -1 ); - m_CurrentNetclassName->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - - fgSizeNetInfo->Add( m_CurrentNetclassName, 0, wxALL, 5 ); - - bSizerGrids->Add( fgSizeNetInfo, 0, wxEXPAND, 5 ); - - - bSizerGrids->Add( 10, 10, 0, 0, 5 ); - - m_gridDisplayCurrentSettings = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - - // Grid - m_gridDisplayCurrentSettings->CreateGrid( 2, 5 ); - m_gridDisplayCurrentSettings->EnableEditing( true ); - m_gridDisplayCurrentSettings->EnableGridLines( true ); - m_gridDisplayCurrentSettings->EnableDragGridSize( true ); - m_gridDisplayCurrentSettings->SetMargins( 10, 0 ); - - // Columns - m_gridDisplayCurrentSettings->AutoSizeColumns(); - m_gridDisplayCurrentSettings->EnableDragColMove( false ); - m_gridDisplayCurrentSettings->EnableDragColSize( true ); - m_gridDisplayCurrentSettings->SetColLabelSize( 30 ); - m_gridDisplayCurrentSettings->SetColLabelValue( 0, _("Track size") ); - m_gridDisplayCurrentSettings->SetColLabelValue( 1, _("Via diameter") ); - m_gridDisplayCurrentSettings->SetColLabelValue( 2, _("Via drill") ); - m_gridDisplayCurrentSettings->SetColLabelValue( 3, _("uVia size") ); - m_gridDisplayCurrentSettings->SetColLabelValue( 4, _("uVia Drill") ); - m_gridDisplayCurrentSettings->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - - // Rows - m_gridDisplayCurrentSettings->AutoSizeRows(); - m_gridDisplayCurrentSettings->EnableDragRowSize( true ); - m_gridDisplayCurrentSettings->SetRowLabelSize( 100 ); - m_gridDisplayCurrentSettings->SetRowLabelValue( 0, _("Netclass value") ); - m_gridDisplayCurrentSettings->SetRowLabelValue( 1, _("Current value") ); - m_gridDisplayCurrentSettings->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - - // Label Appearance - - // Cell Defaults - m_gridDisplayCurrentSettings->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - bSizerGrids->Add( m_gridDisplayCurrentSettings, 1, wxALL|wxEXPAND, 5 ); - - bSizerCurrSettingsLeft->Add( bSizerGrids, 1, wxEXPAND, 5 ); - - bSizerCurrSettings->Add( bSizerCurrSettingsLeft, 1, wxEXPAND, 5 ); - - bMainSizer->Add( bSizerCurrSettings, 0, wxEXPAND, 5 ); - - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bMainSizer->Add( m_staticline1, 0, wxALL|wxEXPAND, 5 ); - - wxBoxSizer* bLowerSizer; - bLowerSizer = new wxBoxSizer( wxVERTICAL ); - - m_staticText11 = new wxStaticText( this, wxID_ANY, _("Global Edition Option:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText11->Wrap( -1 ); - m_staticText11->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - - bLowerSizer->Add( m_staticText11, 0, wxALL, 5 ); - - bMainSizer->Add( bLowerSizer, 0, wxALL|wxEXPAND, 5 ); - - wxBoxSizer* bSizerOptions; - bSizerOptions = new wxBoxSizer( wxHORIZONTAL ); - - - bSizerOptions->Add( 20, 0, 0, 0, 5 ); - - wxBoxSizer* bSizerRadioButtons; - bSizerRadioButtons = new wxBoxSizer( wxVERTICAL ); - - m_Net2CurrValueButton = new wxRadioButton( this, ID_CURRENT_VALUES_TO_CURRENT_NET, _("Set tracks and vias of the current Net to the current value"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); - m_Net2CurrValueButton->SetValue( true ); - bSizerRadioButtons->Add( m_Net2CurrValueButton, 0, wxALL, 5 ); - - m_NetUseNetclassValueButton = new wxRadioButton( this, ID_NETCLASS_VALUES_TO_CURRENT_NET, _("Set tracks and vias of the current Net to the Netclass value"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerRadioButtons->Add( m_NetUseNetclassValueButton, 0, wxALL, 5 ); - - m_radioBtn3 = new wxRadioButton( this, ID_ALL_TRACKS_VIAS, _("Set all tracks and vias to their Netclass value"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerRadioButtons->Add( m_radioBtn3, 0, wxALL, 5 ); - - m_radioBtn4 = new wxRadioButton( this, ID_ALL_VIAS, _("Set all vias (no track) to their Netclass value"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerRadioButtons->Add( m_radioBtn4, 0, wxALL, 5 ); - - m_radioBtn5 = new wxRadioButton( this, ID_ALL_TRACKS, _("Set all tracks (no via) to their Netclass value"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerRadioButtons->Add( m_radioBtn5, 0, wxALL, 5 ); - - bSizerOptions->Add( bSizerRadioButtons, 1, wxEXPAND, 5 ); - - bMainSizer->Add( bSizerOptions, 0, wxEXPAND, 5 ); - - m_sdbSizer1 = new wxStdDialogButtonSizer(); - m_sdbSizer1OK = new wxButton( this, wxID_OK ); - m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); - m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); - m_sdbSizer1->Realize(); - bMainSizer->Add( m_sdbSizer1, 0, wxEXPAND|wxALL, 5 ); - - this->SetSizer( bMainSizer ); - this->Layout(); - - // Connect Events - m_Net2CurrValueButton->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); - m_NetUseNetclassValueButton->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); - m_radioBtn3->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); - m_radioBtn4->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); - m_radioBtn5->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); - m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnCancelClick ), NULL, this ); - m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnOkClick ), NULL, this ); -} - -DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::~DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE() -{ - // Disconnect Events - m_Net2CurrValueButton->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); - m_NetUseNetclassValueButton->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); - m_radioBtn3->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); - m_radioBtn4->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); - m_radioBtn5->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); - m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnCancelClick ), NULL, this ); - m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnOkClick ), NULL, this ); -} +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Apr 10 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include "dialog_global_edit_tracks_and_vias_base.h" + +/////////////////////////////////////////////////////////////////////////// + +DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* bMainSizer; + bMainSizer = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer* bSizerCurrSettings; + bSizerCurrSettings = new wxBoxSizer( wxVERTICAL ); + + m_staticText12 = new wxStaticText( this, wxID_ANY, _("Current Settings:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText12->Wrap( -1 ); + m_staticText12->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + + bSizerCurrSettings->Add( m_staticText12, 0, wxALL, 5 ); + + wxBoxSizer* bSizerCurrSettingsLeft; + bSizerCurrSettingsLeft = new wxBoxSizer( wxHORIZONTAL ); + + + bSizerCurrSettingsLeft->Add( 20, 0, 0, 0, 5 ); + + wxBoxSizer* bSizerGrids; + bSizerGrids = new wxBoxSizer( wxVERTICAL ); + + wxFlexGridSizer* fgSizeNetInfo; + fgSizeNetInfo = new wxFlexGridSizer( 2, 2, 0, 0 ); + fgSizeNetInfo->SetFlexibleDirection( wxBOTH ); + fgSizeNetInfo->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + m_CurrentNetText = new wxStaticText( this, wxID_ANY, _("Current Net:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_CurrentNetText->Wrap( -1 ); + fgSizeNetInfo->Add( m_CurrentNetText, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_CurrentNetName = new wxStaticText( this, wxID_ANY, _("NetName"), wxDefaultPosition, wxDefaultSize, 0 ); + m_CurrentNetName->Wrap( -1 ); + m_CurrentNetName->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + + fgSizeNetInfo->Add( m_CurrentNetName, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_CurrentNetclassText = new wxStaticText( this, wxID_ANY, _("Current NetClass:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_CurrentNetclassText->Wrap( -1 ); + fgSizeNetInfo->Add( m_CurrentNetclassText, 0, wxALL, 5 ); + + m_CurrentNetclassName = new wxStaticText( this, wxID_ANY, _("NetClassName"), wxDefaultPosition, wxDefaultSize, 0 ); + m_CurrentNetclassName->Wrap( -1 ); + m_CurrentNetclassName->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + + fgSizeNetInfo->Add( m_CurrentNetclassName, 0, wxALL, 5 ); + + + bSizerGrids->Add( fgSizeNetInfo, 0, wxEXPAND, 5 ); + + + bSizerGrids->Add( 10, 10, 0, 0, 5 ); + + m_gridDisplayCurrentSettings = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + + // Grid + m_gridDisplayCurrentSettings->CreateGrid( 2, 5 ); + m_gridDisplayCurrentSettings->EnableEditing( true ); + m_gridDisplayCurrentSettings->EnableGridLines( true ); + m_gridDisplayCurrentSettings->EnableDragGridSize( true ); + m_gridDisplayCurrentSettings->SetMargins( 10, 0 ); + + // Columns + m_gridDisplayCurrentSettings->AutoSizeColumns(); + m_gridDisplayCurrentSettings->EnableDragColMove( false ); + m_gridDisplayCurrentSettings->EnableDragColSize( true ); + m_gridDisplayCurrentSettings->SetColLabelSize( 30 ); + m_gridDisplayCurrentSettings->SetColLabelValue( 0, _("Track size") ); + m_gridDisplayCurrentSettings->SetColLabelValue( 1, _("Via diameter") ); + m_gridDisplayCurrentSettings->SetColLabelValue( 2, _("Via drill") ); + m_gridDisplayCurrentSettings->SetColLabelValue( 3, _("uVia size") ); + m_gridDisplayCurrentSettings->SetColLabelValue( 4, _("uVia Drill") ); + m_gridDisplayCurrentSettings->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); + + // Rows + m_gridDisplayCurrentSettings->AutoSizeRows(); + m_gridDisplayCurrentSettings->EnableDragRowSize( true ); + m_gridDisplayCurrentSettings->SetRowLabelSize( 100 ); + m_gridDisplayCurrentSettings->SetRowLabelValue( 0, _("Netclass value") ); + m_gridDisplayCurrentSettings->SetRowLabelValue( 1, _("Current value") ); + m_gridDisplayCurrentSettings->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); + + // Label Appearance + + // Cell Defaults + m_gridDisplayCurrentSettings->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); + bSizerGrids->Add( m_gridDisplayCurrentSettings, 1, wxALL|wxEXPAND, 5 ); + + + bSizerCurrSettingsLeft->Add( bSizerGrids, 1, wxEXPAND, 5 ); + + + bSizerCurrSettings->Add( bSizerCurrSettingsLeft, 1, wxEXPAND, 5 ); + + + bMainSizer->Add( bSizerCurrSettings, 0, wxEXPAND, 5 ); + + m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + bMainSizer->Add( m_staticline1, 0, wxALL|wxEXPAND, 5 ); + + wxBoxSizer* bLowerSizer; + bLowerSizer = new wxBoxSizer( wxVERTICAL ); + + m_staticText11 = new wxStaticText( this, wxID_ANY, _("Global Edition Option:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText11->Wrap( -1 ); + m_staticText11->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + + bLowerSizer->Add( m_staticText11, 0, wxALL, 5 ); + + + bMainSizer->Add( bLowerSizer, 0, wxALL|wxEXPAND, 5 ); + + wxBoxSizer* bSizerOptions; + bSizerOptions = new wxBoxSizer( wxHORIZONTAL ); + + + bSizerOptions->Add( 20, 0, 0, 0, 5 ); + + wxBoxSizer* bSizerRadioButtons; + bSizerRadioButtons = new wxBoxSizer( wxVERTICAL ); + + m_Net2CurrValueButton = new wxRadioButton( this, ID_CURRENT_VALUES_TO_CURRENT_NET, _("Set tracks and vias of the current Net to the current value"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + m_Net2CurrValueButton->SetValue( true ); + bSizerRadioButtons->Add( m_Net2CurrValueButton, 0, wxALL, 5 ); + + m_NetUseNetclassValueButton = new wxRadioButton( this, ID_NETCLASS_VALUES_TO_CURRENT_NET, _("Set tracks and vias of the current Net to the Netclass value"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerRadioButtons->Add( m_NetUseNetclassValueButton, 0, wxALL, 5 ); + + m_radioBtn3 = new wxRadioButton( this, ID_ALL_TRACKS_VIAS, _("Set all tracks and vias to their Netclass value"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerRadioButtons->Add( m_radioBtn3, 0, wxALL, 5 ); + + m_radioBtn4 = new wxRadioButton( this, ID_ALL_VIAS, _("Set all vias (no track) to their Netclass value"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerRadioButtons->Add( m_radioBtn4, 0, wxALL, 5 ); + + m_radioBtn5 = new wxRadioButton( this, ID_ALL_TRACKS, _("Set all tracks (no via) to their Netclass value"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerRadioButtons->Add( m_radioBtn5, 0, wxALL, 5 ); + + + bSizerOptions->Add( bSizerRadioButtons, 1, wxEXPAND, 5 ); + + + bMainSizer->Add( bSizerOptions, 0, wxEXPAND, 5 ); + + m_sdbSizer1 = new wxStdDialogButtonSizer(); + m_sdbSizer1OK = new wxButton( this, wxID_OK ); + m_sdbSizer1->AddButton( m_sdbSizer1OK ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); + m_sdbSizer1->Realize(); + + bMainSizer->Add( m_sdbSizer1, 0, wxEXPAND|wxALL, 5 ); + + + this->SetSizer( bMainSizer ); + this->Layout(); + + // Connect Events + m_Net2CurrValueButton->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); + m_NetUseNetclassValueButton->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); + m_radioBtn3->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); + m_radioBtn4->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); + m_radioBtn5->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); + m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnCancelClick ), NULL, this ); + m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnOkClick ), NULL, this ); +} + +DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::~DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE() +{ + // Disconnect Events + m_Net2CurrValueButton->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); + m_NetUseNetclassValueButton->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); + m_radioBtn3->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); + m_radioBtn4->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); + m_radioBtn5->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); + m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnCancelClick ), NULL, this ); + m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnOkClick ), NULL, this ); + +} diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp index 1e0d5702bb..95c66508f4 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp @@ -1,10 +1,14 @@ - + - + C++ 1 + source_name + 0 + 0 + res UTF-8 connect dialog_global_edit_tracks_and_vias_base @@ -12,66 +16,78 @@ none 1 dialog_global_edit_tracks_and_vias_base - + . - + 1 + 1 + 1 0 0 - - - + 0 + wxAUI_MGR_DEFAULT + + + + 1 1 - - - + impl_virtual + + + 0 wxID_ANY - - + + DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE - + 711,376 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + DIALOG_SHIM; dialog_shim.h Global Edition of Tracks and Vias - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bMainSizer wxVERTICAL none @@ -80,7 +96,7 @@ wxEXPAND 0 - + bSizerCurrSettings wxVERTICAL none @@ -89,50 +105,82 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - + + 1 ,90,92,-1,70,0 + 0 0 wxID_ANY Current Settings: - - + + 0 + + + 0 + + 1 m_staticText12 + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -140,13 +188,13 @@ wxEXPAND 1 - + bSizerCurrSettingsLeft wxHORIZONTAL none 5 - + 0 0 @@ -159,7 +207,7 @@ wxEXPAND 1 - + bSizerGrids wxVERTICAL none @@ -170,10 +218,10 @@ 2 wxBOTH - - + + 0 - + fgSizeNetInfo wxFLEX_GROWMODE_SPECIFIED none @@ -184,50 +232,82 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Current Net: - - + + 0 + + + 0 + + 1 m_CurrentNetText + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -235,50 +315,82 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - + + 1 ,90,92,-1,70,0 + 0 0 wxID_ANY NetName - - + + 0 + + + 0 + + 1 m_CurrentNetName + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -286,50 +398,82 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Current NetClass: - - + + 0 + + + 0 + + 1 m_CurrentNetclassText + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -337,57 +481,89 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - + + 1 ,90,92,-1,70,0 + 0 0 wxID_ANY NetClassName - - + + 0 + + + 0 + + 1 m_CurrentNetclassName + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + 5 - + 0 10 @@ -400,110 +576,142 @@ wxALL|wxEXPAND 1 + 1 + 1 + 1 + 1 + + + + 1 1 - - - + + + + 1 + + wxALIGN_CENTRE - + wxALIGN_CENTRE + 0 + 1 wxALIGN_CENTRE 30 "Track size" "Via diameter" "Via drill" "uVia size" "uVia Drill" wxALIGN_CENTRE 5 - - + + + 1 + 0 + Dock + 0 + Left 0 1 1 1 1 1 - - - + + 1 + + 1 + 0 0 wxID_ANY - - - + + + 0 10 - - + + 0 + + + 0 + + 1 m_gridDisplayCurrentSettings + 1 + + protected - + 1 + + Resizable wxALIGN_CENTRE 100 "Netclass value" "Current value" wxALIGN_CENTRE - + 2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -517,48 +725,80 @@ wxALL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_staticline1 + 1 + + protected - - + 1 + + Resizable + 1 + wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -566,7 +806,7 @@ wxALL|wxEXPAND 0 - + bLowerSizer wxVERTICAL none @@ -575,50 +815,82 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - + + 1 ,90,92,-1,70,0 + 0 0 wxID_ANY Global Edition Option: - - + + 0 + + + 0 + + 1 m_staticText11 + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -628,13 +900,13 @@ wxEXPAND 0 - + bSizerOptions wxHORIZONTAL none 5 - + 0 0 @@ -647,7 +919,7 @@ wxEXPAND 1 - + bSizerRadioButtons wxVERTICAL none @@ -656,51 +928,87 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_CURRENT_VALUES_TO_CURRENT_NET Set tracks and vias of the current Net to the current value - - + + 0 + + + 0 + + 1 m_Net2CurrValueButton + 1 + + protected - - + 1 + + Resizable + 1 + wxRB_GROUP - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + 1 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + OnSelectionClick - - - - - - + + + + + + @@ -708,51 +1016,87 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_NETCLASS_VALUES_TO_CURRENT_NET Set tracks and vias of the current Net to the Netclass value - - + + 0 + + + 0 + + 1 m_NetUseNetclassValueButton + 1 + + protected - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + 0 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + OnSelectionClick - - - - - - + + + + + + @@ -760,51 +1104,87 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_ALL_TRACKS_VIAS Set all tracks and vias to their Netclass value - - + + 0 + + + 0 + + 1 m_radioBtn3 + 1 + + protected - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + 0 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + OnSelectionClick - - - - - - + + + + + + @@ -812,51 +1192,87 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_ALL_VIAS Set all vias (no track) to their Netclass value - - + + 0 + + + 0 + + 1 m_radioBtn4 + 1 + + protected - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + 0 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + OnSelectionClick - - - - - - + + + + + + @@ -864,51 +1280,87 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_ALL_TRACKS Set all tracks (no via) to their Netclass value - - + + 0 + + + 0 + + 1 m_radioBtn5 + 1 + + protected - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + 0 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + OnSelectionClick - - - - - - + + + + + + @@ -928,17 +1380,17 @@ 1 0 0 - + m_sdbSizer1 protected - + OnCancelClick - - - + + + OnOkClick - - + + diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h index adba275d76..4085f7b750 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h @@ -1,74 +1,74 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __dialog_global_edit_tracks_and_vias_base__ -#define __dialog_global_edit_tracks_and_vias_base__ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -#define ID_CURRENT_VALUES_TO_CURRENT_NET 1000 -#define ID_NETCLASS_VALUES_TO_CURRENT_NET 1001 -#define ID_ALL_TRACKS_VIAS 1002 -#define ID_ALL_VIAS 1003 -#define ID_ALL_TRACKS 1004 - -/////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE -/////////////////////////////////////////////////////////////////////////////// -class DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE : public wxDialog -{ - private: - - protected: - wxStaticText* m_staticText12; - - wxStaticText* m_CurrentNetText; - wxStaticText* m_CurrentNetName; - wxStaticText* m_CurrentNetclassText; - wxStaticText* m_CurrentNetclassName; - - wxGrid* m_gridDisplayCurrentSettings; - wxStaticLine* m_staticline1; - wxStaticText* m_staticText11; - - wxRadioButton* m_Net2CurrValueButton; - wxRadioButton* m_NetUseNetclassValueButton; - wxRadioButton* m_radioBtn3; - wxRadioButton* m_radioBtn4; - wxRadioButton* m_radioBtn5; - wxStdDialogButtonSizer* m_sdbSizer1; - wxButton* m_sdbSizer1OK; - wxButton* m_sdbSizer1Cancel; - - // Virtual event handlers, overide them in your derived class - virtual void OnSelectionClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); } - - - public: - DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Global Edition of Tracks and Vias"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 711,376 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE(); - -}; - -#endif //__dialog_global_edit_tracks_and_vias_base__ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Apr 10 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#ifndef __DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE_H__ +#define __DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE_H__ + +#include +#include +#include +#include "dialog_shim.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +#define ID_CURRENT_VALUES_TO_CURRENT_NET 1000 +#define ID_NETCLASS_VALUES_TO_CURRENT_NET 1001 +#define ID_ALL_TRACKS_VIAS 1002 +#define ID_ALL_VIAS 1003 +#define ID_ALL_TRACKS 1004 + +/////////////////////////////////////////////////////////////////////////////// +/// Class DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE +/////////////////////////////////////////////////////////////////////////////// +class DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE : public DIALOG_SHIM +{ + private: + + protected: + wxStaticText* m_staticText12; + wxStaticText* m_CurrentNetText; + wxStaticText* m_CurrentNetName; + wxStaticText* m_CurrentNetclassText; + wxStaticText* m_CurrentNetclassName; + wxGrid* m_gridDisplayCurrentSettings; + wxStaticLine* m_staticline1; + wxStaticText* m_staticText11; + wxRadioButton* m_Net2CurrValueButton; + wxRadioButton* m_NetUseNetclassValueButton; + wxRadioButton* m_radioBtn3; + wxRadioButton* m_radioBtn4; + wxRadioButton* m_radioBtn5; + wxStdDialogButtonSizer* m_sdbSizer1; + wxButton* m_sdbSizer1OK; + wxButton* m_sdbSizer1Cancel; + + // Virtual event handlers, overide them in your derived class + virtual void OnSelectionClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } + + + public: + + DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Global Edition of Tracks and Vias"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 711,376 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE(); + +}; + +#endif //__DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE_H__ diff --git a/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp b/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp index 972d13bc16..55bdafa7c3 100644 --- a/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp +++ b/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 30 2011) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -9,7 +9,7 @@ /////////////////////////////////////////////////////////////////////////// -DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize ); @@ -69,6 +69,7 @@ DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE( wxWind m_EndPointYUnit->Wrap( -1 ); fgUpperLeftGridSizer->Add( m_EndPointYUnit, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); + bUpperSizer->Add( fgUpperLeftGridSizer, 1, wxEXPAND, 5 ); m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); @@ -116,6 +117,7 @@ DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE( wxWind m_DefaulThicknessTextUnit->Wrap( -1 ); fgUpperRightGridSizer->Add( m_DefaulThicknessTextUnit, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); + bUpperRightSizer->Add( fgUpperRightGridSizer, 0, wxEXPAND, 5 ); wxFlexGridSizer* fgLowerRightSizer; @@ -135,10 +137,13 @@ DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE( wxWind fgLowerRightSizer->Add( m_LayerSelectionCtrl, 0, wxEXPAND|wxALL, 5 ); + bUpperRightSizer->Add( fgLowerRightSizer, 1, wxEXPAND, 5 ); + bUpperSizer->Add( bUpperRightSizer, 1, wxEXPAND, 5 ); + bMainSizer->Add( bUpperSizer, 1, wxALL|wxEXPAND, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); @@ -150,8 +155,10 @@ DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE( wxWind m_StandardButtonsSizerCancel = new wxButton( this, wxID_CANCEL ); m_StandardButtonsSizer->AddButton( m_StandardButtonsSizerCancel ); m_StandardButtonsSizer->Realize(); + bMainSizer->Add( m_StandardButtonsSizer, 0, wxALIGN_BOTTOM|wxALIGN_RIGHT|wxALL, 5 ); + this->SetSizer( bMainSizer ); this->Layout(); diff --git a/pcbnew/dialogs/dialog_graphic_item_properties_base.fbp b/pcbnew/dialogs/dialog_graphic_item_properties_base.fbp index 9c2cb7784f..5423d84ca9 100644 --- a/pcbnew/dialogs/dialog_graphic_item_properties_base.fbp +++ b/pcbnew/dialogs/dialog_graphic_item_properties_base.fbp @@ -2,10 +2,11 @@ - + C++ 1 source_name + 0 0 res UTF-8 @@ -15,111 +16,78 @@ none 1 DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE - + . - + 1 + 1 1 0 0 - 1 - 1 - 1 - 1 0 - - - - - 1 + wxAUI_MGR_DEFAULT + wxBOTH - 0 - 1 - + 1 - 0 - Dock - 0 - Left 1 impl_virtual - - - 1 - - 0 + + + 0 wxID_ANY - - - 0 - - - 0 + -1,-1 - 1 DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE - 1 - - - 1 - - - Resizable - - 1 + 537,215 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU - + DIALOG_SHIM; dialog_shim.h Graphic Item Properties - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - + + + + + + + + + + + + + OnClose - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + bMainSizer wxVERTICAL none @@ -128,7 +96,7 @@ wxALL|wxEXPAND 1 - + bUpperSizer wxHORIZONTAL none @@ -140,9 +108,9 @@ 3 wxBOTH 1 - + 0 - + fgUpperLeftGridSizer wxFLEX_GROWMODE_SPECIFIED none @@ -157,82 +125,78 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 0 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Start point X - - + 0 - - + + 0 - + 1 m_StartPointXLabel 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -244,86 +208,86 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - - + 0 - + 0 - + 0 - + 1 m_Center_StartXCtrl 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -335,82 +299,78 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Unit - - + 0 - - + + 0 - + 1 m_StartPointXUnit 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -422,82 +382,78 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 0 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Start point Y - - + 0 - - + + 0 - + 1 m_StartPointYLabel 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -509,86 +465,86 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - - + 0 - + 0 - + 0 - + 1 m_Center_StartYCtrl 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -600,82 +556,78 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Unit - - + 0 - - + + 0 - + 1 m_StartPointYUnit 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -687,82 +639,78 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 0 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY End point X - - + 0 - - + + 0 - + 1 m_EndPointXLabel 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -774,86 +722,86 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - - + 0 - + 0 - + 0 - + 1 m_EndX_Radius_Ctrl 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -865,82 +813,78 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Unit - - + 0 - - + + 0 - + 1 m_EndPointXUnit 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -952,82 +896,78 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 0 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY End point Y - - + 0 - - + + 0 - + 1 m_EndPointYLabel 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1039,86 +979,86 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - - + 0 - + 0 - + 0 - + 1 m_EndY_Ctrl 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1130,82 +1070,78 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Unit - - + 0 - - + + 0 - + 1 m_EndPointYUnit 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1219,80 +1155,76 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - - + 0 - - + + 0 - + 1 m_staticline2 1 - - + + protected 1 - - + Resizable - 1 - + wxLI_VERTICAL - + 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1300,7 +1232,7 @@ wxEXPAND 1 - + bUpperRightSizer wxVERTICAL none @@ -1312,9 +1244,9 @@ 3 wxBOTH 1 - + 0 - + fgUpperRightGridSizer wxFLEX_GROWMODE_SPECIFIED none @@ -1329,82 +1261,78 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Arc angle: - - + 0 - - + + 0 - + 1 m_Angle_Text 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1416,86 +1344,86 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - - + 0 - + 0 - + 0 - + 1 m_Angle_Ctrl 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1507,82 +1435,78 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY 0.1 degree - - + 0 - - + + 0 - + 1 m_AngleUnit 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1594,82 +1518,78 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 0 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Item thickness: - - + 0 - - + + 0 - + 1 m_ThicknessLabel 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1681,86 +1601,86 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - - + 0 - + 0 - + 0 - + 1 m_ThicknessCtrl 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1772,82 +1692,78 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Unit - - + 0 - - + + 0 - + 1 m_ThicknessTextUnit 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1859,82 +1775,78 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 0 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Default thickness: - - + 0 - - + + 0 - + 1 m_DefaultThicknessLabel 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1946,86 +1858,86 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - - + 0 - + 0 - + 0 - + 1 m_DefaultThicknessCtrl 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2037,82 +1949,78 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Unit - - + 0 - - + + 0 - + 1 m_DefaulThicknessTextUnit 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2125,9 +2033,9 @@ 2 wxBOTH 1 - + 0 - + fgLowerRightSizer wxFLEX_GROWMODE_SPECIFIED none @@ -2142,82 +2050,78 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 0 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Layer: - - + 0 - - + + 0 - + 1 m_LayerLabel 1 - - + + protected 1 - - + Resizable - 1 - - - + + + 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2229,82 +2133,83 @@ 1 1 1 - - - - + + + + + + + 1 0 - + 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - - + 0 - - + + 0 - + 1 m_LayerSelectionCtrl 1 - - + + protected 1 - - + Resizable - 0 1 - - + + + 0 Select the layer on which text should lay. - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2322,80 +2227,76 @@ 1 1 1 - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - - + 0 - - + + 0 - + 1 m_staticline1 1 - - + + protected 1 - - + Resizable - 1 - + wxLI_HORIZONTAL - + 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2411,17 +2312,17 @@ 1 0 0 - + m_StandardButtonsSizer protected - + OnCancelClick - - - + + + OnOkClick - - + + diff --git a/pcbnew/dialogs/dialog_graphic_item_properties_base.h b/pcbnew/dialogs/dialog_graphic_item_properties_base.h index 45764f5aa8..195b6a3804 100644 --- a/pcbnew/dialogs/dialog_graphic_item_properties_base.h +++ b/pcbnew/dialogs/dialog_graphic_item_properties_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 30 2011) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -11,6 +11,7 @@ #include #include #include +#include "dialog_shim.h" #include #include #include @@ -30,7 +31,7 @@ /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE /////////////////////////////////////////////////////////////////////////////// -class DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE : public wxDialog +class DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE : public DIALOG_SHIM { private: diff --git a/pcbnew/dialogs/dialog_graphic_items_options_base.fbp b/pcbnew/dialogs/dialog_graphic_items_options_base.fbp index 65fe930685..4cb27e458b 100644 --- a/pcbnew/dialogs/dialog_graphic_items_options_base.fbp +++ b/pcbnew/dialogs/dialog_graphic_items_options_base.fbp @@ -2,9 +2,13 @@ - + C++ 1 + source_name + 0 + 0 + res UTF-8 connect dialog_graphic_items_options_base @@ -12,66 +16,78 @@ none 1 dialog_graphic_items_options - + . - + 1 + 1 + 1 0 0 - - - + 0 + wxAUI_MGR_DEFAULT + + + + 1 1 - - - + impl_virtual + + + 0 wxID_ANY - - + + DIALOG_GRAPHIC_ITEMS_OPTIONS_BASE - + 459,315 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + DIALOG_SHIM; dialog_shim.h Texts and Drawings - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bSizerMain wxVERTICAL none @@ -80,7 +96,7 @@ wxEXPAND 1 - + bSizerUpper wxHORIZONTAL none @@ -91,60 +107,92 @@ wxID_ANY Graphics: - + sbSizerLeft wxVERTICAL none - + 5 wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Graphic segm Width - - + + 0 + + + 0 + + 1 m_GraphicSegmWidthTitle + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -152,54 +200,90 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_OptPcbSegmWidth + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -207,50 +291,82 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Board Edges Width - - + + 0 + + + 0 + + 1 m_BoardEdgesWidthTitle + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -258,54 +374,90 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_OptPcbEdgesWidth + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -313,50 +465,82 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Copper Text Width - - + + 0 + + + 0 + + 1 m_CopperTextWidthTitle + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -364,54 +548,90 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_OptPcbTextWidth + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,50 +639,82 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Text Size V - - + + 0 + + + 0 + + 1 m_TextSizeVTitle + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -470,54 +722,90 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_OptPcbTextVSize + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -525,50 +813,82 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Text Size H - - + + 0 + + + 0 + + 1 m_TextSizeHTitle + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -576,54 +896,90 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_OptPcbTextHSize + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -635,60 +991,92 @@ wxID_ANY Modules: - + sbSizerMiddle wxVERTICAL none - + 5 wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Edges Module Width - - + + 0 + + + 0 + + 1 m_EdgeModWidthTitle + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -696,54 +1084,90 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_OptModuleEdgesWidth + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -751,50 +1175,82 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Text Module Width - - + + 0 + + + 0 + + 1 m_TextModWidthTitle + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -802,54 +1258,90 @@ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_OptModuleTextWidth + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -857,50 +1349,82 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Text Module Size V - - + + 0 + + + 0 + + 1 m_TextModSizeVTitle + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -908,54 +1432,90 @@ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_OptModuleTextVSize + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -963,50 +1523,82 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Text Module Size H - - + + 0 + + + 0 + + 1 m_TextModSizeHTitle + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1014,54 +1606,90 @@ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_OptModuleTextHSize + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1073,60 +1701,92 @@ wxID_ANY General: - + sbSizerRight wxVERTICAL none - + 5 wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Default pen size - - + + 0 + + + 0 + + 1 m_DefaultPenSizeTitle + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 Pen size used to draw items that have no pen size specified. Used mainly to draw items in sketch mode. - - - + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1134,54 +1794,90 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_DefaultPenSizeCtrl + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1201,17 +1897,17 @@ 1 0 0 - + m_sdbSizer1 protected - + OnCancelClick - - - + + + OnOkClick - - + + diff --git a/pcbnew/dialogs/dialog_layers_setup.cpp b/pcbnew/dialogs/dialog_layers_setup.cpp index 8057409c45..bf1ee5855c 100644 --- a/pcbnew/dialogs/dialog_layers_setup.cpp +++ b/pcbnew/dialogs/dialog_layers_setup.cpp @@ -73,9 +73,6 @@ struct CTLs class DIALOG_LAYERS_SETUP : public DIALOG_LAYERS_SETUP_BASE { private: - static wxPoint s_LastPos; - static wxSize s_LastSize; - PCB_EDIT_FRAME* m_Parent; int m_CopperLayerCount; @@ -175,11 +172,6 @@ public: }; -// We want our dialog to remember its previous screen position -wxPoint DIALOG_LAYERS_SETUP::s_LastPos( -1, -1 ); -wxSize DIALOG_LAYERS_SETUP::s_LastSize; - - // Layer bit masks for each defined "Preset Layer Grouping" static const int presets[] = { @@ -317,26 +309,7 @@ DIALOG_LAYERS_SETUP::DIALOG_LAYERS_SETUP( PCB_EDIT_FRAME* 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_BASE::Show( show ); - } - else - { - // Save the dialog's position before hiding - s_LastPos = GetPosition(); - s_LastSize = GetSize(); - - ret = DIALOG_LAYERS_SETUP_BASE::Show( show ); - } - - return ret; + return DIALOG_LAYERS_SETUP_BASE::Show( show ); } diff --git a/pcbnew/dialogs/dialog_layers_setup_base.cpp b/pcbnew/dialogs/dialog_layers_setup_base.cpp index 93353d70b1..59d55b9b0b 100644 --- a/pcbnew/dialogs/dialog_layers_setup_base.cpp +++ b/pcbnew/dialogs/dialog_layers_setup_base.cpp @@ -1,920 +1,929 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include "dialog_layers_setup_base.h" - -/////////////////////////////////////////////////////////////////////////// - -DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) -{ - this->SetSizeHints( wxSize( 550,600 ), wxDefaultSize ); - - wxBoxSizer* bMainSizer; - bMainSizer = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bChoicesSizer; - bChoicesSizer = new wxBoxSizer( wxHORIZONTAL ); - - wxStaticBoxSizer* sbPresetsSizer; - sbPresetsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Preset Layer Groupings") ), wxVERTICAL ); - - wxString m_PresetsChoiceChoices[] = { _("Custom"), _("Two layers, parts on Front only"), _("Two layers, parts on Back only"), _("Two layers, parts on Front and Back"), _("Four layers, parts on Front only"), _("Four layers, parts on Front and Back"), _("All layers on") }; - int m_PresetsChoiceNChoices = sizeof( m_PresetsChoiceChoices ) / sizeof( wxString ); - m_PresetsChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_PresetsChoiceNChoices, m_PresetsChoiceChoices, 0 ); - m_PresetsChoice->SetSelection( 0 ); - sbPresetsSizer->Add( m_PresetsChoice, 0, wxEXPAND, 5 ); - - bChoicesSizer->Add( sbPresetsSizer, 2, wxALL|wxEXPAND, 5 ); - - wxStaticBoxSizer* sbCopperLayersSizer; - sbCopperLayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Copper Layers") ), wxVERTICAL ); - - wxString m_CopperLayersChoiceChoices[] = { _("2"), _("4"), _("6"), _("8"), _("10"), _("12"), _("14"), _("16") }; - 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( 0 ); - sbCopperLayersSizer->Add( m_CopperLayersChoice, 0, wxEXPAND, 5 ); - - bChoicesSizer->Add( sbCopperLayersSizer, 1, wxALL|wxEXPAND, 5 ); - - bMainSizer->Add( bChoicesSizer, 0, wxEXPAND, 5 ); - - wxStaticBoxSizer* sbLayersSizer; - sbLayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layers") ), wxVERTICAL ); - - wxBoxSizer* bCaptionsSizer; - bCaptionsSizer = new wxBoxSizer( wxHORIZONTAL ); - - m_TitlePanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER|wxTAB_TRAVERSAL ); - m_TitlePanel->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_CAPTIONTEXT ) ); - m_TitlePanel->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVECAPTION ) ); - - bCaptionsSizer->Add( m_TitlePanel, 1, wxEXPAND, 5 ); - - sbLayersSizer->Add( bCaptionsSizer, 0, wxALIGN_CENTER|wxEXPAND, 5 ); - - m_LayersListPanel = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxALWAYS_SHOW_SB|wxRAISED_BORDER|wxTAB_TRAVERSAL|wxVSCROLL ); - m_LayersListPanel->SetScrollRate( 0, 5 ); - m_LayerListFlexGridSizer = new wxFlexGridSizer( 0, 3, 0, 0 ); - m_LayerListFlexGridSizer->AddGrowableCol( 0 ); - m_LayerListFlexGridSizer->AddGrowableCol( 1 ); - m_LayerListFlexGridSizer->SetFlexibleDirection( wxHORIZONTAL ); - m_LayerListFlexGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - 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_AdhesFrontPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - m_AdhesFrontPanel->SetBackgroundColour( wxColour( 236, 233, 236 ) ); - - wxBoxSizer* bSizer6; - bSizer6 = new wxBoxSizer( wxVERTICAL ); - - m_AdhesFrontCheckBox = new wxCheckBox( m_AdhesFrontPanel, ID_ADHESFRONTCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - 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|wxALL, 5 ); - - 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_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_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 ) ); - - wxBoxSizer* bSizer7; - bSizer7 = new wxBoxSizer( wxVERTICAL ); - - m_SoldPFrontCheckBox = new wxCheckBox( m_SoldPFrontPanel, ID_SOLDPFRONTCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - 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|wxALL, 5 ); - - m_SoldPFrontPanel->SetSizer( bSizer7 ); - m_SoldPFrontPanel->Layout(); - 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->Wrap( -1 ); - m_LayerListFlexGridSizer->Add( m_SoldPFrontStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - - m_SilkSFrontName = new wxStaticText( m_LayersListPanel, ID_SILKSFRONTNAME, _("SilkS_Front_later"), wxDefaultPosition, wxDefaultSize, 0 ); - m_SilkSFrontName->Wrap( -1 ); - m_LayerListFlexGridSizer->Add( m_SilkSFrontName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - - m_SilkSFrontPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_SilkSFrontPanel->SetBackgroundColour( wxColour( 255, 252, 235 ) ); - - wxBoxSizer* bSizer5; - bSizer5 = new wxBoxSizer( wxVERTICAL ); - - m_SilkSFrontCheckBox = new wxCheckBox( m_SilkSFrontPanel, ID_SILKSFRONTCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - m_SilkSFrontCheckBox->SetToolTip( _("If you want a silk screen layer for the front side of the board") ); - - 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|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - 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 ); - - m_MaskFrontName = new wxStaticText( m_LayersListPanel, ID_MASKFRONTNAME, _("Mask_Front_later"), wxDefaultPosition, wxDefaultSize, 0 ); - m_MaskFrontName->Wrap( -1 ); - m_LayerListFlexGridSizer->Add( m_MaskFrontName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - - m_MaskFrontPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_MaskFrontPanel->SetBackgroundColour( wxColour( 255, 252, 235 ) ); - - wxBoxSizer* bSizer8; - bSizer8 = new wxBoxSizer( wxVERTICAL ); - - m_MaskFrontCheckBox = new wxCheckBox( m_MaskFrontPanel, ID_MASKFRONTCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - m_MaskFrontCheckBox->SetToolTip( _("If you want a solder mask layer for the front of the board") ); - - 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|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - 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_later"), wxDefaultPosition, wxDefaultSize, 0 ); - m_FrontName->SetMaxLength( 20 ); - m_FrontName->SetToolTip( _("Layer name of front (top) copper layer") ); - - m_LayerListFlexGridSizer->Add( m_FrontName, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_FrontPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_FrontPanel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); - - wxBoxSizer* bSizer9; - bSizer9 = new wxBoxSizer( wxVERTICAL ); - - m_FrontCheckBox = new wxCheckBox( m_FrontPanel, ID_FRONTCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - m_FrontCheckBox->SetToolTip( _("If you want a front copper layer") ); - - bSizer9->Add( m_FrontCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_FrontPanel->SetSizer( bSizer9 ); - m_FrontPanel->Layout(); - bSizer9->Fit( m_FrontPanel ); - m_LayerListFlexGridSizer->Add( m_FrontPanel, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 ); - - wxString m_FrontChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; - int m_FrontChoiceNChoices = sizeof( m_FrontChoiceChoices ) / sizeof( wxString ); - m_FrontChoice = new wxChoice( m_LayersListPanel, ID_FRONTCHOICE, wxDefaultPosition, wxDefaultSize, m_FrontChoiceNChoices, m_FrontChoiceChoices, 0 ); - m_FrontChoice->SetSelection( 0 ); - m_FrontChoice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); - - m_LayerListFlexGridSizer->Add( m_FrontChoice, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - - m_Inner2Name = new wxTextCtrl( m_LayersListPanel, ID_INNER2NAME, _("Inner2"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Inner2Name->SetMaxLength( 20 ); - m_LayerListFlexGridSizer->Add( m_Inner2Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner2Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_Inner2Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); - - wxBoxSizer* bInner2Sizer; - bInner2Sizer = new wxBoxSizer( wxVERTICAL ); - - m_Inner2CheckBox = new wxCheckBox( m_Inner2Panel, ID_INNER2CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - bInner2Sizer->Add( m_Inner2CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_Inner2Panel->SetSizer( bInner2Sizer ); - m_Inner2Panel->Layout(); - bInner2Sizer->Fit( m_Inner2Panel ); - m_LayerListFlexGridSizer->Add( m_Inner2Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); - - wxString m_Inner2ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; - int m_Inner2ChoiceNChoices = sizeof( m_Inner2ChoiceChoices ) / sizeof( wxString ); - m_Inner2Choice = new wxChoice( m_LayersListPanel, ID_INNER2CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner2ChoiceNChoices, m_Inner2ChoiceChoices, 0 ); - m_Inner2Choice->SetSelection( 0 ); - m_Inner2Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); - - m_LayerListFlexGridSizer->Add( m_Inner2Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner3Name = new wxTextCtrl( m_LayersListPanel, ID_INNER3NAME, _("Inner3"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Inner3Name->SetMaxLength( 20 ); - m_LayerListFlexGridSizer->Add( m_Inner3Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner3Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_Inner3Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); - - wxBoxSizer* bInner3Sizer; - bInner3Sizer = new wxBoxSizer( wxVERTICAL ); - - m_Inner3CheckBox = new wxCheckBox( m_Inner3Panel, ID_INNER3CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - bInner3Sizer->Add( m_Inner3CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_Inner3Panel->SetSizer( bInner3Sizer ); - m_Inner3Panel->Layout(); - bInner3Sizer->Fit( m_Inner3Panel ); - m_LayerListFlexGridSizer->Add( m_Inner3Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - wxString m_Inner3ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; - int m_Inner3ChoiceNChoices = sizeof( m_Inner3ChoiceChoices ) / sizeof( wxString ); - m_Inner3Choice = new wxChoice( m_LayersListPanel, ID_INNER3CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner3ChoiceNChoices, m_Inner3ChoiceChoices, 0 ); - m_Inner3Choice->SetSelection( 0 ); - m_Inner3Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); - - m_LayerListFlexGridSizer->Add( m_Inner3Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner4Name = new wxTextCtrl( m_LayersListPanel, ID_INNER4NAME, _("Inner4"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Inner4Name->SetMaxLength( 20 ); - m_LayerListFlexGridSizer->Add( m_Inner4Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner4Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_Inner4Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); - - wxBoxSizer* bInner4Sizer; - bInner4Sizer = new wxBoxSizer( wxVERTICAL ); - - m_Inner4CheckBox = new wxCheckBox( m_Inner4Panel, ID_INNER4CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - bInner4Sizer->Add( m_Inner4CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_Inner4Panel->SetSizer( bInner4Sizer ); - m_Inner4Panel->Layout(); - bInner4Sizer->Fit( m_Inner4Panel ); - m_LayerListFlexGridSizer->Add( m_Inner4Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - wxString m_Inner4ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; - int m_Inner4ChoiceNChoices = sizeof( m_Inner4ChoiceChoices ) / sizeof( wxString ); - m_Inner4Choice = new wxChoice( m_LayersListPanel, ID_INNER4CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner4ChoiceNChoices, m_Inner4ChoiceChoices, 0 ); - m_Inner4Choice->SetSelection( 0 ); - m_Inner4Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); - - m_LayerListFlexGridSizer->Add( m_Inner4Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner5Name = new wxTextCtrl( m_LayersListPanel, ID_INNER5NAME, _("Inner5"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Inner5Name->SetMaxLength( 20 ); - m_LayerListFlexGridSizer->Add( m_Inner5Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner5Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_Inner5Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); - - wxBoxSizer* bInner5Sizer; - bInner5Sizer = new wxBoxSizer( wxVERTICAL ); - - m_Inner5CheckBox = new wxCheckBox( m_Inner5Panel, ID_INNER5CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - bInner5Sizer->Add( m_Inner5CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_Inner5Panel->SetSizer( bInner5Sizer ); - m_Inner5Panel->Layout(); - bInner5Sizer->Fit( m_Inner5Panel ); - m_LayerListFlexGridSizer->Add( m_Inner5Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - wxString m_Inner5ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; - int m_Inner5ChoiceNChoices = sizeof( m_Inner5ChoiceChoices ) / sizeof( wxString ); - m_Inner5Choice = new wxChoice( m_LayersListPanel, ID_INNER5CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner5ChoiceNChoices, m_Inner5ChoiceChoices, 0 ); - m_Inner5Choice->SetSelection( 0 ); - m_Inner5Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); - - m_LayerListFlexGridSizer->Add( m_Inner5Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner6Name = new wxTextCtrl( m_LayersListPanel, ID_INNER6NAME, _("Inner6"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Inner6Name->SetMaxLength( 20 ); - m_LayerListFlexGridSizer->Add( m_Inner6Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner6Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_Inner6Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); - - wxBoxSizer* bInner6Sizer; - bInner6Sizer = new wxBoxSizer( wxVERTICAL ); - - m_Inner6CheckBox = new wxCheckBox( m_Inner6Panel, ID_INNER6CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - bInner6Sizer->Add( m_Inner6CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_Inner6Panel->SetSizer( bInner6Sizer ); - m_Inner6Panel->Layout(); - bInner6Sizer->Fit( m_Inner6Panel ); - m_LayerListFlexGridSizer->Add( m_Inner6Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - wxString m_Inner6ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; - int m_Inner6ChoiceNChoices = sizeof( m_Inner6ChoiceChoices ) / sizeof( wxString ); - m_Inner6Choice = new wxChoice( m_LayersListPanel, ID_INNER6CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner6ChoiceNChoices, m_Inner6ChoiceChoices, 0 ); - m_Inner6Choice->SetSelection( 0 ); - m_Inner6Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); - - m_LayerListFlexGridSizer->Add( m_Inner6Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner7Name = new wxTextCtrl( m_LayersListPanel, ID_INNER7NAME, _("Inner7"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Inner7Name->SetMaxLength( 20 ); - m_LayerListFlexGridSizer->Add( m_Inner7Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner7Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_Inner7Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); - - wxBoxSizer* bInner7Sizer; - bInner7Sizer = new wxBoxSizer( wxVERTICAL ); - - m_Inner7CheckBox = new wxCheckBox( m_Inner7Panel, ID_INNER7CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - bInner7Sizer->Add( m_Inner7CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_Inner7Panel->SetSizer( bInner7Sizer ); - m_Inner7Panel->Layout(); - bInner7Sizer->Fit( m_Inner7Panel ); - m_LayerListFlexGridSizer->Add( m_Inner7Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); - - wxString m_Inner7ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; - int m_Inner7ChoiceNChoices = sizeof( m_Inner7ChoiceChoices ) / sizeof( wxString ); - m_Inner7Choice = new wxChoice( m_LayersListPanel, ID_INNER7CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner7ChoiceNChoices, m_Inner7ChoiceChoices, 0 ); - m_Inner7Choice->SetSelection( 0 ); - m_Inner7Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); - - m_LayerListFlexGridSizer->Add( m_Inner7Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner8Name = new wxTextCtrl( m_LayersListPanel, ID_INNER8NAME, _("Inner8"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Inner8Name->SetMaxLength( 20 ); - m_LayerListFlexGridSizer->Add( m_Inner8Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner8Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_Inner8Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); - - wxBoxSizer* bInner8Sizer; - bInner8Sizer = new wxBoxSizer( wxVERTICAL ); - - m_Inner8CheckBox = new wxCheckBox( m_Inner8Panel, ID_INNER8CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - bInner8Sizer->Add( m_Inner8CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_Inner8Panel->SetSizer( bInner8Sizer ); - m_Inner8Panel->Layout(); - bInner8Sizer->Fit( m_Inner8Panel ); - m_LayerListFlexGridSizer->Add( m_Inner8Panel, 1, wxEXPAND, 5 ); - - wxString m_Inner8ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; - int m_Inner8ChoiceNChoices = sizeof( m_Inner8ChoiceChoices ) / sizeof( wxString ); - m_Inner8Choice = new wxChoice( m_LayersListPanel, ID_INNER8CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner8ChoiceNChoices, m_Inner8ChoiceChoices, 0 ); - m_Inner8Choice->SetSelection( 0 ); - m_Inner8Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); - - m_LayerListFlexGridSizer->Add( m_Inner8Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner9Name = new wxTextCtrl( m_LayersListPanel, ID_INNER9NAME, _("Inner9"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Inner9Name->SetMaxLength( 20 ); - m_LayerListFlexGridSizer->Add( m_Inner9Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner9Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_Inner9Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); - - wxBoxSizer* bInner9Sizer; - bInner9Sizer = new wxBoxSizer( wxVERTICAL ); - - m_Inner9CheckBox = new wxCheckBox( m_Inner9Panel, ID_INNER9CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - bInner9Sizer->Add( m_Inner9CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_Inner9Panel->SetSizer( bInner9Sizer ); - m_Inner9Panel->Layout(); - bInner9Sizer->Fit( m_Inner9Panel ); - m_LayerListFlexGridSizer->Add( m_Inner9Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - wxString m_Inner9ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; - int m_Inner9ChoiceNChoices = sizeof( m_Inner9ChoiceChoices ) / sizeof( wxString ); - m_Inner9Choice = new wxChoice( m_LayersListPanel, ID_INNER9CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner9ChoiceNChoices, m_Inner9ChoiceChoices, 0 ); - m_Inner9Choice->SetSelection( 0 ); - m_Inner9Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); - - m_LayerListFlexGridSizer->Add( m_Inner9Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner10Name = new wxTextCtrl( m_LayersListPanel, ID_INNER10NAME, _("Inner10"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Inner10Name->SetMaxLength( 20 ); - m_LayerListFlexGridSizer->Add( m_Inner10Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner10Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_Inner10Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); - - wxBoxSizer* bInner10Sizer; - bInner10Sizer = new wxBoxSizer( wxVERTICAL ); - - m_Inner10CheckBox = new wxCheckBox( m_Inner10Panel, ID_INNER10CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - bInner10Sizer->Add( m_Inner10CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_Inner10Panel->SetSizer( bInner10Sizer ); - m_Inner10Panel->Layout(); - bInner10Sizer->Fit( m_Inner10Panel ); - m_LayerListFlexGridSizer->Add( m_Inner10Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - wxString m_Inner10ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; - int m_Inner10ChoiceNChoices = sizeof( m_Inner10ChoiceChoices ) / sizeof( wxString ); - m_Inner10Choice = new wxChoice( m_LayersListPanel, ID_INNER10CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner10ChoiceNChoices, m_Inner10ChoiceChoices, 0 ); - m_Inner10Choice->SetSelection( 0 ); - m_Inner10Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); - - m_LayerListFlexGridSizer->Add( m_Inner10Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner11Name = new wxTextCtrl( m_LayersListPanel, ID_INNER11NAME, _("Inner11"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Inner11Name->SetMaxLength( 20 ); - m_LayerListFlexGridSizer->Add( m_Inner11Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner11Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_Inner11Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); - - wxBoxSizer* bInner11Sizer; - bInner11Sizer = new wxBoxSizer( wxVERTICAL ); - - m_Inner11CheckBox = new wxCheckBox( m_Inner11Panel, ID_INNER11CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - bInner11Sizer->Add( m_Inner11CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_Inner11Panel->SetSizer( bInner11Sizer ); - m_Inner11Panel->Layout(); - bInner11Sizer->Fit( m_Inner11Panel ); - m_LayerListFlexGridSizer->Add( m_Inner11Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - wxString m_Inner11ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; - int m_Inner11ChoiceNChoices = sizeof( m_Inner11ChoiceChoices ) / sizeof( wxString ); - m_Inner11Choice = new wxChoice( m_LayersListPanel, ID_INNER11CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner11ChoiceNChoices, m_Inner11ChoiceChoices, 0 ); - m_Inner11Choice->SetSelection( 0 ); - m_Inner11Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); - - m_LayerListFlexGridSizer->Add( m_Inner11Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner12Name = new wxTextCtrl( m_LayersListPanel, ID_INNER12NAME, _("Inner12"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Inner12Name->SetMaxLength( 20 ); - m_LayerListFlexGridSizer->Add( m_Inner12Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner12Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_Inner12Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); - - wxBoxSizer* bInner12Sizer; - bInner12Sizer = new wxBoxSizer( wxVERTICAL ); - - m_Inner12CheckBox = new wxCheckBox( m_Inner12Panel, ID_INNER12CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - bInner12Sizer->Add( m_Inner12CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_Inner12Panel->SetSizer( bInner12Sizer ); - m_Inner12Panel->Layout(); - bInner12Sizer->Fit( m_Inner12Panel ); - m_LayerListFlexGridSizer->Add( m_Inner12Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - wxString m_Inner12ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; - int m_Inner12ChoiceNChoices = sizeof( m_Inner12ChoiceChoices ) / sizeof( wxString ); - m_Inner12Choice = new wxChoice( m_LayersListPanel, ID_INNER12CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner12ChoiceNChoices, m_Inner12ChoiceChoices, 0 ); - m_Inner12Choice->SetSelection( 0 ); - m_Inner12Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); - - m_LayerListFlexGridSizer->Add( m_Inner12Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner13Name = new wxTextCtrl( m_LayersListPanel, ID_INNER13NAME, _("Inner13"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Inner13Name->SetMaxLength( 20 ); - m_LayerListFlexGridSizer->Add( m_Inner13Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner13Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_Inner13Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); - - wxBoxSizer* bInner13Sizer; - bInner13Sizer = new wxBoxSizer( wxVERTICAL ); - - m_Inner13CheckBox = new wxCheckBox( m_Inner13Panel, ID_INNER13CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - bInner13Sizer->Add( m_Inner13CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_Inner13Panel->SetSizer( bInner13Sizer ); - m_Inner13Panel->Layout(); - bInner13Sizer->Fit( m_Inner13Panel ); - m_LayerListFlexGridSizer->Add( m_Inner13Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - wxString m_Inner13ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; - int m_Inner13ChoiceNChoices = sizeof( m_Inner13ChoiceChoices ) / sizeof( wxString ); - m_Inner13Choice = new wxChoice( m_LayersListPanel, ID_INNER13CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner13ChoiceNChoices, m_Inner13ChoiceChoices, 0 ); - m_Inner13Choice->SetSelection( 0 ); - m_Inner13Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); - - m_LayerListFlexGridSizer->Add( m_Inner13Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner14Name = new wxTextCtrl( m_LayersListPanel, ID_INNER14NAME, _("Inner14"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Inner14Name->SetMaxLength( 20 ); - m_LayerListFlexGridSizer->Add( m_Inner14Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner14Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_Inner14Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); - - wxBoxSizer* bInner14Sizer; - bInner14Sizer = new wxBoxSizer( wxVERTICAL ); - - m_Inner14CheckBox = new wxCheckBox( m_Inner14Panel, ID_INNER14CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - bInner14Sizer->Add( m_Inner14CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_Inner14Panel->SetSizer( bInner14Sizer ); - m_Inner14Panel->Layout(); - bInner14Sizer->Fit( m_Inner14Panel ); - m_LayerListFlexGridSizer->Add( m_Inner14Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - wxString m_Inner14ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; - int m_Inner14ChoiceNChoices = sizeof( m_Inner14ChoiceChoices ) / sizeof( wxString ); - m_Inner14Choice = new wxChoice( m_LayersListPanel, ID_INNER14CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner14ChoiceNChoices, m_Inner14ChoiceChoices, 0 ); - m_Inner14Choice->SetSelection( 0 ); - m_Inner14Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); - - m_LayerListFlexGridSizer->Add( m_Inner14Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner15Name = new wxTextCtrl( m_LayersListPanel, ID_INNER15NAME, _("Inner15"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Inner15Name->SetMaxLength( 20 ); - m_LayerListFlexGridSizer->Add( m_Inner15Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_Inner15Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_Inner15Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); - - wxBoxSizer* bInner15Sizer; - bInner15Sizer = new wxBoxSizer( wxVERTICAL ); - - m_Inner15CheckBox = new wxCheckBox( m_Inner15Panel, ID_INNER15CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - bInner15Sizer->Add( m_Inner15CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_Inner15Panel->SetSizer( bInner15Sizer ); - m_Inner15Panel->Layout(); - bInner15Sizer->Fit( m_Inner15Panel ); - m_LayerListFlexGridSizer->Add( m_Inner15Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - wxString m_Inner15ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; - int m_Inner15ChoiceNChoices = sizeof( m_Inner15ChoiceChoices ) / sizeof( wxString ); - m_Inner15Choice = new wxChoice( m_LayersListPanel, ID_INNER15CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner15ChoiceNChoices, m_Inner15ChoiceChoices, 0 ); - m_Inner15Choice->SetSelection( 0 ); - m_Inner15Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); - - m_LayerListFlexGridSizer->Add( m_Inner15Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_BackName = new wxTextCtrl( m_LayersListPanel, ID_BACKNAME, _("Back"), wxDefaultPosition, wxDefaultSize, 0 ); - m_BackName->SetMaxLength( 20 ); - m_BackName->SetToolTip( _("Layer name of back (bottom) copper layer") ); - - m_LayerListFlexGridSizer->Add( m_BackName, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_BackPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_BackPanel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); - - wxBoxSizer* bBackSizer; - bBackSizer = new wxBoxSizer( wxVERTICAL ); - - m_BackCheckBox = new wxCheckBox( m_BackPanel, ID_BACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - m_BackCheckBox->SetToolTip( _("If you want a back copper layer") ); - - bBackSizer->Add( m_BackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_BackPanel->SetSizer( bBackSizer ); - m_BackPanel->Layout(); - bBackSizer->Fit( m_BackPanel ); - m_LayerListFlexGridSizer->Add( m_BackPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - wxString m_BackChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; - int m_BackChoiceNChoices = sizeof( m_BackChoiceChoices ) / sizeof( wxString ); - m_BackChoice = new wxChoice( m_LayersListPanel, ID_BACKCHOICE, wxDefaultPosition, wxDefaultSize, m_BackChoiceNChoices, m_BackChoiceChoices, 0 ); - m_BackChoice->SetSelection( 0 ); - m_BackChoice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); - - m_LayerListFlexGridSizer->Add( m_BackChoice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); - - m_MaskBackName = new wxStaticText( m_LayersListPanel, ID_MASKBACKNAME, _("Mask_Back_later"), wxDefaultPosition, wxDefaultSize, 0 ); - m_MaskBackName->Wrap( -1 ); - m_LayerListFlexGridSizer->Add( m_MaskBackName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - - m_MaskBackPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - m_MaskBackPanel->SetBackgroundColour( wxColour( 255, 252, 235 ) ); - - wxBoxSizer* bSizer24; - bSizer24 = new wxBoxSizer( wxVERTICAL ); - - m_MaskBackCheckBox = new wxCheckBox( m_MaskBackPanel, ID_MASKBACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - m_MaskBackCheckBox->SetToolTip( _("If you want a solder mask layer for the back side of the board") ); - - bSizer24->Add( m_MaskBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_MaskBackPanel->SetSizer( bSizer24 ); - m_MaskBackPanel->Layout(); - bSizer24->Fit( m_MaskBackPanel ); - m_LayerListFlexGridSizer->Add( m_MaskBackPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - 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 ); - - m_SilkSBackName = new wxStaticText( m_LayersListPanel, ID_SILKSBACKNAME, _("SilkS_Back_later"), wxDefaultPosition, wxDefaultSize, 0 ); - m_SilkSBackName->Wrap( -1 ); - m_LayerListFlexGridSizer->Add( m_SilkSBackName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - - m_SilkSBackPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - m_SilkSBackPanel->SetBackgroundColour( wxColour( 255, 252, 235 ) ); - - wxBoxSizer* bSizer25; - bSizer25 = new wxBoxSizer( wxVERTICAL ); - - m_SilkSBackCheckBox = new wxCheckBox( m_SilkSBackPanel, ID_SILKSBACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - m_SilkSBackCheckBox->SetToolTip( _("If you want a silk screen layer for the back side of the board") ); - - bSizer25->Add( m_SilkSBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_SilkSBackPanel->SetSizer( bSizer25 ); - m_SilkSBackPanel->Layout(); - bSizer25->Fit( m_SilkSBackPanel ); - m_LayerListFlexGridSizer->Add( m_SilkSBackPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - 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 ); - - m_SoldPBackName = new wxStaticText( m_LayersListPanel, ID_SOLDPBACKNAME, _("SoldP_Back_later"), wxDefaultPosition, wxDefaultSize, 0 ); - m_SoldPBackName->Wrap( -1 ); - 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 ) ); - - wxBoxSizer* bSizer26; - bSizer26 = new wxBoxSizer( wxVERTICAL ); - - m_SoldPBackCheckBox = new wxCheckBox( m_SoldPBackPanel, ID_SOLDPBACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - m_SoldPBackCheckBox->SetToolTip( _("If you want a solder paste layer for the back side of the board") ); - - bSizer26->Add( m_SoldPBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_SoldPBackPanel->SetSizer( bSizer26 ); - m_SoldPBackPanel->Layout(); - 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->Wrap( -1 ); - m_LayerListFlexGridSizer->Add( m_SoldPBackStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - - m_AdhesBackName = new wxStaticText( m_LayersListPanel, ID_ADHESBACKNAME, _("Adhes_Back_later"), wxDefaultPosition, wxDefaultSize, 0 ); - m_AdhesBackName->Wrap( -1 ); - m_LayerListFlexGridSizer->Add( m_AdhesBackName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - - m_AdhesBackPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - m_AdhesBackPanel->SetBackgroundColour( wxColour( 236, 233, 236 ) ); - - wxBoxSizer* bSizer27; - bSizer27 = new wxBoxSizer( wxVERTICAL ); - - m_AdhesBackCheckBox = new wxCheckBox( m_AdhesBackPanel, ID_ADHESBACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - m_AdhesBackCheckBox->SetToolTip( _("If you want an adhesive layer for the back side of the board") ); - - bSizer27->Add( m_AdhesBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_AdhesBackPanel->SetSizer( bSizer27 ); - m_AdhesBackPanel->Layout(); - bSizer27->Fit( m_AdhesBackPanel ); - m_LayerListFlexGridSizer->Add( m_AdhesBackPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - 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 ); - - 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 ); - - m_PCBEdgesPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - m_PCBEdgesPanel->SetBackgroundColour( wxColour( 255, 253, 216 ) ); - - wxBoxSizer* bSizer28; - bSizer28 = new wxBoxSizer( wxVERTICAL ); - - m_PCBEdgesCheckBox = new wxCheckBox( m_PCBEdgesPanel, ID_PCBEDGESCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - m_PCBEdgesCheckBox->SetToolTip( _("If you want a board perimeter layer") ); - - bSizer28->Add( m_PCBEdgesCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_PCBEdgesPanel->SetSizer( bSizer28 ); - m_PCBEdgesPanel->Layout(); - bSizer28->Fit( m_PCBEdgesPanel ); - m_LayerListFlexGridSizer->Add( m_PCBEdgesPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - 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 ); - - m_Eco1Name = new wxStaticText( m_LayersListPanel, ID_ECO2NAME, _("Eco1_later"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Eco1Name->Wrap( -1 ); - m_LayerListFlexGridSizer->Add( m_Eco1Name, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - - m_Eco1Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_Eco1Panel->SetBackgroundColour( wxColour( 236, 233, 255 ) ); - - wxBoxSizer* bSizer29; - bSizer29 = new wxBoxSizer( wxVERTICAL ); - - m_Eco1CheckBox = new wxCheckBox( m_Eco1Panel, ID_ECO2CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - bSizer29->Add( m_Eco1CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_Eco1Panel->SetSizer( bSizer29 ); - m_Eco1Panel->Layout(); - bSizer29->Fit( m_Eco1Panel ); - m_LayerListFlexGridSizer->Add( m_Eco1Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - m_Eco1StaticText = new wxStaticText( m_LayersListPanel, ID_ECO2CHOICE, _("Auxiliary"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Eco1StaticText->Wrap( -1 ); - m_LayerListFlexGridSizer->Add( m_Eco1StaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - - m_Eco2Name = new wxStaticText( m_LayersListPanel, ID_ECO1NAME, _("Eco2_later"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Eco2Name->Wrap( -1 ); - m_LayerListFlexGridSizer->Add( m_Eco2Name, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - - m_Eco2Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_Eco2Panel->SetBackgroundColour( wxColour( 236, 233, 255 ) ); - - wxBoxSizer* bSizer30; - bSizer30 = new wxBoxSizer( wxVERTICAL ); - - m_Eco2CheckBox = new wxCheckBox( m_Eco2Panel, ID_ECO1CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - bSizer30->Add( m_Eco2CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_Eco2Panel->SetSizer( bSizer30 ); - m_Eco2Panel->Layout(); - bSizer30->Fit( m_Eco2Panel ); - m_LayerListFlexGridSizer->Add( m_Eco2Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - m_Eco2StaticText = new wxStaticText( m_LayersListPanel, ID_ECO1CHOICE, _("Auxiliary"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Eco2StaticText->Wrap( -1 ); - m_LayerListFlexGridSizer->Add( m_Eco2StaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - - m_CommentsName = new wxStaticText( m_LayersListPanel, ID_COMMENTSNAME, _("Comments_later"), wxDefaultPosition, wxDefaultSize, 0 ); - m_CommentsName->Wrap( -1 ); - m_LayerListFlexGridSizer->Add( m_CommentsName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - - m_CommentsPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - m_CommentsPanel->SetBackgroundColour( wxColour( 236, 233, 255 ) ); - - wxBoxSizer* bSizer31; - bSizer31 = new wxBoxSizer( wxVERTICAL ); - - m_CommentsCheckBox = new wxCheckBox( m_CommentsPanel, ID_COMMENTSCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - m_CommentsCheckBox->SetToolTip( _("If you want a separate layer for comments or notes") ); - - bSizer31->Add( m_CommentsCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_CommentsPanel->SetSizer( bSizer31 ); - m_CommentsPanel->Layout(); - bSizer31->Fit( m_CommentsPanel ); - m_LayerListFlexGridSizer->Add( m_CommentsPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - 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 ); - - m_DrawingsName = new wxStaticText( m_LayersListPanel, ID_DRAWINGSNAME, _("Drawings_later"), wxDefaultPosition, wxDefaultSize, 0 ); - m_DrawingsName->Wrap( -1 ); - m_LayerListFlexGridSizer->Add( m_DrawingsName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - - m_DrawingsPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_DrawingsPanel->SetBackgroundColour( wxColour( 236, 233, 255 ) ); - - wxBoxSizer* bSizer32; - bSizer32 = new wxBoxSizer( wxVERTICAL ); - - m_DrawingsCheckBox = new wxCheckBox( m_DrawingsPanel, ID_DRAWINGSCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - - m_DrawingsCheckBox->SetToolTip( _("If you want a layer for documentation drawings") ); - - bSizer32->Add( m_DrawingsCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_DrawingsPanel->SetSizer( bSizer32 ); - m_DrawingsPanel->Layout(); - bSizer32->Fit( m_DrawingsPanel ); - m_LayerListFlexGridSizer->Add( m_DrawingsPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - - 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|wxALL, 5 ); - - m_LayersListPanel->SetSizer( m_LayerListFlexGridSizer ); - m_LayersListPanel->Layout(); - m_LayerListFlexGridSizer->Fit( m_LayersListPanel ); - sbLayersSizer->Add( m_LayersListPanel, 1, wxALL|wxEXPAND, 5 ); - - bMainSizer->Add( sbLayersSizer, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 ); - - m_sdbSizer2 = new wxStdDialogButtonSizer(); - m_sdbSizer2OK = new wxButton( this, wxID_OK ); - m_sdbSizer2->AddButton( m_sdbSizer2OK ); - m_sdbSizer2Cancel = new wxButton( this, wxID_CANCEL ); - m_sdbSizer2->AddButton( m_sdbSizer2Cancel ); - m_sdbSizer2->Realize(); - bMainSizer->Add( m_sdbSizer2, 0, wxALL|wxEXPAND, 5 ); - - 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_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 ); - m_MaskFrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this ); - m_FrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner2CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner3CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner4CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner5CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner6CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner7CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner8CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner9CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner10CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner11CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner12CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner13CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner14CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner15CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_BackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_MaskBackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this ); - 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_PCBEdgesCheckBox->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 ); - m_Eco2CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this ); - m_CommentsCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this ); - m_DrawingsCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this ); - m_sdbSizer2Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCancelButtonClick ), NULL, this ); - m_sdbSizer2OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnOkButtonClick ), NULL, this ); -} - -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_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 ); - m_MaskFrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this ); - m_FrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner2CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner3CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner4CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner5CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner6CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner7CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner8CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner9CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner10CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner11CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner12CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner13CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner14CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_Inner15CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_BackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); - m_MaskBackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this ); - 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_PCBEdgesCheckBox->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 ); - m_Eco2CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this ); - m_CommentsCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this ); - m_DrawingsCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this ); - m_sdbSizer2Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCancelButtonClick ), NULL, this ); - m_sdbSizer2OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnOkButtonClick ), NULL, this ); -} +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Apr 10 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include "dialog_layers_setup_base.h" + +/////////////////////////////////////////////////////////////////////////// + +DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxSize( 550,600 ), wxDefaultSize ); + + wxBoxSizer* bMainSizer; + bMainSizer = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer* bChoicesSizer; + bChoicesSizer = new wxBoxSizer( wxHORIZONTAL ); + + wxStaticBoxSizer* sbPresetsSizer; + sbPresetsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Preset Layer Groupings") ), wxVERTICAL ); + + wxString m_PresetsChoiceChoices[] = { _("Custom"), _("Two layers, parts on Front only"), _("Two layers, parts on Back only"), _("Two layers, parts on Front and Back"), _("Four layers, parts on Front only"), _("Four layers, parts on Front and Back"), _("All layers on") }; + int m_PresetsChoiceNChoices = sizeof( m_PresetsChoiceChoices ) / sizeof( wxString ); + m_PresetsChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_PresetsChoiceNChoices, m_PresetsChoiceChoices, 0 ); + m_PresetsChoice->SetSelection( 0 ); + sbPresetsSizer->Add( m_PresetsChoice, 0, wxEXPAND, 5 ); + + + bChoicesSizer->Add( sbPresetsSizer, 2, wxALL|wxEXPAND, 5 ); + + wxStaticBoxSizer* sbCopperLayersSizer; + sbCopperLayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Copper Layers") ), wxVERTICAL ); + + wxString m_CopperLayersChoiceChoices[] = { _("2"), _("4"), _("6"), _("8"), _("10"), _("12"), _("14"), _("16") }; + 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( 0 ); + sbCopperLayersSizer->Add( m_CopperLayersChoice, 0, wxEXPAND, 5 ); + + + bChoicesSizer->Add( sbCopperLayersSizer, 1, wxALL|wxEXPAND, 5 ); + + + bMainSizer->Add( bChoicesSizer, 0, wxEXPAND, 5 ); + + wxStaticBoxSizer* sbLayersSizer; + sbLayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layers") ), wxVERTICAL ); + + wxBoxSizer* bCaptionsSizer; + bCaptionsSizer = new wxBoxSizer( wxHORIZONTAL ); + + m_TitlePanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER|wxTAB_TRAVERSAL ); + m_TitlePanel->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_CAPTIONTEXT ) ); + m_TitlePanel->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVECAPTION ) ); + + bCaptionsSizer->Add( m_TitlePanel, 1, wxEXPAND, 5 ); + + + sbLayersSizer->Add( bCaptionsSizer, 0, wxALIGN_CENTER|wxEXPAND, 5 ); + + m_LayersListPanel = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxALWAYS_SHOW_SB|wxRAISED_BORDER|wxTAB_TRAVERSAL|wxVSCROLL ); + m_LayersListPanel->SetScrollRate( 0, 5 ); + m_LayerListFlexGridSizer = new wxFlexGridSizer( 0, 3, 0, 0 ); + m_LayerListFlexGridSizer->AddGrowableCol( 0 ); + m_LayerListFlexGridSizer->AddGrowableCol( 1 ); + m_LayerListFlexGridSizer->SetFlexibleDirection( wxHORIZONTAL ); + m_LayerListFlexGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + 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_AdhesFrontPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_AdhesFrontPanel->SetBackgroundColour( wxColour( 236, 233, 236 ) ); + + wxBoxSizer* bSizer6; + bSizer6 = new wxBoxSizer( wxVERTICAL ); + + m_AdhesFrontCheckBox = new wxCheckBox( m_AdhesFrontPanel, ID_ADHESFRONTCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + 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|wxALL, 5 ); + + + 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_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_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 ) ); + + wxBoxSizer* bSizer7; + bSizer7 = new wxBoxSizer( wxVERTICAL ); + + m_SoldPFrontCheckBox = new wxCheckBox( m_SoldPFrontPanel, ID_SOLDPFRONTCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + 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|wxALL, 5 ); + + + m_SoldPFrontPanel->SetSizer( bSizer7 ); + m_SoldPFrontPanel->Layout(); + 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->Wrap( -1 ); + m_LayerListFlexGridSizer->Add( m_SoldPFrontStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + + m_SilkSFrontName = new wxStaticText( m_LayersListPanel, ID_SILKSFRONTNAME, _("SilkS_Front_later"), wxDefaultPosition, wxDefaultSize, 0 ); + m_SilkSFrontName->Wrap( -1 ); + m_LayerListFlexGridSizer->Add( m_SilkSFrontName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + + m_SilkSFrontPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_SilkSFrontPanel->SetBackgroundColour( wxColour( 255, 252, 235 ) ); + + wxBoxSizer* bSizer5; + bSizer5 = new wxBoxSizer( wxVERTICAL ); + + m_SilkSFrontCheckBox = new wxCheckBox( m_SilkSFrontPanel, ID_SILKSFRONTCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_SilkSFrontCheckBox->SetToolTip( _("If you want a silk screen layer for the front side of the board") ); + + 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|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + 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 ); + + m_MaskFrontName = new wxStaticText( m_LayersListPanel, ID_MASKFRONTNAME, _("Mask_Front_later"), wxDefaultPosition, wxDefaultSize, 0 ); + m_MaskFrontName->Wrap( -1 ); + m_LayerListFlexGridSizer->Add( m_MaskFrontName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + + m_MaskFrontPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_MaskFrontPanel->SetBackgroundColour( wxColour( 255, 252, 235 ) ); + + wxBoxSizer* bSizer8; + bSizer8 = new wxBoxSizer( wxVERTICAL ); + + m_MaskFrontCheckBox = new wxCheckBox( m_MaskFrontPanel, ID_MASKFRONTCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_MaskFrontCheckBox->SetToolTip( _("If you want a solder mask layer for the front of the board") ); + + 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|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + 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_later"), wxDefaultPosition, wxDefaultSize, 0 ); + m_FrontName->SetMaxLength( 20 ); + m_FrontName->SetToolTip( _("Layer name of front (top) copper layer") ); + + m_LayerListFlexGridSizer->Add( m_FrontName, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_FrontPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_FrontPanel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); + + wxBoxSizer* bSizer9; + bSizer9 = new wxBoxSizer( wxVERTICAL ); + + m_FrontCheckBox = new wxCheckBox( m_FrontPanel, ID_FRONTCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_FrontCheckBox->SetToolTip( _("If you want a front copper layer") ); + + bSizer9->Add( m_FrontCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_FrontPanel->SetSizer( bSizer9 ); + m_FrontPanel->Layout(); + bSizer9->Fit( m_FrontPanel ); + m_LayerListFlexGridSizer->Add( m_FrontPanel, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 ); + + wxString m_FrontChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; + int m_FrontChoiceNChoices = sizeof( m_FrontChoiceChoices ) / sizeof( wxString ); + m_FrontChoice = new wxChoice( m_LayersListPanel, ID_FRONTCHOICE, wxDefaultPosition, wxDefaultSize, m_FrontChoiceNChoices, m_FrontChoiceChoices, 0 ); + m_FrontChoice->SetSelection( 0 ); + m_FrontChoice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); + + m_LayerListFlexGridSizer->Add( m_FrontChoice, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + + m_Inner2Name = new wxTextCtrl( m_LayersListPanel, ID_INNER2NAME, _("Inner2"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Inner2Name->SetMaxLength( 20 ); + m_LayerListFlexGridSizer->Add( m_Inner2Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner2Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_Inner2Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); + + wxBoxSizer* bInner2Sizer; + bInner2Sizer = new wxBoxSizer( wxVERTICAL ); + + m_Inner2CheckBox = new wxCheckBox( m_Inner2Panel, ID_INNER2CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bInner2Sizer->Add( m_Inner2CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_Inner2Panel->SetSizer( bInner2Sizer ); + m_Inner2Panel->Layout(); + bInner2Sizer->Fit( m_Inner2Panel ); + m_LayerListFlexGridSizer->Add( m_Inner2Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + + wxString m_Inner2ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; + int m_Inner2ChoiceNChoices = sizeof( m_Inner2ChoiceChoices ) / sizeof( wxString ); + m_Inner2Choice = new wxChoice( m_LayersListPanel, ID_INNER2CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner2ChoiceNChoices, m_Inner2ChoiceChoices, 0 ); + m_Inner2Choice->SetSelection( 0 ); + m_Inner2Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); + + m_LayerListFlexGridSizer->Add( m_Inner2Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner3Name = new wxTextCtrl( m_LayersListPanel, ID_INNER3NAME, _("Inner3"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Inner3Name->SetMaxLength( 20 ); + m_LayerListFlexGridSizer->Add( m_Inner3Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner3Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_Inner3Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); + + wxBoxSizer* bInner3Sizer; + bInner3Sizer = new wxBoxSizer( wxVERTICAL ); + + m_Inner3CheckBox = new wxCheckBox( m_Inner3Panel, ID_INNER3CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bInner3Sizer->Add( m_Inner3CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_Inner3Panel->SetSizer( bInner3Sizer ); + m_Inner3Panel->Layout(); + bInner3Sizer->Fit( m_Inner3Panel ); + m_LayerListFlexGridSizer->Add( m_Inner3Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + wxString m_Inner3ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; + int m_Inner3ChoiceNChoices = sizeof( m_Inner3ChoiceChoices ) / sizeof( wxString ); + m_Inner3Choice = new wxChoice( m_LayersListPanel, ID_INNER3CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner3ChoiceNChoices, m_Inner3ChoiceChoices, 0 ); + m_Inner3Choice->SetSelection( 0 ); + m_Inner3Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); + + m_LayerListFlexGridSizer->Add( m_Inner3Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner4Name = new wxTextCtrl( m_LayersListPanel, ID_INNER4NAME, _("Inner4"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Inner4Name->SetMaxLength( 20 ); + m_LayerListFlexGridSizer->Add( m_Inner4Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner4Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_Inner4Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); + + wxBoxSizer* bInner4Sizer; + bInner4Sizer = new wxBoxSizer( wxVERTICAL ); + + m_Inner4CheckBox = new wxCheckBox( m_Inner4Panel, ID_INNER4CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bInner4Sizer->Add( m_Inner4CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_Inner4Panel->SetSizer( bInner4Sizer ); + m_Inner4Panel->Layout(); + bInner4Sizer->Fit( m_Inner4Panel ); + m_LayerListFlexGridSizer->Add( m_Inner4Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + wxString m_Inner4ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; + int m_Inner4ChoiceNChoices = sizeof( m_Inner4ChoiceChoices ) / sizeof( wxString ); + m_Inner4Choice = new wxChoice( m_LayersListPanel, ID_INNER4CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner4ChoiceNChoices, m_Inner4ChoiceChoices, 0 ); + m_Inner4Choice->SetSelection( 0 ); + m_Inner4Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); + + m_LayerListFlexGridSizer->Add( m_Inner4Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner5Name = new wxTextCtrl( m_LayersListPanel, ID_INNER5NAME, _("Inner5"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Inner5Name->SetMaxLength( 20 ); + m_LayerListFlexGridSizer->Add( m_Inner5Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner5Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_Inner5Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); + + wxBoxSizer* bInner5Sizer; + bInner5Sizer = new wxBoxSizer( wxVERTICAL ); + + m_Inner5CheckBox = new wxCheckBox( m_Inner5Panel, ID_INNER5CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bInner5Sizer->Add( m_Inner5CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_Inner5Panel->SetSizer( bInner5Sizer ); + m_Inner5Panel->Layout(); + bInner5Sizer->Fit( m_Inner5Panel ); + m_LayerListFlexGridSizer->Add( m_Inner5Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + wxString m_Inner5ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; + int m_Inner5ChoiceNChoices = sizeof( m_Inner5ChoiceChoices ) / sizeof( wxString ); + m_Inner5Choice = new wxChoice( m_LayersListPanel, ID_INNER5CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner5ChoiceNChoices, m_Inner5ChoiceChoices, 0 ); + m_Inner5Choice->SetSelection( 0 ); + m_Inner5Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); + + m_LayerListFlexGridSizer->Add( m_Inner5Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner6Name = new wxTextCtrl( m_LayersListPanel, ID_INNER6NAME, _("Inner6"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Inner6Name->SetMaxLength( 20 ); + m_LayerListFlexGridSizer->Add( m_Inner6Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner6Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_Inner6Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); + + wxBoxSizer* bInner6Sizer; + bInner6Sizer = new wxBoxSizer( wxVERTICAL ); + + m_Inner6CheckBox = new wxCheckBox( m_Inner6Panel, ID_INNER6CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bInner6Sizer->Add( m_Inner6CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_Inner6Panel->SetSizer( bInner6Sizer ); + m_Inner6Panel->Layout(); + bInner6Sizer->Fit( m_Inner6Panel ); + m_LayerListFlexGridSizer->Add( m_Inner6Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + wxString m_Inner6ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; + int m_Inner6ChoiceNChoices = sizeof( m_Inner6ChoiceChoices ) / sizeof( wxString ); + m_Inner6Choice = new wxChoice( m_LayersListPanel, ID_INNER6CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner6ChoiceNChoices, m_Inner6ChoiceChoices, 0 ); + m_Inner6Choice->SetSelection( 0 ); + m_Inner6Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); + + m_LayerListFlexGridSizer->Add( m_Inner6Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner7Name = new wxTextCtrl( m_LayersListPanel, ID_INNER7NAME, _("Inner7"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Inner7Name->SetMaxLength( 20 ); + m_LayerListFlexGridSizer->Add( m_Inner7Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner7Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_Inner7Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); + + wxBoxSizer* bInner7Sizer; + bInner7Sizer = new wxBoxSizer( wxVERTICAL ); + + m_Inner7CheckBox = new wxCheckBox( m_Inner7Panel, ID_INNER7CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bInner7Sizer->Add( m_Inner7CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_Inner7Panel->SetSizer( bInner7Sizer ); + m_Inner7Panel->Layout(); + bInner7Sizer->Fit( m_Inner7Panel ); + m_LayerListFlexGridSizer->Add( m_Inner7Panel, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); + + wxString m_Inner7ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; + int m_Inner7ChoiceNChoices = sizeof( m_Inner7ChoiceChoices ) / sizeof( wxString ); + m_Inner7Choice = new wxChoice( m_LayersListPanel, ID_INNER7CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner7ChoiceNChoices, m_Inner7ChoiceChoices, 0 ); + m_Inner7Choice->SetSelection( 0 ); + m_Inner7Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); + + m_LayerListFlexGridSizer->Add( m_Inner7Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner8Name = new wxTextCtrl( m_LayersListPanel, ID_INNER8NAME, _("Inner8"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Inner8Name->SetMaxLength( 20 ); + m_LayerListFlexGridSizer->Add( m_Inner8Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner8Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_Inner8Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); + + wxBoxSizer* bInner8Sizer; + bInner8Sizer = new wxBoxSizer( wxVERTICAL ); + + m_Inner8CheckBox = new wxCheckBox( m_Inner8Panel, ID_INNER8CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bInner8Sizer->Add( m_Inner8CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_Inner8Panel->SetSizer( bInner8Sizer ); + m_Inner8Panel->Layout(); + bInner8Sizer->Fit( m_Inner8Panel ); + m_LayerListFlexGridSizer->Add( m_Inner8Panel, 1, wxEXPAND, 5 ); + + wxString m_Inner8ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; + int m_Inner8ChoiceNChoices = sizeof( m_Inner8ChoiceChoices ) / sizeof( wxString ); + m_Inner8Choice = new wxChoice( m_LayersListPanel, ID_INNER8CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner8ChoiceNChoices, m_Inner8ChoiceChoices, 0 ); + m_Inner8Choice->SetSelection( 0 ); + m_Inner8Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); + + m_LayerListFlexGridSizer->Add( m_Inner8Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner9Name = new wxTextCtrl( m_LayersListPanel, ID_INNER9NAME, _("Inner9"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Inner9Name->SetMaxLength( 20 ); + m_LayerListFlexGridSizer->Add( m_Inner9Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner9Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_Inner9Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); + + wxBoxSizer* bInner9Sizer; + bInner9Sizer = new wxBoxSizer( wxVERTICAL ); + + m_Inner9CheckBox = new wxCheckBox( m_Inner9Panel, ID_INNER9CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bInner9Sizer->Add( m_Inner9CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_Inner9Panel->SetSizer( bInner9Sizer ); + m_Inner9Panel->Layout(); + bInner9Sizer->Fit( m_Inner9Panel ); + m_LayerListFlexGridSizer->Add( m_Inner9Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + wxString m_Inner9ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; + int m_Inner9ChoiceNChoices = sizeof( m_Inner9ChoiceChoices ) / sizeof( wxString ); + m_Inner9Choice = new wxChoice( m_LayersListPanel, ID_INNER9CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner9ChoiceNChoices, m_Inner9ChoiceChoices, 0 ); + m_Inner9Choice->SetSelection( 0 ); + m_Inner9Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); + + m_LayerListFlexGridSizer->Add( m_Inner9Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner10Name = new wxTextCtrl( m_LayersListPanel, ID_INNER10NAME, _("Inner10"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Inner10Name->SetMaxLength( 20 ); + m_LayerListFlexGridSizer->Add( m_Inner10Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner10Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_Inner10Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); + + wxBoxSizer* bInner10Sizer; + bInner10Sizer = new wxBoxSizer( wxVERTICAL ); + + m_Inner10CheckBox = new wxCheckBox( m_Inner10Panel, ID_INNER10CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bInner10Sizer->Add( m_Inner10CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_Inner10Panel->SetSizer( bInner10Sizer ); + m_Inner10Panel->Layout(); + bInner10Sizer->Fit( m_Inner10Panel ); + m_LayerListFlexGridSizer->Add( m_Inner10Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + wxString m_Inner10ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; + int m_Inner10ChoiceNChoices = sizeof( m_Inner10ChoiceChoices ) / sizeof( wxString ); + m_Inner10Choice = new wxChoice( m_LayersListPanel, ID_INNER10CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner10ChoiceNChoices, m_Inner10ChoiceChoices, 0 ); + m_Inner10Choice->SetSelection( 0 ); + m_Inner10Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); + + m_LayerListFlexGridSizer->Add( m_Inner10Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner11Name = new wxTextCtrl( m_LayersListPanel, ID_INNER11NAME, _("Inner11"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Inner11Name->SetMaxLength( 20 ); + m_LayerListFlexGridSizer->Add( m_Inner11Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner11Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_Inner11Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); + + wxBoxSizer* bInner11Sizer; + bInner11Sizer = new wxBoxSizer( wxVERTICAL ); + + m_Inner11CheckBox = new wxCheckBox( m_Inner11Panel, ID_INNER11CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bInner11Sizer->Add( m_Inner11CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_Inner11Panel->SetSizer( bInner11Sizer ); + m_Inner11Panel->Layout(); + bInner11Sizer->Fit( m_Inner11Panel ); + m_LayerListFlexGridSizer->Add( m_Inner11Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + wxString m_Inner11ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; + int m_Inner11ChoiceNChoices = sizeof( m_Inner11ChoiceChoices ) / sizeof( wxString ); + m_Inner11Choice = new wxChoice( m_LayersListPanel, ID_INNER11CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner11ChoiceNChoices, m_Inner11ChoiceChoices, 0 ); + m_Inner11Choice->SetSelection( 0 ); + m_Inner11Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); + + m_LayerListFlexGridSizer->Add( m_Inner11Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner12Name = new wxTextCtrl( m_LayersListPanel, ID_INNER12NAME, _("Inner12"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Inner12Name->SetMaxLength( 20 ); + m_LayerListFlexGridSizer->Add( m_Inner12Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner12Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_Inner12Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); + + wxBoxSizer* bInner12Sizer; + bInner12Sizer = new wxBoxSizer( wxVERTICAL ); + + m_Inner12CheckBox = new wxCheckBox( m_Inner12Panel, ID_INNER12CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bInner12Sizer->Add( m_Inner12CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_Inner12Panel->SetSizer( bInner12Sizer ); + m_Inner12Panel->Layout(); + bInner12Sizer->Fit( m_Inner12Panel ); + m_LayerListFlexGridSizer->Add( m_Inner12Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + wxString m_Inner12ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; + int m_Inner12ChoiceNChoices = sizeof( m_Inner12ChoiceChoices ) / sizeof( wxString ); + m_Inner12Choice = new wxChoice( m_LayersListPanel, ID_INNER12CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner12ChoiceNChoices, m_Inner12ChoiceChoices, 0 ); + m_Inner12Choice->SetSelection( 0 ); + m_Inner12Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); + + m_LayerListFlexGridSizer->Add( m_Inner12Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner13Name = new wxTextCtrl( m_LayersListPanel, ID_INNER13NAME, _("Inner13"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Inner13Name->SetMaxLength( 20 ); + m_LayerListFlexGridSizer->Add( m_Inner13Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner13Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_Inner13Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); + + wxBoxSizer* bInner13Sizer; + bInner13Sizer = new wxBoxSizer( wxVERTICAL ); + + m_Inner13CheckBox = new wxCheckBox( m_Inner13Panel, ID_INNER13CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bInner13Sizer->Add( m_Inner13CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_Inner13Panel->SetSizer( bInner13Sizer ); + m_Inner13Panel->Layout(); + bInner13Sizer->Fit( m_Inner13Panel ); + m_LayerListFlexGridSizer->Add( m_Inner13Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + wxString m_Inner13ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; + int m_Inner13ChoiceNChoices = sizeof( m_Inner13ChoiceChoices ) / sizeof( wxString ); + m_Inner13Choice = new wxChoice( m_LayersListPanel, ID_INNER13CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner13ChoiceNChoices, m_Inner13ChoiceChoices, 0 ); + m_Inner13Choice->SetSelection( 0 ); + m_Inner13Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); + + m_LayerListFlexGridSizer->Add( m_Inner13Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner14Name = new wxTextCtrl( m_LayersListPanel, ID_INNER14NAME, _("Inner14"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Inner14Name->SetMaxLength( 20 ); + m_LayerListFlexGridSizer->Add( m_Inner14Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner14Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_Inner14Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); + + wxBoxSizer* bInner14Sizer; + bInner14Sizer = new wxBoxSizer( wxVERTICAL ); + + m_Inner14CheckBox = new wxCheckBox( m_Inner14Panel, ID_INNER14CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bInner14Sizer->Add( m_Inner14CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_Inner14Panel->SetSizer( bInner14Sizer ); + m_Inner14Panel->Layout(); + bInner14Sizer->Fit( m_Inner14Panel ); + m_LayerListFlexGridSizer->Add( m_Inner14Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + wxString m_Inner14ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; + int m_Inner14ChoiceNChoices = sizeof( m_Inner14ChoiceChoices ) / sizeof( wxString ); + m_Inner14Choice = new wxChoice( m_LayersListPanel, ID_INNER14CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner14ChoiceNChoices, m_Inner14ChoiceChoices, 0 ); + m_Inner14Choice->SetSelection( 0 ); + m_Inner14Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); + + m_LayerListFlexGridSizer->Add( m_Inner14Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner15Name = new wxTextCtrl( m_LayersListPanel, ID_INNER15NAME, _("Inner15"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Inner15Name->SetMaxLength( 20 ); + m_LayerListFlexGridSizer->Add( m_Inner15Name, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_Inner15Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_Inner15Panel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); + + wxBoxSizer* bInner15Sizer; + bInner15Sizer = new wxBoxSizer( wxVERTICAL ); + + m_Inner15CheckBox = new wxCheckBox( m_Inner15Panel, ID_INNER15CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bInner15Sizer->Add( m_Inner15CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_Inner15Panel->SetSizer( bInner15Sizer ); + m_Inner15Panel->Layout(); + bInner15Sizer->Fit( m_Inner15Panel ); + m_LayerListFlexGridSizer->Add( m_Inner15Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + wxString m_Inner15ChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; + int m_Inner15ChoiceNChoices = sizeof( m_Inner15ChoiceChoices ) / sizeof( wxString ); + m_Inner15Choice = new wxChoice( m_LayersListPanel, ID_INNER15CHOICE, wxDefaultPosition, wxDefaultSize, m_Inner15ChoiceNChoices, m_Inner15ChoiceChoices, 0 ); + m_Inner15Choice->SetSelection( 0 ); + m_Inner15Choice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); + + m_LayerListFlexGridSizer->Add( m_Inner15Choice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_BackName = new wxTextCtrl( m_LayersListPanel, ID_BACKNAME, _("Back"), wxDefaultPosition, wxDefaultSize, 0 ); + m_BackName->SetMaxLength( 20 ); + m_BackName->SetToolTip( _("Layer name of back (bottom) copper layer") ); + + m_LayerListFlexGridSizer->Add( m_BackName, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_BackPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_BackPanel->SetBackgroundColour( wxColour( 236, 253, 216 ) ); + + wxBoxSizer* bBackSizer; + bBackSizer = new wxBoxSizer( wxVERTICAL ); + + m_BackCheckBox = new wxCheckBox( m_BackPanel, ID_BACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_BackCheckBox->SetToolTip( _("If you want a back copper layer") ); + + bBackSizer->Add( m_BackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_BackPanel->SetSizer( bBackSizer ); + m_BackPanel->Layout(); + bBackSizer->Fit( m_BackPanel ); + m_LayerListFlexGridSizer->Add( m_BackPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + wxString m_BackChoiceChoices[] = { _("signal"), _("power"), _("mixed"), _("jumper") }; + int m_BackChoiceNChoices = sizeof( m_BackChoiceChoices ) / sizeof( wxString ); + m_BackChoice = new wxChoice( m_LayersListPanel, ID_BACKCHOICE, wxDefaultPosition, wxDefaultSize, m_BackChoiceNChoices, m_BackChoiceChoices, 0 ); + m_BackChoice->SetSelection( 0 ); + m_BackChoice->SetToolTip( _("Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus.") ); + + m_LayerListFlexGridSizer->Add( m_BackChoice, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + + m_MaskBackName = new wxStaticText( m_LayersListPanel, ID_MASKBACKNAME, _("Mask_Back_later"), wxDefaultPosition, wxDefaultSize, 0 ); + m_MaskBackName->Wrap( -1 ); + m_LayerListFlexGridSizer->Add( m_MaskBackName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + + m_MaskBackPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_MaskBackPanel->SetBackgroundColour( wxColour( 255, 252, 235 ) ); + + wxBoxSizer* bSizer24; + bSizer24 = new wxBoxSizer( wxVERTICAL ); + + m_MaskBackCheckBox = new wxCheckBox( m_MaskBackPanel, ID_MASKBACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_MaskBackCheckBox->SetToolTip( _("If you want a solder mask layer for the back side of the board") ); + + bSizer24->Add( m_MaskBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_MaskBackPanel->SetSizer( bSizer24 ); + m_MaskBackPanel->Layout(); + bSizer24->Fit( m_MaskBackPanel ); + m_LayerListFlexGridSizer->Add( m_MaskBackPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + 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 ); + + m_SilkSBackName = new wxStaticText( m_LayersListPanel, ID_SILKSBACKNAME, _("SilkS_Back_later"), wxDefaultPosition, wxDefaultSize, 0 ); + m_SilkSBackName->Wrap( -1 ); + m_LayerListFlexGridSizer->Add( m_SilkSBackName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + + m_SilkSBackPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_SilkSBackPanel->SetBackgroundColour( wxColour( 255, 252, 235 ) ); + + wxBoxSizer* bSizer25; + bSizer25 = new wxBoxSizer( wxVERTICAL ); + + m_SilkSBackCheckBox = new wxCheckBox( m_SilkSBackPanel, ID_SILKSBACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_SilkSBackCheckBox->SetToolTip( _("If you want a silk screen layer for the back side of the board") ); + + bSizer25->Add( m_SilkSBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_SilkSBackPanel->SetSizer( bSizer25 ); + m_SilkSBackPanel->Layout(); + bSizer25->Fit( m_SilkSBackPanel ); + m_LayerListFlexGridSizer->Add( m_SilkSBackPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + 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 ); + + m_SoldPBackName = new wxStaticText( m_LayersListPanel, ID_SOLDPBACKNAME, _("SoldP_Back_later"), wxDefaultPosition, wxDefaultSize, 0 ); + m_SoldPBackName->Wrap( -1 ); + 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 ) ); + + wxBoxSizer* bSizer26; + bSizer26 = new wxBoxSizer( wxVERTICAL ); + + m_SoldPBackCheckBox = new wxCheckBox( m_SoldPBackPanel, ID_SOLDPBACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_SoldPBackCheckBox->SetToolTip( _("If you want a solder paste layer for the back side of the board") ); + + bSizer26->Add( m_SoldPBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_SoldPBackPanel->SetSizer( bSizer26 ); + m_SoldPBackPanel->Layout(); + 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->Wrap( -1 ); + m_LayerListFlexGridSizer->Add( m_SoldPBackStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + + m_AdhesBackName = new wxStaticText( m_LayersListPanel, ID_ADHESBACKNAME, _("Adhes_Back_later"), wxDefaultPosition, wxDefaultSize, 0 ); + m_AdhesBackName->Wrap( -1 ); + m_LayerListFlexGridSizer->Add( m_AdhesBackName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + + m_AdhesBackPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_AdhesBackPanel->SetBackgroundColour( wxColour( 236, 233, 236 ) ); + + wxBoxSizer* bSizer27; + bSizer27 = new wxBoxSizer( wxVERTICAL ); + + m_AdhesBackCheckBox = new wxCheckBox( m_AdhesBackPanel, ID_ADHESBACKCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_AdhesBackCheckBox->SetToolTip( _("If you want an adhesive layer for the back side of the board") ); + + bSizer27->Add( m_AdhesBackCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_AdhesBackPanel->SetSizer( bSizer27 ); + m_AdhesBackPanel->Layout(); + bSizer27->Fit( m_AdhesBackPanel ); + m_LayerListFlexGridSizer->Add( m_AdhesBackPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + 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 ); + + 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 ); + + m_PCBEdgesPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_PCBEdgesPanel->SetBackgroundColour( wxColour( 255, 253, 216 ) ); + + wxBoxSizer* bSizer28; + bSizer28 = new wxBoxSizer( wxVERTICAL ); + + m_PCBEdgesCheckBox = new wxCheckBox( m_PCBEdgesPanel, ID_PCBEDGESCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_PCBEdgesCheckBox->SetToolTip( _("If you want a board perimeter layer") ); + + bSizer28->Add( m_PCBEdgesCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_PCBEdgesPanel->SetSizer( bSizer28 ); + m_PCBEdgesPanel->Layout(); + bSizer28->Fit( m_PCBEdgesPanel ); + m_LayerListFlexGridSizer->Add( m_PCBEdgesPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + 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 ); + + m_Eco1Name = new wxStaticText( m_LayersListPanel, ID_ECO2NAME, _("Eco1_later"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Eco1Name->Wrap( -1 ); + m_LayerListFlexGridSizer->Add( m_Eco1Name, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + + m_Eco1Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_Eco1Panel->SetBackgroundColour( wxColour( 236, 233, 255 ) ); + + wxBoxSizer* bSizer29; + bSizer29 = new wxBoxSizer( wxVERTICAL ); + + m_Eco1CheckBox = new wxCheckBox( m_Eco1Panel, ID_ECO2CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bSizer29->Add( m_Eco1CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_Eco1Panel->SetSizer( bSizer29 ); + m_Eco1Panel->Layout(); + bSizer29->Fit( m_Eco1Panel ); + m_LayerListFlexGridSizer->Add( m_Eco1Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + m_Eco1StaticText = new wxStaticText( m_LayersListPanel, ID_ECO2CHOICE, _("Auxiliary"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Eco1StaticText->Wrap( -1 ); + m_LayerListFlexGridSizer->Add( m_Eco1StaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + + m_Eco2Name = new wxStaticText( m_LayersListPanel, ID_ECO1NAME, _("Eco2_later"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Eco2Name->Wrap( -1 ); + m_LayerListFlexGridSizer->Add( m_Eco2Name, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + + m_Eco2Panel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_Eco2Panel->SetBackgroundColour( wxColour( 236, 233, 255 ) ); + + wxBoxSizer* bSizer30; + bSizer30 = new wxBoxSizer( wxVERTICAL ); + + m_Eco2CheckBox = new wxCheckBox( m_Eco2Panel, ID_ECO1CHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bSizer30->Add( m_Eco2CheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_Eco2Panel->SetSizer( bSizer30 ); + m_Eco2Panel->Layout(); + bSizer30->Fit( m_Eco2Panel ); + m_LayerListFlexGridSizer->Add( m_Eco2Panel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + m_Eco2StaticText = new wxStaticText( m_LayersListPanel, ID_ECO1CHOICE, _("Auxiliary"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Eco2StaticText->Wrap( -1 ); + m_LayerListFlexGridSizer->Add( m_Eco2StaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + + m_CommentsName = new wxStaticText( m_LayersListPanel, ID_COMMENTSNAME, _("Comments_later"), wxDefaultPosition, wxDefaultSize, 0 ); + m_CommentsName->Wrap( -1 ); + m_LayerListFlexGridSizer->Add( m_CommentsName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + + m_CommentsPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_CommentsPanel->SetBackgroundColour( wxColour( 236, 233, 255 ) ); + + wxBoxSizer* bSizer31; + bSizer31 = new wxBoxSizer( wxVERTICAL ); + + m_CommentsCheckBox = new wxCheckBox( m_CommentsPanel, ID_COMMENTSCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_CommentsCheckBox->SetToolTip( _("If you want a separate layer for comments or notes") ); + + bSizer31->Add( m_CommentsCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_CommentsPanel->SetSizer( bSizer31 ); + m_CommentsPanel->Layout(); + bSizer31->Fit( m_CommentsPanel ); + m_LayerListFlexGridSizer->Add( m_CommentsPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + 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 ); + + m_DrawingsName = new wxStaticText( m_LayersListPanel, ID_DRAWINGSNAME, _("Drawings_later"), wxDefaultPosition, wxDefaultSize, 0 ); + m_DrawingsName->Wrap( -1 ); + m_LayerListFlexGridSizer->Add( m_DrawingsName, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + + m_DrawingsPanel = new wxPanel( m_LayersListPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_DrawingsPanel->SetBackgroundColour( wxColour( 236, 233, 255 ) ); + + wxBoxSizer* bSizer32; + bSizer32 = new wxBoxSizer( wxVERTICAL ); + + m_DrawingsCheckBox = new wxCheckBox( m_DrawingsPanel, ID_DRAWINGSCHECKBOX, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_DrawingsCheckBox->SetToolTip( _("If you want a layer for documentation drawings") ); + + bSizer32->Add( m_DrawingsCheckBox, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + m_DrawingsPanel->SetSizer( bSizer32 ); + m_DrawingsPanel->Layout(); + bSizer32->Fit( m_DrawingsPanel ); + m_LayerListFlexGridSizer->Add( m_DrawingsPanel, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + 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|wxALL, 5 ); + + + m_LayersListPanel->SetSizer( m_LayerListFlexGridSizer ); + m_LayersListPanel->Layout(); + m_LayerListFlexGridSizer->Fit( m_LayersListPanel ); + sbLayersSizer->Add( m_LayersListPanel, 1, wxALL|wxEXPAND, 5 ); + + + bMainSizer->Add( sbLayersSizer, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 ); + + m_sdbSizer2 = new wxStdDialogButtonSizer(); + m_sdbSizer2OK = new wxButton( this, wxID_OK ); + m_sdbSizer2->AddButton( m_sdbSizer2OK ); + m_sdbSizer2Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer2->AddButton( m_sdbSizer2Cancel ); + m_sdbSizer2->Realize(); + + bMainSizer->Add( m_sdbSizer2, 0, wxALL|wxEXPAND, 5 ); + + + 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_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 ); + m_MaskFrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this ); + m_FrontCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner2CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner3CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner4CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner5CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner6CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner7CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner8CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner9CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner10CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner11CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner12CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner13CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner14CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner15CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_BackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_MaskBackCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this ); + 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_PCBEdgesCheckBox->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 ); + m_Eco2CheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this ); + m_CommentsCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this ); + m_DrawingsCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this ); + m_sdbSizer2Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCancelButtonClick ), NULL, this ); + m_sdbSizer2OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnOkButtonClick ), NULL, this ); +} + +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_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 ); + m_MaskFrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this ); + m_FrontCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner2CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner3CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner4CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner5CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner6CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner7CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner8CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner9CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner10CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner11CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner12CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner13CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner14CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_Inner15CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_BackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::DenyChangeCheckBox ), NULL, this ); + m_MaskBackCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this ); + 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_PCBEdgesCheckBox->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 ); + m_Eco2CheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this ); + m_CommentsCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this ); + m_DrawingsCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCheckBox ), NULL, this ); + m_sdbSizer2Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnCancelButtonClick ), NULL, this ); + m_sdbSizer2OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LAYERS_SETUP_BASE::OnOkButtonClick ), NULL, this ); + +} diff --git a/pcbnew/dialogs/dialog_layers_setup_base.fbp b/pcbnew/dialogs/dialog_layers_setup_base.fbp index ca5367d556..7594bc8510 100644 --- a/pcbnew/dialogs/dialog_layers_setup_base.fbp +++ b/pcbnew/dialogs/dialog_layers_setup_base.fbp @@ -1,10 +1,14 @@ - + - + C++ 1 + source_name + 0 + 0 + res UTF-8 connect dialog_layers_setup_base @@ -12,66 +16,78 @@ none 1 DIALOG_LAYERS_SETUP_BASE - + . - + 1 + 1 + 1 0 0 - - - + 0 + wxAUI_MGR_DEFAULT + + + + 1 1 - - - + impl_virtual + + + 0 wxID_ANY - + 550,600 DIALOG_LAYERS_SETUP_BASE - + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - ; + DIALOG_SHIM; dialog_shim.h Layer Setup - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bMainSizer wxVERTICAL none @@ -80,7 +96,7 @@ wxEXPAND 0 - + bChoicesSizer wxHORIZONTAL none @@ -91,60 +107,97 @@ wxID_ANY Preset Layer Groupings - + sbPresetsSizer wxVERTICAL none - + 5 wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "Custom" "Two layers, parts on Front only" "Two layers, parts on Back only" "Two layers, parts on Front and Back" "Four layers, parts on Front only" "Four layers, parts on Front and Back" "All layers on" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_PresetsChoice + 1 + + protected - + 1 + + Resizable 0 - - - - - - - + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnPresetsChoice - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -156,60 +209,97 @@ wxID_ANY Copper Layers - + sbCopperLayersSizer wxVERTICAL none - + 5 wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "2" "4" "6" "8" "10" "12" "14" "16" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_CopperLayersChoice + 1 + + protected - + 1 + + Resizable 0 - - - - - - - + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCopperLayersChoice - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -223,17 +313,17 @@ wxID_ANY Layers - + sbLayersSizer wxVERTICAL none - + 5 wxALIGN_CENTER|wxEXPAND 0 - + bCaptionsSizer wxHORIZONTAL none @@ -242,47 +332,79 @@ wxEXPAND 1 + 1 + 1 + 1 + 1 + + + + + wxSYS_COLOUR_ACTIVECAPTION - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 wxSYS_COLOUR_CAPTIONTEXT - + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_TitlePanel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxRAISED_BORDER|wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -292,56 +414,88 @@ wxALL|wxEXPAND 1 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_LayersListPanel + 1 + + protected - + 1 + + Resizable 0 5 + 1 -1,-1 - - - - + + 0 + + + wxALWAYS_SHOW_SB|wxRAISED_BORDER|wxTAB_TRAVERSAL|wxVSCROLL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + 3 wxHORIZONTAL 0,1 - + 0 - + m_LayerListFlexGridSizer wxFLEX_GROWMODE_SPECIFIED protected @@ -352,50 +506,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_ADHESFRONTNAME Adhes_Front_later - - + + 0 + + + 0 + + 1 m_AdhesFrontName + 1 + + protected - - - + 1 + + Resizable + 1 + + ; - - - - + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -403,49 +589,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,233,236 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY + + 0 -1,-1 + + 0 -1,-1 + 1 m_AdhesFrontPanel + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bSizer6 wxVERTICAL none @@ -454,51 +672,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_ADHESFRONTCHECKBOX - - - + + + 0 + + + 0 + + 1 m_AdhesFrontCheckBox + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 If you want an adhesive template for the front side of the board - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -509,50 +763,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_ADHESFRONTCHOICE Off-board, manufacturing - - + + 0 + + + 0 + + 1 m_AdhesFrontStaticText + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -560,50 +846,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_SOLDPFRONTNAME SoldP_Front_later - - + + 0 + + + 0 + + 1 m_SoldPFrontName + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -611,49 +929,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,233,236 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_SoldPFrontPanel + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bSizer7 wxVERTICAL none @@ -662,51 +1012,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_SOLDPFRONTCHECKBOX - - - + + + 0 + + + 0 + + 1 m_SoldPFrontCheckBox + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 If you want a solder paster layer for front side of the board - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -717,50 +1103,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_SOLDPFRONTCHOICE Off-board, manufacturing - - + + 0 + + + 0 + + 1 m_SoldPFrontStaticText + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -768,50 +1186,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_SILKSFRONTNAME SilkS_Front_later - - + + 0 + + + 0 + + 1 m_SilkSFrontName + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -819,49 +1269,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 255,252,235 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_SilkSFrontPanel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bSizer5 wxVERTICAL none @@ -870,51 +1352,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_SILKSFRONTCHECKBOX - - - + + + 0 + + + 0 + + 1 m_SilkSFrontCheckBox + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 If you want a silk screen layer for the front side of the board - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -925,50 +1443,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_SILKSFRONTCHOICE On-board, non-copper - - + + 0 + + + 0 + + 1 m_SilkSFrontStaticText + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -976,50 +1526,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_MASKFRONTNAME Mask_Front_later - - + + 0 + + + 0 + + 1 m_MaskFrontName + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1027,49 +1609,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 255,252,235 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_MaskFrontPanel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bSizer8 wxVERTICAL none @@ -1078,51 +1692,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_MASKFRONTCHECKBOX - - - + + + 0 + + + 0 + + 1 m_MaskFrontCheckBox + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 If you want a solder mask layer for the front of the board - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -1133,50 +1783,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_MASKFRONTCHOICE On-board, non-copper - - + + 0 + + + 0 + + 1 m_MaskFrontStaticText + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1184,54 +1866,90 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_FRONTNAME - + + 0 + 20 - + + 0 + + 1 m_FrontName + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 Layer name of front (top) copper layer + + wxFILTER_NONE + wxDefaultValidator + Front_later - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1239,49 +1957,81 @@ wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,253,216 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_FrontPanel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bSizer9 wxVERTICAL none @@ -1290,51 +2040,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_FRONTCHECKBOX - - - + + + 0 + + + 0 + + 1 m_FrontCheckBox + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 If you want a front copper layer - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + DenyChangeCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -1345,50 +2131,87 @@ wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "signal" "power" "mixed" "jumper" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_FRONTCHOICE - - + + 0 + + + 0 + + 1 m_FrontChoice + 1 + + protected - + 1 + + Resizable 0 - - + 1 + + + + 0 Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1396,54 +2219,90 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER2NAME - + + 0 + 20 - + + 0 + + 1 m_Inner2Name + 1 + + protected - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + Inner2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1451,49 +2310,81 @@ wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL 1 + 1 + 1 + 1 + 1 + + + + + 236,253,216 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_Inner2Panel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bInner2Sizer wxVERTICAL none @@ -1502,51 +2393,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER2CHECKBOX - - - + + + 0 + + + 0 + + 1 m_Inner2CheckBox + 1 + + protected - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + DenyChangeCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -1557,50 +2484,87 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "signal" "power" "mixed" "jumper" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER2CHOICE - - + + 0 + + + 0 + + 1 m_Inner2Choice + 1 + + protected - + 1 + + Resizable 0 - - + 1 + + + + 0 Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1608,54 +2572,90 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER3NAME - + + 0 + 20 - + + 0 + + 1 m_Inner3Name + 1 + + protected - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + Inner3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1663,49 +2663,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,253,216 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_Inner3Panel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bInner3Sizer wxVERTICAL none @@ -1714,51 +2746,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER3CHECKBOX - - - + + + 0 + + + 0 + + 1 m_Inner3CheckBox + 1 + + protected - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + DenyChangeCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -1769,50 +2837,87 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "signal" "power" "mixed" "jumper" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER3CHOICE - - + + 0 + + + 0 + + 1 m_Inner3Choice + 1 + + protected - + 1 + + Resizable 0 - - + 1 + + + + 0 Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1820,54 +2925,90 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER4NAME - + + 0 + 20 - + + 0 + + 1 m_Inner4Name + 1 + + protected - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + Inner4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1875,49 +3016,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,253,216 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_Inner4Panel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bInner4Sizer wxVERTICAL none @@ -1926,51 +3099,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER4CHECKBOX - - - + + + 0 + + + 0 + + 1 m_Inner4CheckBox + 1 + + protected - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + DenyChangeCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -1981,50 +3190,87 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "signal" "power" "mixed" "jumper" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER4CHOICE - - + + 0 + + + 0 + + 1 m_Inner4Choice + 1 + + protected - + 1 + + Resizable 0 - - + 1 + + + + 0 Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2032,54 +3278,90 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER5NAME - + + 0 + 20 - + + 0 + + 1 m_Inner5Name + 1 + + protected - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + Inner5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2087,49 +3369,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,253,216 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_Inner5Panel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bInner5Sizer wxVERTICAL none @@ -2138,51 +3452,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER5CHECKBOX - - - + + + 0 + + + 0 + + 1 m_Inner5CheckBox + 1 + + protected - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + DenyChangeCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -2193,50 +3543,87 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "signal" "power" "mixed" "jumper" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER5CHOICE - - + + 0 + + + 0 + + 1 m_Inner5Choice + 1 + + protected - + 1 + + Resizable 0 - - + 1 + + + + 0 Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2244,54 +3631,90 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER6NAME - + + 0 + 20 - + + 0 + + 1 m_Inner6Name + 1 + + protected - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + Inner6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2299,49 +3722,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,253,216 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_Inner6Panel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bInner6Sizer wxVERTICAL none @@ -2350,51 +3805,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER6CHECKBOX - - - + + + 0 + + + 0 + + 1 m_Inner6CheckBox + 1 + + protected - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + DenyChangeCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -2405,50 +3896,87 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "signal" "power" "mixed" "jumper" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER6CHOICE - - + + 0 + + + 0 + + 1 m_Inner6Choice + 1 + + protected - + 1 + + Resizable 0 - - + 1 + + + + 0 Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2456,54 +3984,90 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER7NAME - + + 0 + 20 - + + 0 + + 1 m_Inner7Name + 1 + + protected - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + Inner7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2511,49 +4075,81 @@ wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL 1 + 1 + 1 + 1 + 1 + + + + + 236,253,216 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_Inner7Panel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bInner7Sizer wxVERTICAL none @@ -2562,51 +4158,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER7CHECKBOX - - - + + + 0 + + + 0 + + 1 m_Inner7CheckBox + 1 + + protected - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + DenyChangeCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -2617,50 +4249,87 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "signal" "power" "mixed" "jumper" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER7CHOICE - - + + 0 + + + 0 + + 1 m_Inner7Choice + 1 + + protected - + 1 + + Resizable 0 - - + 1 + + + + 0 Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2668,54 +4337,90 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER8NAME - + + 0 + 20 - + + 0 + + 1 m_Inner8Name + 1 + + protected - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + Inner8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2723,49 +4428,81 @@ wxEXPAND 1 + 1 + 1 + 1 + 1 + + + + + 236,253,216 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_Inner8Panel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bInner8Sizer wxVERTICAL none @@ -2774,51 +4511,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER8CHECKBOX - - - + + + 0 + + + 0 + + 1 m_Inner8CheckBox + 1 + + protected - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + DenyChangeCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -2829,50 +4602,87 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "signal" "power" "mixed" "jumper" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER8CHOICE - - + + 0 + + + 0 + + 1 m_Inner8Choice + 1 + + protected - + 1 + + Resizable 0 - - + 1 + + + + 0 Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2880,54 +4690,90 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER9NAME - + + 0 + 20 - + + 0 + + 1 m_Inner9Name + 1 + + protected - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + Inner9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2935,49 +4781,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,253,216 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_Inner9Panel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bInner9Sizer wxVERTICAL none @@ -2986,51 +4864,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER9CHECKBOX - - - + + + 0 + + + 0 + + 1 m_Inner9CheckBox + 1 + + protected - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + DenyChangeCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -3041,50 +4955,87 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "signal" "power" "mixed" "jumper" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER9CHOICE - - + + 0 + + + 0 + + 1 m_Inner9Choice + 1 + + protected - + 1 + + Resizable 0 - - + 1 + + + + 0 Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3092,54 +5043,90 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER10NAME - + + 0 + 20 - + + 0 + + 1 m_Inner10Name + 1 + + protected - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + Inner10 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3147,49 +5134,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,253,216 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_Inner10Panel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bInner10Sizer wxVERTICAL none @@ -3198,51 +5217,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER10CHECKBOX - - - + + + 0 + + + 0 + + 1 m_Inner10CheckBox + 1 + + protected - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + DenyChangeCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -3253,50 +5308,87 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "signal" "power" "mixed" "jumper" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER10CHOICE - - + + 0 + + + 0 + + 1 m_Inner10Choice + 1 + + protected - + 1 + + Resizable 0 - - + 1 + + + + 0 Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3304,54 +5396,90 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER11NAME - + + 0 + 20 - + + 0 + + 1 m_Inner11Name + 1 + + protected - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + Inner11 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3359,49 +5487,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,253,216 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_Inner11Panel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bInner11Sizer wxVERTICAL none @@ -3410,51 +5570,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER11CHECKBOX - - - + + + 0 + + + 0 + + 1 m_Inner11CheckBox + 1 + + protected - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + DenyChangeCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -3465,50 +5661,87 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "signal" "power" "mixed" "jumper" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER11CHOICE - - + + 0 + + + 0 + + 1 m_Inner11Choice + 1 + + protected - + 1 + + Resizable 0 - - + 1 + + + + 0 Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3516,54 +5749,90 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER12NAME - + + 0 + 20 - + + 0 + + 1 m_Inner12Name + 1 + + protected - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + Inner12 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3571,49 +5840,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,253,216 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_Inner12Panel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bInner12Sizer wxVERTICAL none @@ -3622,51 +5923,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER12CHECKBOX - - - + + + 0 + + + 0 + + 1 m_Inner12CheckBox + 1 + + protected - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + DenyChangeCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -3677,50 +6014,87 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "signal" "power" "mixed" "jumper" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER12CHOICE - - + + 0 + + + 0 + + 1 m_Inner12Choice + 1 + + protected - + 1 + + Resizable 0 - - + 1 + + + + 0 Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3728,54 +6102,90 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER13NAME - + + 0 + 20 - + + 0 + + 1 m_Inner13Name + 1 + + protected - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + Inner13 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3783,49 +6193,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,253,216 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_Inner13Panel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bInner13Sizer wxVERTICAL none @@ -3834,51 +6276,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER13CHECKBOX - - - + + + 0 + + + 0 + + 1 m_Inner13CheckBox + 1 + + protected - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + DenyChangeCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -3889,50 +6367,87 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "signal" "power" "mixed" "jumper" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER13CHOICE - - + + 0 + + + 0 + + 1 m_Inner13Choice + 1 + + protected - + 1 + + Resizable 0 - - + 1 + + + + 0 Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3940,54 +6455,90 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER14NAME - + + 0 + 20 - + + 0 + + 1 m_Inner14Name + 1 + + protected - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + Inner14 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3995,49 +6546,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,253,216 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_Inner14Panel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bInner14Sizer wxVERTICAL none @@ -4046,51 +6629,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER14CHECKBOX - - - + + + 0 + + + 0 + + 1 m_Inner14CheckBox + 1 + + protected - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + DenyChangeCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -4101,50 +6720,87 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "signal" "power" "mixed" "jumper" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER14CHOICE - - + + 0 + + + 0 + + 1 m_Inner14Choice + 1 + + protected - + 1 + + Resizable 0 - - + 1 + + + + 0 Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4152,54 +6808,90 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER15NAME - + + 0 + 20 - + + 0 + + 1 m_Inner15Name + 1 + + protected - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + Inner15 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4207,49 +6899,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,253,216 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_Inner15Panel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bInner15Sizer wxVERTICAL none @@ -4258,51 +6982,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER15CHECKBOX - - - + + + 0 + + + 0 + + 1 m_Inner15CheckBox + 1 + + protected - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + DenyChangeCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -4313,50 +7073,87 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "signal" "power" "mixed" "jumper" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_INNER15CHOICE - - + + 0 + + + 0 + + 1 m_Inner15Choice + 1 + + protected - + 1 + + Resizable 0 - - + 1 + + + + 0 Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4364,54 +7161,90 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_BACKNAME - + + 0 + 20 - + + 0 + + 1 m_BackName + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 Layer name of back (bottom) copper layer + + wxFILTER_NONE + wxDefaultValidator + Back - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4419,49 +7252,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,253,216 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_BackPanel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bBackSizer wxVERTICAL none @@ -4470,51 +7335,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_BACKCHECKBOX - - - + + + 0 + + + 0 + + 1 m_BackCheckBox + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 If you want a back copper layer - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + DenyChangeCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -4525,50 +7426,87 @@ wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 "signal" "power" "mixed" "jumper" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_BACKCHOICE - - + + 0 + + + 0 + + 1 m_BackChoice + 1 + + protected - + 1 + + Resizable 0 - - + 1 + + + + 0 Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4576,50 +7514,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_MASKBACKNAME Mask_Back_later - - + + 0 + + + 0 + + 1 m_MaskBackName + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4627,49 +7597,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 255,252,235 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_MaskBackPanel + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bSizer24 wxVERTICAL none @@ -4678,51 +7680,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_MASKBACKCHECKBOX - - - + + + 0 + + + 0 + + 1 m_MaskBackCheckBox + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 If you want a solder mask layer for the back side of the board - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -4733,50 +7771,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_MASKBACKCHOICE On-board, non-copper - - + + 0 + + + 0 + + 1 m_MaskBackStaticText + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4784,50 +7854,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_SILKSBACKNAME SilkS_Back_later - - + + 0 + + + 0 + + 1 m_SilkSBackName + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4835,49 +7937,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 255,252,235 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_SilkSBackPanel + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bSizer25 wxVERTICAL none @@ -4886,51 +8020,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_SILKSBACKCHECKBOX - - - + + + 0 + + + 0 + + 1 m_SilkSBackCheckBox + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 If you want a silk screen layer for the back side of the board - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -4941,50 +8111,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_SILKSBACKCHOICE On-board, non-copper - - + + 0 + + + 0 + + 1 m_SilkSBackStaticText + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4992,50 +8194,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_SOLDPBACKNAME SoldP_Back_later - - + + 0 + + + 0 + + 1 m_SoldPBackName + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5043,49 +8277,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,233,236 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_SoldPBackPanel + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bSizer26 wxVERTICAL none @@ -5094,51 +8360,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_SOLDPBACKCHECKBOX - - - + + + 0 + + + 0 + + 1 m_SoldPBackCheckBox + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 If you want a solder paste layer for the back side of the board - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -5149,50 +8451,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_SOLDPBACKCHOICE Off-board, manufacturing - - + + 0 + + + 0 + + 1 m_SoldPBackStaticText + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5200,50 +8534,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_ADHESBACKNAME Adhes_Back_later - - + + 0 + + + 0 + + 1 m_AdhesBackName + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5251,49 +8617,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,233,236 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_AdhesBackPanel + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bSizer27 wxVERTICAL none @@ -5302,51 +8700,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_ADHESBACKCHECKBOX - - - + + + 0 + + + 0 + + 1 m_AdhesBackCheckBox + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 If you want an adhesive layer for the back side of the board - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -5357,50 +8791,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_ADHESBACKCHOICE Off-board, manufacturing - - + + 0 + + + 0 + + 1 m_AdhesBackStaticText + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5408,50 +8874,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_PCBEDGESNAME PCB_Edges_later - - + + 0 + + + 0 + + 1 m_PCBEdgesName + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5459,49 +8957,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 255,253,216 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_PCBEdgesPanel + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bSizer28 wxVERTICAL none @@ -5510,51 +9040,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_PCBEDGESCHECKBOX - - - + + + 0 + + + 0 + + 1 m_PCBEdgesCheckBox + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 If you want a board perimeter layer - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -5565,50 +9131,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_PCBEDGESCHOICE Board contour - - + + 0 + + + 0 + + 1 m_PCBEdgesStaticText + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5616,50 +9214,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_ECO2NAME Eco1_later - - + + 0 + + + 0 + + 1 m_Eco1Name + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5667,49 +9297,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,233,255 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_Eco1Panel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bSizer29 wxVERTICAL none @@ -5718,51 +9380,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_ECO2CHECKBOX - - - + + + 0 + + + 0 + + 1 m_Eco1CheckBox + 1 + + protected - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -5773,50 +9471,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_ECO2CHOICE Auxiliary - - + + 0 + + + 0 + + 1 m_Eco1StaticText + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5824,50 +9554,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_ECO1NAME Eco2_later - - + + 0 + + + 0 + + 1 m_Eco2Name + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5875,49 +9637,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,233,255 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_Eco2Panel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bSizer30 wxVERTICAL none @@ -5926,51 +9720,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_ECO1CHECKBOX - - - + + + 0 + + + 0 + + 1 m_Eco2CheckBox + 1 + + protected - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -5981,50 +9811,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_ECO1CHOICE Auxiliary - - + + 0 + + + 0 + + 1 m_Eco2StaticText + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -6032,50 +9894,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_COMMENTSNAME Comments_later - - + + 0 + + + 0 + + 1 m_CommentsName + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -6083,49 +9977,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,233,255 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_CommentsPanel + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bSizer31 wxVERTICAL none @@ -6134,51 +10060,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_COMMENTSCHECKBOX - - - + + + 0 + + + 0 + + 1 m_CommentsCheckBox + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 If you want a separate layer for comments or notes - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -6189,50 +10151,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_COMMENTSCHOICE Auxiliary - - + + 0 + + + 0 + + 1 m_CommentsStaticText + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -6240,50 +10234,82 @@ wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_DRAWINGSNAME Drawings_later - - + + 0 + + + 0 + + 1 m_DrawingsName + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -6291,49 +10317,81 @@ wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL 1 + 1 + 1 + 1 + 1 + + + + + 236,233,255 - + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_DrawingsPanel + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + 0 + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bSizer32 wxVERTICAL none @@ -6342,51 +10400,87 @@ wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_DRAWINGSCHECKBOX - - - + + + 0 + + + 0 + + 1 m_DrawingsCheckBox + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 If you want a layer for documentation drawings - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCheckBox - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -6397,50 +10491,82 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_DRAWINGSCHOICE Auxiliary - - + + 0 + + + 0 + + 1 m_DrawingsStaticText + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -6461,17 +10587,17 @@ 1 0 0 - + m_sdbSizer2 protected - + OnCancelButtonClick - - - + + + OnOkButtonClick - - + + diff --git a/pcbnew/dialogs/dialog_layers_setup_base.h b/pcbnew/dialogs/dialog_layers_setup_base.h index 3abe51c94f..e0962b4b63 100644 --- a/pcbnew/dialogs/dialog_layers_setup_base.h +++ b/pcbnew/dialogs/dialog_layers_setup_base.h @@ -1,267 +1,270 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __dialog_layers_setup_base__ -#define __dialog_layers_setup_base__ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -#define ID_ADHESFRONTNAME 1000 -#define ID_ADHESFRONTCHECKBOX 1001 -#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_BASE -/////////////////////////////////////////////////////////////////////////////// -class DIALOG_LAYERS_SETUP_BASE : public wxDialog -{ - private: - - protected: - wxChoice* m_PresetsChoice; - wxChoice* m_CopperLayersChoice; - wxPanel* m_TitlePanel; - wxScrolledWindow* m_LayersListPanel; - wxFlexGridSizer* m_LayerListFlexGridSizer; - wxStaticText* m_AdhesFrontName; - wxPanel* m_AdhesFrontPanel; - wxCheckBox* m_AdhesFrontCheckBox; - wxStaticText* m_AdhesFrontStaticText; - wxStaticText* m_SoldPFrontName; - wxPanel* m_SoldPFrontPanel; - wxCheckBox* m_SoldPFrontCheckBox; - wxStaticText* m_SoldPFrontStaticText; - wxStaticText* m_SilkSFrontName; - wxPanel* m_SilkSFrontPanel; - wxCheckBox* m_SilkSFrontCheckBox; - wxStaticText* m_SilkSFrontStaticText; - wxStaticText* m_MaskFrontName; - wxPanel* m_MaskFrontPanel; - wxCheckBox* m_MaskFrontCheckBox; - wxStaticText* m_MaskFrontStaticText; - wxTextCtrl* m_FrontName; - wxPanel* m_FrontPanel; - wxCheckBox* m_FrontCheckBox; - wxChoice* m_FrontChoice; - wxTextCtrl* m_Inner2Name; - wxPanel* m_Inner2Panel; - wxCheckBox* m_Inner2CheckBox; - wxChoice* m_Inner2Choice; - wxTextCtrl* m_Inner3Name; - wxPanel* m_Inner3Panel; - wxCheckBox* m_Inner3CheckBox; - wxChoice* m_Inner3Choice; - wxTextCtrl* m_Inner4Name; - wxPanel* m_Inner4Panel; - wxCheckBox* m_Inner4CheckBox; - wxChoice* m_Inner4Choice; - wxTextCtrl* m_Inner5Name; - wxPanel* m_Inner5Panel; - wxCheckBox* m_Inner5CheckBox; - wxChoice* m_Inner5Choice; - wxTextCtrl* m_Inner6Name; - wxPanel* m_Inner6Panel; - wxCheckBox* m_Inner6CheckBox; - wxChoice* m_Inner6Choice; - wxTextCtrl* m_Inner7Name; - wxPanel* m_Inner7Panel; - wxCheckBox* m_Inner7CheckBox; - wxChoice* m_Inner7Choice; - wxTextCtrl* m_Inner8Name; - wxPanel* m_Inner8Panel; - wxCheckBox* m_Inner8CheckBox; - wxChoice* m_Inner8Choice; - wxTextCtrl* m_Inner9Name; - wxPanel* m_Inner9Panel; - wxCheckBox* m_Inner9CheckBox; - wxChoice* m_Inner9Choice; - wxTextCtrl* m_Inner10Name; - wxPanel* m_Inner10Panel; - wxCheckBox* m_Inner10CheckBox; - wxChoice* m_Inner10Choice; - wxTextCtrl* m_Inner11Name; - wxPanel* m_Inner11Panel; - wxCheckBox* m_Inner11CheckBox; - wxChoice* m_Inner11Choice; - wxTextCtrl* m_Inner12Name; - wxPanel* m_Inner12Panel; - wxCheckBox* m_Inner12CheckBox; - wxChoice* m_Inner12Choice; - wxTextCtrl* m_Inner13Name; - wxPanel* m_Inner13Panel; - wxCheckBox* m_Inner13CheckBox; - wxChoice* m_Inner13Choice; - wxTextCtrl* m_Inner14Name; - wxPanel* m_Inner14Panel; - wxCheckBox* m_Inner14CheckBox; - wxChoice* m_Inner14Choice; - wxTextCtrl* m_Inner15Name; - wxPanel* m_Inner15Panel; - wxCheckBox* m_Inner15CheckBox; - wxChoice* m_Inner15Choice; - wxTextCtrl* m_BackName; - wxPanel* m_BackPanel; - wxCheckBox* m_BackCheckBox; - wxChoice* m_BackChoice; - wxStaticText* m_MaskBackName; - wxPanel* m_MaskBackPanel; - wxCheckBox* m_MaskBackCheckBox; - wxStaticText* m_MaskBackStaticText; - wxStaticText* m_SilkSBackName; - wxPanel* m_SilkSBackPanel; - wxCheckBox* m_SilkSBackCheckBox; - wxStaticText* m_SilkSBackStaticText; - wxStaticText* m_SoldPBackName; - wxPanel* m_SoldPBackPanel; - wxCheckBox* m_SoldPBackCheckBox; - wxStaticText* m_SoldPBackStaticText; - wxStaticText* m_AdhesBackName; - wxPanel* m_AdhesBackPanel; - wxCheckBox* m_AdhesBackCheckBox; - wxStaticText* m_AdhesBackStaticText; - wxStaticText* m_PCBEdgesName; - wxPanel* m_PCBEdgesPanel; - wxCheckBox* m_PCBEdgesCheckBox; - wxStaticText* m_PCBEdgesStaticText; - wxStaticText* m_Eco1Name; - wxPanel* m_Eco1Panel; - wxCheckBox* m_Eco1CheckBox; - wxStaticText* m_Eco1StaticText; - wxStaticText* m_Eco2Name; - wxPanel* m_Eco2Panel; - wxCheckBox* m_Eco2CheckBox; - wxStaticText* m_Eco2StaticText; - wxStaticText* m_CommentsName; - wxPanel* m_CommentsPanel; - wxCheckBox* m_CommentsCheckBox; - wxStaticText* m_CommentsStaticText; - wxStaticText* m_DrawingsName; - wxPanel* m_DrawingsPanel; - wxCheckBox* m_DrawingsCheckBox; - wxStaticText* m_DrawingsStaticText; - wxStdDialogButtonSizer* m_sdbSizer2; - wxButton* m_sdbSizer2OK; - wxButton* m_sdbSizer2Cancel; - - // Virtual event handlers, overide them in your derived class - virtual void OnPresetsChoice( wxCommandEvent& event ){ event.Skip(); } - virtual void OnCopperLayersChoice( wxCommandEvent& event ){ event.Skip(); } - virtual void OnCheckBox( wxCommandEvent& event ){ event.Skip(); } - virtual void DenyChangeCheckBox( wxCommandEvent& event ){ event.Skip(); } - virtual void OnCancelButtonClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnOkButtonClick( wxCommandEvent& event ){ event.Skip(); } - - - public: - DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Layer Setup"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DIALOG_LAYERS_SETUP_BASE(); - -}; - -#endif //__dialog_layers_setup_base__ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Apr 10 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#ifndef __DIALOG_LAYERS_SETUP_BASE_H__ +#define __DIALOG_LAYERS_SETUP_BASE_H__ + +#include +#include +#include +#include "dialog_shim.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +#define ID_ADHESFRONTNAME 1000 +#define ID_ADHESFRONTCHECKBOX 1001 +#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_BASE +/////////////////////////////////////////////////////////////////////////////// +class DIALOG_LAYERS_SETUP_BASE : public DIALOG_SHIM +{ + private: + + protected: + wxChoice* m_PresetsChoice; + wxChoice* m_CopperLayersChoice; + wxPanel* m_TitlePanel; + wxScrolledWindow* m_LayersListPanel; + wxFlexGridSizer* m_LayerListFlexGridSizer; + wxStaticText* m_AdhesFrontName; + wxPanel* m_AdhesFrontPanel; + wxCheckBox* m_AdhesFrontCheckBox; + wxStaticText* m_AdhesFrontStaticText; + wxStaticText* m_SoldPFrontName; + wxPanel* m_SoldPFrontPanel; + wxCheckBox* m_SoldPFrontCheckBox; + wxStaticText* m_SoldPFrontStaticText; + wxStaticText* m_SilkSFrontName; + wxPanel* m_SilkSFrontPanel; + wxCheckBox* m_SilkSFrontCheckBox; + wxStaticText* m_SilkSFrontStaticText; + wxStaticText* m_MaskFrontName; + wxPanel* m_MaskFrontPanel; + wxCheckBox* m_MaskFrontCheckBox; + wxStaticText* m_MaskFrontStaticText; + wxTextCtrl* m_FrontName; + wxPanel* m_FrontPanel; + wxCheckBox* m_FrontCheckBox; + wxChoice* m_FrontChoice; + wxTextCtrl* m_Inner2Name; + wxPanel* m_Inner2Panel; + wxCheckBox* m_Inner2CheckBox; + wxChoice* m_Inner2Choice; + wxTextCtrl* m_Inner3Name; + wxPanel* m_Inner3Panel; + wxCheckBox* m_Inner3CheckBox; + wxChoice* m_Inner3Choice; + wxTextCtrl* m_Inner4Name; + wxPanel* m_Inner4Panel; + wxCheckBox* m_Inner4CheckBox; + wxChoice* m_Inner4Choice; + wxTextCtrl* m_Inner5Name; + wxPanel* m_Inner5Panel; + wxCheckBox* m_Inner5CheckBox; + wxChoice* m_Inner5Choice; + wxTextCtrl* m_Inner6Name; + wxPanel* m_Inner6Panel; + wxCheckBox* m_Inner6CheckBox; + wxChoice* m_Inner6Choice; + wxTextCtrl* m_Inner7Name; + wxPanel* m_Inner7Panel; + wxCheckBox* m_Inner7CheckBox; + wxChoice* m_Inner7Choice; + wxTextCtrl* m_Inner8Name; + wxPanel* m_Inner8Panel; + wxCheckBox* m_Inner8CheckBox; + wxChoice* m_Inner8Choice; + wxTextCtrl* m_Inner9Name; + wxPanel* m_Inner9Panel; + wxCheckBox* m_Inner9CheckBox; + wxChoice* m_Inner9Choice; + wxTextCtrl* m_Inner10Name; + wxPanel* m_Inner10Panel; + wxCheckBox* m_Inner10CheckBox; + wxChoice* m_Inner10Choice; + wxTextCtrl* m_Inner11Name; + wxPanel* m_Inner11Panel; + wxCheckBox* m_Inner11CheckBox; + wxChoice* m_Inner11Choice; + wxTextCtrl* m_Inner12Name; + wxPanel* m_Inner12Panel; + wxCheckBox* m_Inner12CheckBox; + wxChoice* m_Inner12Choice; + wxTextCtrl* m_Inner13Name; + wxPanel* m_Inner13Panel; + wxCheckBox* m_Inner13CheckBox; + wxChoice* m_Inner13Choice; + wxTextCtrl* m_Inner14Name; + wxPanel* m_Inner14Panel; + wxCheckBox* m_Inner14CheckBox; + wxChoice* m_Inner14Choice; + wxTextCtrl* m_Inner15Name; + wxPanel* m_Inner15Panel; + wxCheckBox* m_Inner15CheckBox; + wxChoice* m_Inner15Choice; + wxTextCtrl* m_BackName; + wxPanel* m_BackPanel; + wxCheckBox* m_BackCheckBox; + wxChoice* m_BackChoice; + wxStaticText* m_MaskBackName; + wxPanel* m_MaskBackPanel; + wxCheckBox* m_MaskBackCheckBox; + wxStaticText* m_MaskBackStaticText; + wxStaticText* m_SilkSBackName; + wxPanel* m_SilkSBackPanel; + wxCheckBox* m_SilkSBackCheckBox; + wxStaticText* m_SilkSBackStaticText; + wxStaticText* m_SoldPBackName; + wxPanel* m_SoldPBackPanel; + wxCheckBox* m_SoldPBackCheckBox; + wxStaticText* m_SoldPBackStaticText; + wxStaticText* m_AdhesBackName; + wxPanel* m_AdhesBackPanel; + wxCheckBox* m_AdhesBackCheckBox; + wxStaticText* m_AdhesBackStaticText; + wxStaticText* m_PCBEdgesName; + wxPanel* m_PCBEdgesPanel; + wxCheckBox* m_PCBEdgesCheckBox; + wxStaticText* m_PCBEdgesStaticText; + wxStaticText* m_Eco1Name; + wxPanel* m_Eco1Panel; + wxCheckBox* m_Eco1CheckBox; + wxStaticText* m_Eco1StaticText; + wxStaticText* m_Eco2Name; + wxPanel* m_Eco2Panel; + wxCheckBox* m_Eco2CheckBox; + wxStaticText* m_Eco2StaticText; + wxStaticText* m_CommentsName; + wxPanel* m_CommentsPanel; + wxCheckBox* m_CommentsCheckBox; + wxStaticText* m_CommentsStaticText; + wxStaticText* m_DrawingsName; + wxPanel* m_DrawingsPanel; + wxCheckBox* m_DrawingsCheckBox; + wxStaticText* m_DrawingsStaticText; + wxStdDialogButtonSizer* m_sdbSizer2; + wxButton* m_sdbSizer2OK; + wxButton* m_sdbSizer2Cancel; + + // Virtual event handlers, overide them in your derived class + virtual void OnPresetsChoice( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCopperLayersChoice( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCheckBox( wxCommandEvent& event ) { event.Skip(); } + virtual void DenyChangeCheckBox( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnOkButtonClick( wxCommandEvent& event ) { event.Skip(); } + + + public: + + DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Layer Setup"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_LAYERS_SETUP_BASE(); + +}; + +#endif //__DIALOG_LAYERS_SETUP_BASE_H__ diff --git a/pcbnew/dialogs/dialog_mask_clearance_base.cpp b/pcbnew/dialogs/dialog_mask_clearance_base.cpp index 1483f20239..0fa7a4c61d 100644 --- a/pcbnew/dialogs/dialog_mask_clearance_base.cpp +++ b/pcbnew/dialogs/dialog_mask_clearance_base.cpp @@ -1,104 +1,109 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include "dialog_mask_clearance_base.h" - -/////////////////////////////////////////////////////////////////////////// - -BEGIN_EVENT_TABLE( DIALOG_PADS_MASK_CLEARANCE_BASE, wxDialog ) - EVT_BUTTON( wxID_CANCEL, DIALOG_PADS_MASK_CLEARANCE_BASE::_wxFB_OnButtonCancelClick ) - EVT_BUTTON( wxID_OK, DIALOG_PADS_MASK_CLEARANCE_BASE::_wxFB_OnButtonOkClick ) -END_EVENT_TABLE() - -DIALOG_PADS_MASK_CLEARANCE_BASE::DIALOG_PADS_MASK_CLEARANCE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) -{ - this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - - wxBoxSizer* bMainSizer; - bMainSizer = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bMainUpperSizer; - bMainUpperSizer = new wxBoxSizer( wxHORIZONTAL ); - - wxStaticBoxSizer* sbMiddleRightSizer; - sbMiddleRightSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Dimensions:") ), wxVERTICAL ); - - m_staticTextInfo = new wxStaticText( this, wxID_ANY, _("Note:\n- a positive value means a mask bigger than a pad\n- a negative value means a mask smaller than a pad\n"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextInfo->Wrap( -1 ); - sbMiddleRightSizer->Add( m_staticTextInfo, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 ); - - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - sbMiddleRightSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); - - wxFlexGridSizer* fgGridSolderMaskSizer; - fgGridSolderMaskSizer = new wxFlexGridSizer( 2, 3, 0, 0 ); - fgGridSolderMaskSizer->SetFlexibleDirection( wxBOTH ); - fgGridSolderMaskSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_MaskClearanceTitle = new wxStaticText( this, wxID_ANY, _("Solder mask clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_MaskClearanceTitle->Wrap( -1 ); - m_MaskClearanceTitle->SetToolTip( _("This is the global clearance between pads and the solder mask\nThis value can be superseded by local values for a footprint or a pad.") ); - - fgGridSolderMaskSizer->Add( m_MaskClearanceTitle, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - - m_SolderMaskMarginCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgGridSolderMaskSizer->Add( m_SolderMaskMarginCtrl, 0, wxEXPAND|wxALL, 5 ); - - m_SolderMaskMarginUnits = new wxStaticText( this, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); - m_SolderMaskMarginUnits->Wrap( -1 ); - fgGridSolderMaskSizer->Add( m_SolderMaskMarginUnits, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); - - m_staticTextSolderPaste = new wxStaticText( this, wxID_ANY, _("Solder paste clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextSolderPaste->Wrap( -1 ); - m_staticTextSolderPaste->SetToolTip( _("This is the global clearance between pads and the solder paste\nThis value can be superseded by local values for a footprint or a pad.\nThe final clearance value is the sum of this value and the clearance value ratio") ); - - fgGridSolderMaskSizer->Add( m_staticTextSolderPaste, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - - m_SolderPasteMarginCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgGridSolderMaskSizer->Add( m_SolderPasteMarginCtrl, 0, wxALL, 5 ); - - m_SolderPasteMarginUnits = new wxStaticText( this, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); - m_SolderPasteMarginUnits->Wrap( -1 ); - fgGridSolderMaskSizer->Add( m_SolderPasteMarginUnits, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); - - m_staticTextRatio = new wxStaticText( this, wxID_ANY, _("Solder mask ratio clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextRatio->Wrap( -1 ); - m_staticTextRatio->SetToolTip( _("This is the global clearance ratio in per cent between pads and the solder paste\nA value of 10 means the clearance value is 10 per cent of the pad size\nThis value can be superseded by local values for a footprint or a pad.\nThe final clearance value is the sum of this value and the clearance value") ); - - fgGridSolderMaskSizer->Add( m_staticTextRatio, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - - m_SolderPasteMarginRatioCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgGridSolderMaskSizer->Add( m_SolderPasteMarginRatioCtrl, 0, wxALL, 5 ); - - m_SolderPasteRatioMarginUnits = new wxStaticText( this, wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 ); - m_SolderPasteRatioMarginUnits->Wrap( -1 ); - fgGridSolderMaskSizer->Add( m_SolderPasteRatioMarginUnits, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); - - sbMiddleRightSizer->Add( fgGridSolderMaskSizer, 1, wxEXPAND, 5 ); - - bMainUpperSizer->Add( sbMiddleRightSizer, 1, wxEXPAND, 5 ); - - bMainSizer->Add( bMainUpperSizer, 1, wxEXPAND, 5 ); - - m_staticline11 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bMainSizer->Add( m_staticline11, 0, wxEXPAND | wxALL, 5 ); - - m_sdbButtonsSizer = new wxStdDialogButtonSizer(); - m_sdbButtonsSizerOK = new wxButton( this, wxID_OK ); - m_sdbButtonsSizer->AddButton( m_sdbButtonsSizerOK ); - m_sdbButtonsSizerCancel = new wxButton( this, wxID_CANCEL ); - m_sdbButtonsSizer->AddButton( m_sdbButtonsSizerCancel ); - m_sdbButtonsSizer->Realize(); - bMainSizer->Add( m_sdbButtonsSizer, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM, 5 ); - - this->SetSizer( bMainSizer ); - this->Layout(); -} - -DIALOG_PADS_MASK_CLEARANCE_BASE::~DIALOG_PADS_MASK_CLEARANCE_BASE() -{ -} +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Apr 10 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include "dialog_mask_clearance_base.h" + +/////////////////////////////////////////////////////////////////////////// + +BEGIN_EVENT_TABLE( DIALOG_PADS_MASK_CLEARANCE_BASE, DIALOG_SHIM ) + EVT_BUTTON( wxID_CANCEL, DIALOG_PADS_MASK_CLEARANCE_BASE::_wxFB_OnButtonCancelClick ) + EVT_BUTTON( wxID_OK, DIALOG_PADS_MASK_CLEARANCE_BASE::_wxFB_OnButtonOkClick ) +END_EVENT_TABLE() + +DIALOG_PADS_MASK_CLEARANCE_BASE::DIALOG_PADS_MASK_CLEARANCE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* bMainSizer; + bMainSizer = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer* bMainUpperSizer; + bMainUpperSizer = new wxBoxSizer( wxHORIZONTAL ); + + wxStaticBoxSizer* sbMiddleRightSizer; + sbMiddleRightSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Dimensions:") ), wxVERTICAL ); + + m_staticTextInfo = new wxStaticText( this, wxID_ANY, _("Note:\n- a positive value means a mask bigger than a pad\n- a negative value means a mask smaller than a pad\n"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextInfo->Wrap( -1 ); + sbMiddleRightSizer->Add( m_staticTextInfo, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 ); + + m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + sbMiddleRightSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); + + wxFlexGridSizer* fgGridSolderMaskSizer; + fgGridSolderMaskSizer = new wxFlexGridSizer( 2, 3, 0, 0 ); + fgGridSolderMaskSizer->SetFlexibleDirection( wxBOTH ); + fgGridSolderMaskSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + m_MaskClearanceTitle = new wxStaticText( this, wxID_ANY, _("Solder mask clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_MaskClearanceTitle->Wrap( -1 ); + m_MaskClearanceTitle->SetToolTip( _("This is the global clearance between pads and the solder mask\nThis value can be superseded by local values for a footprint or a pad.") ); + + fgGridSolderMaskSizer->Add( m_MaskClearanceTitle, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); + + m_SolderMaskMarginCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgGridSolderMaskSizer->Add( m_SolderMaskMarginCtrl, 0, wxEXPAND|wxALL, 5 ); + + m_SolderMaskMarginUnits = new wxStaticText( this, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); + m_SolderMaskMarginUnits->Wrap( -1 ); + fgGridSolderMaskSizer->Add( m_SolderMaskMarginUnits, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); + + m_staticTextSolderPaste = new wxStaticText( this, wxID_ANY, _("Solder paste clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextSolderPaste->Wrap( -1 ); + m_staticTextSolderPaste->SetToolTip( _("This is the global clearance between pads and the solder paste\nThis value can be superseded by local values for a footprint or a pad.\nThe final clearance value is the sum of this value and the clearance value ratio") ); + + fgGridSolderMaskSizer->Add( m_staticTextSolderPaste, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); + + m_SolderPasteMarginCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgGridSolderMaskSizer->Add( m_SolderPasteMarginCtrl, 0, wxALL, 5 ); + + m_SolderPasteMarginUnits = new wxStaticText( this, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); + m_SolderPasteMarginUnits->Wrap( -1 ); + fgGridSolderMaskSizer->Add( m_SolderPasteMarginUnits, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); + + m_staticTextRatio = new wxStaticText( this, wxID_ANY, _("Solder mask ratio clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextRatio->Wrap( -1 ); + m_staticTextRatio->SetToolTip( _("This is the global clearance ratio in per cent between pads and the solder paste\nA value of 10 means the clearance value is 10 per cent of the pad size\nThis value can be superseded by local values for a footprint or a pad.\nThe final clearance value is the sum of this value and the clearance value") ); + + fgGridSolderMaskSizer->Add( m_staticTextRatio, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); + + m_SolderPasteMarginRatioCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgGridSolderMaskSizer->Add( m_SolderPasteMarginRatioCtrl, 0, wxALL, 5 ); + + m_SolderPasteRatioMarginUnits = new wxStaticText( this, wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 ); + m_SolderPasteRatioMarginUnits->Wrap( -1 ); + fgGridSolderMaskSizer->Add( m_SolderPasteRatioMarginUnits, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); + + + sbMiddleRightSizer->Add( fgGridSolderMaskSizer, 1, wxEXPAND, 5 ); + + + bMainUpperSizer->Add( sbMiddleRightSizer, 1, wxEXPAND, 5 ); + + + bMainSizer->Add( bMainUpperSizer, 1, wxEXPAND, 5 ); + + m_staticline11 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + bMainSizer->Add( m_staticline11, 0, wxEXPAND | wxALL, 5 ); + + m_sdbButtonsSizer = new wxStdDialogButtonSizer(); + m_sdbButtonsSizerOK = new wxButton( this, wxID_OK ); + m_sdbButtonsSizer->AddButton( m_sdbButtonsSizerOK ); + m_sdbButtonsSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbButtonsSizer->AddButton( m_sdbButtonsSizerCancel ); + m_sdbButtonsSizer->Realize(); + + bMainSizer->Add( m_sdbButtonsSizer, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM, 5 ); + + + this->SetSizer( bMainSizer ); + this->Layout(); +} + +DIALOG_PADS_MASK_CLEARANCE_BASE::~DIALOG_PADS_MASK_CLEARANCE_BASE() +{ +} diff --git a/pcbnew/dialogs/dialog_mask_clearance_base.fbp b/pcbnew/dialogs/dialog_mask_clearance_base.fbp index 08645184ce..66d0e7b8eb 100644 --- a/pcbnew/dialogs/dialog_mask_clearance_base.fbp +++ b/pcbnew/dialogs/dialog_mask_clearance_base.fbp @@ -2,9 +2,13 @@ - + C++ 1 + source_name + 0 + 0 + res UTF-8 table dialog_mask_clearance_base @@ -12,66 +16,78 @@ none 1 DialogMaskClearanceOptions - + . - + 1 + 1 + 1 1 0 - - - + 0 + wxAUI_MGR_DEFAULT + + + + 1 1 - - - + impl_virtual + + + 0 wxID_ANY - - + + DIALOG_PADS_MASK_CLEARANCE_BASE - + 361,253 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + DIALOG_SHIM; dialog_shim.h Pads Mask Clearance - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bMainSizer wxVERTICAL none @@ -80,7 +96,7 @@ wxEXPAND 1 - + bMainUpperSizer wxHORIZONTAL none @@ -91,60 +107,92 @@ wxID_ANY Dimensions: - + sbMiddleRightSizer wxVERTICAL none - + 5 wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Note: - a positive value means a mask bigger than a pad - a negative value means a mask smaller than a pad - - + + 0 + + + 0 + + 1 m_staticTextInfo + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -152,48 +200,80 @@ wxEXPAND | wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_staticline1 + 1 + + protected - - + 1 + + Resizable + 1 + wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -203,10 +283,10 @@ 3 wxBOTH - - + + 0 - + fgGridSolderMaskSizer wxFLEX_GROWMODE_SPECIFIED none @@ -217,50 +297,82 @@ wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Solder mask clearance: - - + + 0 + + + 0 + + 1 m_MaskClearanceTitle + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 This is the global clearance between pads and the solder mask This value can be superseded by local values for a footprint or a pad. - - - + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -268,54 +380,90 @@ wxEXPAND|wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_SolderMaskMarginCtrl + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -323,50 +471,82 @@ wxTOP|wxBOTTOM|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Inch - - + + 0 + + + 0 + + 1 m_SolderMaskMarginUnits + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -374,50 +554,82 @@ wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Solder paste clearance: - - + + 0 + + + 0 + + 1 m_staticTextSolderPaste + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 This is the global clearance between pads and the solder paste This value can be superseded by local values for a footprint or a pad. The final clearance value is the sum of this value and the clearance value ratio - - - + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -425,54 +637,90 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_SolderPasteMarginCtrl + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -480,50 +728,82 @@ wxTOP|wxBOTTOM|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Inch - - + + 0 + + + 0 + + 1 m_SolderPasteMarginUnits + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -531,50 +811,82 @@ wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Solder mask ratio clearance: - - + + 0 + + + 0 + + 1 m_staticTextRatio + 1 + + protected - - - - + 1 + + Resizable + 1 + + + + 0 This is the global clearance ratio in per cent between pads and the solder paste A value of 10 means the clearance value is 10 per cent of the pad size This value can be superseded by local values for a footprint or a pad. The final clearance value is the sum of this value and the clearance value - - - + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -582,54 +894,90 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + + 0 + + 1 m_SolderPasteMarginRatioCtrl + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -637,50 +985,82 @@ wxTOP|wxBOTTOM|wxRIGHT 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY % - - + + 0 + + + 0 + + 1 m_SolderPasteRatioMarginUnits + 1 + + protected - - - - - - - - + 1 + + Resizable + 1 + + + + 0 + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -694,48 +1074,80 @@ wxEXPAND | wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - + + 0 + + + 0 + + 1 m_staticline11 + 1 + + protected - - + 1 + + Resizable + 1 + wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -751,17 +1163,17 @@ 1 0 0 - + m_sdbButtonsSizer protected - + OnButtonCancelClick - - - + + + OnButtonOkClick - - + + diff --git a/pcbnew/dialogs/dialog_mask_clearance_base.h b/pcbnew/dialogs/dialog_mask_clearance_base.h index 5ceb834e69..4f54d083ad 100644 --- a/pcbnew/dialogs/dialog_mask_clearance_base.h +++ b/pcbnew/dialogs/dialog_mask_clearance_base.h @@ -1,69 +1,72 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __dialog_mask_clearance_base__ -#define __dialog_mask_clearance_base__ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -/////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_PADS_MASK_CLEARANCE_BASE -/////////////////////////////////////////////////////////////////////////////// -class DIALOG_PADS_MASK_CLEARANCE_BASE : public wxDialog -{ - DECLARE_EVENT_TABLE() - private: - - // Private event handlers - void _wxFB_OnButtonCancelClick( wxCommandEvent& event ){ OnButtonCancelClick( event ); } - void _wxFB_OnButtonOkClick( wxCommandEvent& event ){ OnButtonOkClick( event ); } - - - protected: - wxStaticText* m_staticTextInfo; - wxStaticLine* m_staticline1; - wxStaticText* m_MaskClearanceTitle; - wxTextCtrl* m_SolderMaskMarginCtrl; - wxStaticText* m_SolderMaskMarginUnits; - wxStaticText* m_staticTextSolderPaste; - wxTextCtrl* m_SolderPasteMarginCtrl; - wxStaticText* m_SolderPasteMarginUnits; - wxStaticText* m_staticTextRatio; - wxTextCtrl* m_SolderPasteMarginRatioCtrl; - wxStaticText* m_SolderPasteRatioMarginUnits; - wxStaticLine* m_staticline11; - wxStdDialogButtonSizer* m_sdbButtonsSizer; - wxButton* m_sdbButtonsSizerOK; - wxButton* m_sdbButtonsSizerCancel; - - // Virtual event handlers, overide them in your derived class - virtual void OnButtonCancelClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnButtonOkClick( wxCommandEvent& event ){ event.Skip(); } - - - public: - DIALOG_PADS_MASK_CLEARANCE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Pads Mask Clearance"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 361,253 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DIALOG_PADS_MASK_CLEARANCE_BASE(); - -}; - -#endif //__dialog_mask_clearance_base__ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Apr 10 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#ifndef __DIALOG_MASK_CLEARANCE_BASE_H__ +#define __DIALOG_MASK_CLEARANCE_BASE_H__ + +#include +#include +#include +#include "dialog_shim.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +/// Class DIALOG_PADS_MASK_CLEARANCE_BASE +/////////////////////////////////////////////////////////////////////////////// +class DIALOG_PADS_MASK_CLEARANCE_BASE : public DIALOG_SHIM +{ + DECLARE_EVENT_TABLE() + private: + + // Private event handlers + void _wxFB_OnButtonCancelClick( wxCommandEvent& event ){ OnButtonCancelClick( event ); } + void _wxFB_OnButtonOkClick( wxCommandEvent& event ){ OnButtonOkClick( event ); } + + + protected: + wxStaticText* m_staticTextInfo; + wxStaticLine* m_staticline1; + wxStaticText* m_MaskClearanceTitle; + wxTextCtrl* m_SolderMaskMarginCtrl; + wxStaticText* m_SolderMaskMarginUnits; + wxStaticText* m_staticTextSolderPaste; + wxTextCtrl* m_SolderPasteMarginCtrl; + wxStaticText* m_SolderPasteMarginUnits; + wxStaticText* m_staticTextRatio; + wxTextCtrl* m_SolderPasteMarginRatioCtrl; + wxStaticText* m_SolderPasteRatioMarginUnits; + wxStaticLine* m_staticline11; + wxStdDialogButtonSizer* m_sdbButtonsSizer; + wxButton* m_sdbButtonsSizerOK; + wxButton* m_sdbButtonsSizerCancel; + + // Virtual event handlers, overide them in your derived class + virtual void OnButtonCancelClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnButtonOkClick( wxCommandEvent& event ) { event.Skip(); } + + + public: + + DIALOG_PADS_MASK_CLEARANCE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Pads Mask Clearance"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 361,253 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_PADS_MASK_CLEARANCE_BASE(); + +}; + +#endif //__DIALOG_MASK_CLEARANCE_BASE_H__ diff --git a/pcbnew/dialogs/dialog_netlist_fbp.cpp b/pcbnew/dialogs/dialog_netlist_fbp.cpp index 2e079b2544..e01a568c64 100644 --- a/pcbnew/dialogs/dialog_netlist_fbp.cpp +++ b/pcbnew/dialogs/dialog_netlist_fbp.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Sep 8 2010) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -9,7 +9,7 @@ /////////////////////////////////////////////////////////////////////////// -DIALOG_NETLIST_FBP::DIALOG_NETLIST_FBP( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +DIALOG_NETLIST_FBP::DIALOG_NETLIST_FBP( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); @@ -38,6 +38,7 @@ DIALOG_NETLIST_FBP::DIALOG_NETLIST_FBP( wxWindow* parent, wxWindowID id, const w bLeftSizer->Add( m_ChangeExistingFootprintCtrl, 0, wxALL|wxEXPAND, 5 ); + bUpperSizer->Add( bLeftSizer, 1, wxEXPAND, 5 ); wxBoxSizer* bMiddleSizer; @@ -59,6 +60,7 @@ DIALOG_NETLIST_FBP::DIALOG_NETLIST_FBP( wxWindow* parent, wxWindowID id, const w bMiddleSizer->Add( m_RemoveExtraFootprintsCtrl, 0, wxALL|wxEXPAND, 5 ); + bUpperSizer->Add( bMiddleSizer, 1, wxEXPAND, 5 ); wxBoxSizer* bRightSizerButtons; @@ -86,8 +88,10 @@ DIALOG_NETLIST_FBP::DIALOG_NETLIST_FBP( wxWindow* parent, wxWindowID id, const w m_button5 = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 ); bRightSizerButtons->Add( m_button5, 0, wxALL|wxEXPAND, 5 ); + bUpperSizer->Add( bRightSizerButtons, 0, wxALIGN_CENTER_VERTICAL, 5 ); + bMainSizer->Add( bUpperSizer, 0, wxEXPAND, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); @@ -109,6 +113,7 @@ DIALOG_NETLIST_FBP::DIALOG_NETLIST_FBP( wxWindow* parent, wxWindowID id, const w bMainSizer->Add( m_MessageWindow, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + this->SetSizer( bMainSizer ); this->Layout(); diff --git a/pcbnew/dialogs/dialog_netlist_fbp.fbp b/pcbnew/dialogs/dialog_netlist_fbp.fbp index 51a25c2103..e91deea091 100644 --- a/pcbnew/dialogs/dialog_netlist_fbp.fbp +++ b/pcbnew/dialogs/dialog_netlist_fbp.fbp @@ -1,12 +1,14 @@ - + C++ 1 source_name + 0 0 + res UTF-8 connect dialog_netlist_fbp @@ -18,10 +20,13 @@ . 1 + 1 1 1 0 + 0 + wxAUI_MGR_DEFAULT @@ -39,18 +44,20 @@ 519,431 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + DIALOG_SHIM; dialog_shim.h Netlist - - wxFILTER_NONE - wxDefaultValidator - + + + + + + @@ -107,26 +114,57 @@ wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 "Reference" "Timestamp" + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Module Selection: 1 + + 0 + + 0 + 1 m_Select_By_Timestamp + 1 + + protected + 1 + Resizable 0 + 1 wxRA_SPECIFY_COLS + 0 Select how footprints are recognized: by their reference (U1, R3...) (normal setting) or their time stamp (special setting after a full schematic reannotation) wxFILTER_NONE @@ -166,26 +204,57 @@ wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 "Keep" "Change" + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Exchange Module: 1 + + 0 + + 0 + 1 m_ChangeExistingFootprintCtrl + 1 + + protected + 1 + Resizable 0 + 1 wxRA_SPECIFY_COLS + 0 Keep or change an existing footprint when the netlist gives a different footprint wxFILTER_NONE @@ -236,26 +305,57 @@ wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 "Keep" "Delete" + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Bad Tracks Deletion: 1 + + 0 + + 0 + 1 m_DeleteBadTracks + 1 + + protected + 1 + Resizable 0 + 1 wxRA_SPECIFY_COLS + 0 Keep or delete bad tracks after a netlist change wxFILTER_NONE @@ -295,26 +395,57 @@ wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 "Keep" "Delete" + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Extra Footprints 1 + + 0 + + 0 + 1 m_RemoveExtraFootprintsCtrl + 1 + + protected + 1 + Resizable 0 + 1 wxRA_SPECIFY_COLS + 0 Remove footprints found on the Board but not in netlist Note: only not locked footprints will be removed wxFILTER_NONE @@ -365,24 +496,55 @@ wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 ID_OPEN_NELIST Browse Netlist Files + + 0 + + 0 + 1 m_button1 + 1 + + protected + 1 + Resizable + 1 + 0 wxFILTER_NONE @@ -422,24 +584,55 @@ wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 ID_READ_NETLIST_FILE Read Current Netlist + + 0 + + 0 + 1 m_button2 + 1 + + protected + 1 + Resizable + 1 + 0 Read the current netlist and update connections and connectivity info wxFILTER_NONE @@ -479,24 +672,55 @@ wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 ID_TEST_NETLIST Footprints Test + + 0 + + 0 + 1 m_button3 + 1 + + protected + 1 + Resizable + 1 + 0 Read the current neltist file and list missing and extra footprints wxFILTER_NONE @@ -536,24 +760,55 @@ wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 ID_COMPILE_RATSNEST Rebuild Board Connectivity + + 0 + + 0 + 1 m_button4 + 1 + + protected + 1 + Resizable + 1 + 0 Rebuild the full ratsnest (usefull after a manual pad netname edition) wxFILTER_NONE @@ -593,24 +848,55 @@ wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_CANCEL Close + + 0 + + 0 + 1 m_button5 + 1 + + protected + 1 + Resizable + 1 + 0 wxFILTER_NONE @@ -654,27 +940,54 @@ wxEXPAND | wxALL 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 + + 0 + 1 m_staticline1 + 1 + + protected + 1 + Resizable + 1 wxLI_HORIZONTAL + 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -708,28 +1021,55 @@ wxTOP|wxRIGHT|wxLEFT 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Netlist File: + + 0 + + 0 + 1 m_staticTextNetfilename + 1 + + protected + 1 + Resizable + 1 + 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -764,23 +1104,54 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 0 + + 0 + 1 m_NetlistFilenameCtrl + 1 + + protected + 1 + Resizable + 1 + 0 wxFILTER_NONE @@ -824,28 +1195,55 @@ wxTOP|wxRIGHT|wxLEFT 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Messages: + + 0 + + 0 + 1 m_staticText1 + 1 + + protected + 1 + Resizable + 1 + 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -880,23 +1278,54 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 1 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 0 + + 0 -1,200 + 1 m_MessageWindow + 1 + + protected + 1 + Resizable + 1 wxTE_CHARWRAP|wxTE_MULTILINE|wxTE_READONLY|wxTE_WORDWRAP + 0 wxFILTER_NONE diff --git a/pcbnew/dialogs/dialog_netlist_fbp.h b/pcbnew/dialogs/dialog_netlist_fbp.h index 95b709d2db..19762bb790 100644 --- a/pcbnew/dialogs/dialog_netlist_fbp.h +++ b/pcbnew/dialogs/dialog_netlist_fbp.h @@ -1,15 +1,17 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Sep 8 2010) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __dialog_netlist_fbp__ -#define __dialog_netlist_fbp__ +#ifndef __DIALOG_NETLIST_FBP_H__ +#define __DIALOG_NETLIST_FBP_H__ +#include +#include #include - +#include "dialog_shim.h" #include #include #include @@ -28,7 +30,7 @@ /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_NETLIST_FBP /////////////////////////////////////////////////////////////////////////////// -class DIALOG_NETLIST_FBP : public wxDialog +class DIALOG_NETLIST_FBP : public DIALOG_SHIM { private: @@ -38,7 +40,7 @@ class DIALOG_NETLIST_FBP : public wxDialog ID_OPEN_NELIST = 1000, ID_READ_NETLIST_FILE, ID_TEST_NETLIST, - ID_COMPILE_RATSNEST, + ID_COMPILE_RATSNEST }; wxRadioBox* m_Select_By_Timestamp; @@ -66,9 +68,9 @@ class DIALOG_NETLIST_FBP : public wxDialog public: - DIALOG_NETLIST_FBP( wxWindow* parent, wxWindowID id = wxID_CANCEL, const wxString& title = _("Netlist"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 519,431 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_NETLIST_FBP( wxWindow* parent, wxWindowID id = wxID_CANCEL, const wxString& title = _("Netlist"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 519,431 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_NETLIST_FBP(); }; -#endif //__dialog_netlist_fbp__ +#endif //__DIALOG_NETLIST_FBP_H__ diff --git a/pcbnew/dialogs/dialog_orient_footprints_base.cpp b/pcbnew/dialogs/dialog_orient_footprints_base.cpp index 096343ab5f..711b7033f4 100644 --- a/pcbnew/dialogs/dialog_orient_footprints_base.cpp +++ b/pcbnew/dialogs/dialog_orient_footprints_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Sep 8 2010) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -9,7 +9,7 @@ /////////////////////////////////////////////////////////////////////////// -DIALOG_ORIENT_FOOTPRINTS_BASE::DIALOG_ORIENT_FOOTPRINTS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +DIALOG_ORIENT_FOOTPRINTS_BASE::DIALOG_ORIENT_FOOTPRINTS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); @@ -45,6 +45,7 @@ DIALOG_ORIENT_FOOTPRINTS_BASE::DIALOG_ORIENT_FOOTPRINTS_BASE( wxWindow* parent, bSizerLeft->Add( m_ApplyToLocked, 0, wxALL, 5 ); + bSizerMain->Add( bSizerLeft, 1, wxEXPAND, 5 ); wxBoxSizer* bSizerRight; @@ -57,8 +58,10 @@ DIALOG_ORIENT_FOOTPRINTS_BASE::DIALOG_ORIENT_FOOTPRINTS_BASE( wxWindow* parent, m_buttonClose = new wxButton( this, wxID_ANY, _("Close"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerRight->Add( m_buttonClose, 0, wxALL, 5 ); + bSizerMain->Add( bSizerRight, 0, wxALIGN_CENTER_VERTICAL, 5 ); + this->SetSizer( bSizerMain ); this->Layout(); diff --git a/pcbnew/dialogs/dialog_orient_footprints_base.fbp b/pcbnew/dialogs/dialog_orient_footprints_base.fbp index 3ce26da429..d4c53d2e12 100644 --- a/pcbnew/dialogs/dialog_orient_footprints_base.fbp +++ b/pcbnew/dialogs/dialog_orient_footprints_base.fbp @@ -1,12 +1,14 @@ - + C++ 1 source_name + 0 0 + res UTF-8 connect dialog_orient_footprints_base @@ -18,10 +20,13 @@ . 1 + 1 1 0 0 + 0 + wxAUI_MGR_DEFAULT wxBOTH @@ -39,18 +44,20 @@ 403,160 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + DIALOG_SHIM; dialog_shim.h Footprints Orientation - - wxFILTER_NONE - wxDefaultValidator - + + + + + + @@ -98,28 +105,55 @@ wxTOP|wxRIGHT|wxLEFT 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Orientation: + + 0 + + 0 + 1 m_staticText1 + 1 + + protected + 1 + Resizable + 1 + 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -154,23 +188,54 @@ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 0 + + 0 + 1 m_OrientationCtrl + 1 + + protected + 1 + Resizable + 1 + 0 New orientation (0.1 degree resolution) wxFILTER_NONE @@ -214,28 +279,55 @@ wxTOP|wxRIGHT|wxLEFT 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Filter: + + 0 + + 0 + 1 m_staticText2 + 1 + + protected + 1 + Resizable + 1 + 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -270,23 +362,54 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 0 + + 0 + 1 m_FilterPattern + 1 + + protected + 1 + Resizable + 1 + 0 Filter to select footprints by reference wxFILTER_NONE @@ -340,24 +463,55 @@ wxALL 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Include Locked Footprints + + 0 + + 0 + 1 m_ApplyToLocked + 1 + + protected + 1 + Resizable + 1 + 0 Force locked footprints to be modified wxFILTER_NONE @@ -408,24 +562,55 @@ wxALL 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_OK OK + + 0 + + 0 + 1 m_buttonOK + 1 + + protected + 1 + Resizable + 1 + 0 wxFILTER_NONE @@ -465,24 +650,55 @@ wxALL 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Close + + 0 + + 0 + 1 m_buttonClose + 1 + + protected + 1 + Resizable + 1 + 0 wxFILTER_NONE diff --git a/pcbnew/dialogs/dialog_orient_footprints_base.h b/pcbnew/dialogs/dialog_orient_footprints_base.h index d2008166a1..f6ae353550 100644 --- a/pcbnew/dialogs/dialog_orient_footprints_base.h +++ b/pcbnew/dialogs/dialog_orient_footprints_base.h @@ -1,15 +1,17 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Sep 8 2010) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __dialog_orient_footprints_base__ -#define __dialog_orient_footprints_base__ +#ifndef __DIALOG_ORIENT_FOOTPRINTS_BASE_H__ +#define __DIALOG_ORIENT_FOOTPRINTS_BASE_H__ +#include +#include #include - +#include "dialog_shim.h" #include #include #include @@ -28,7 +30,7 @@ /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_ORIENT_FOOTPRINTS_BASE /////////////////////////////////////////////////////////////////////////////// -class DIALOG_ORIENT_FOOTPRINTS_BASE : public wxDialog +class DIALOG_ORIENT_FOOTPRINTS_BASE : public DIALOG_SHIM { private: @@ -37,7 +39,6 @@ class DIALOG_ORIENT_FOOTPRINTS_BASE : public wxDialog wxTextCtrl* m_OrientationCtrl; wxStaticText* m_staticText2; wxTextCtrl* m_FilterPattern; - wxCheckBox* m_ApplyToLocked; wxButton* m_buttonOK; wxButton* m_buttonClose; @@ -49,9 +50,9 @@ class DIALOG_ORIENT_FOOTPRINTS_BASE : public wxDialog public: - DIALOG_ORIENT_FOOTPRINTS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprints Orientation"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 403,160 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_ORIENT_FOOTPRINTS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprints Orientation"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 403,160 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_ORIENT_FOOTPRINTS_BASE(); }; -#endif //__dialog_orient_footprints_base__ +#endif //__DIALOG_ORIENT_FOOTPRINTS_BASE_H__ diff --git a/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.cpp b/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.cpp index d80c686a7f..ca98f5acfe 100644 --- a/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.cpp +++ b/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Sep 8 2010) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -9,7 +9,7 @@ /////////////////////////////////////////////////////////////////////////// -DIALOG_PCBNEW_CONFIG_LIBS_FBP::DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +DIALOG_PCBNEW_CONFIG_LIBS_FBP::DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); @@ -22,6 +22,7 @@ DIALOG_PCBNEW_CONFIG_LIBS_FBP::DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, wxBoxSizer* bLibsButtonsSizer; bLibsButtonsSizer = new wxBoxSizer( wxHORIZONTAL ); + sbLibsChoiceSizer->Add( bLibsButtonsSizer, 0, wxALIGN_CENTER_HORIZONTAL, 5 ); m_ListLibr = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_EXTENDED|wxLB_HSCROLL|wxLB_NEEDED_SB|wxLB_SINGLE ); @@ -54,8 +55,10 @@ DIALOG_PCBNEW_CONFIG_LIBS_FBP::DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, m_buttonDown = new wxButton( this, wxID_ANY, _("Down"), wxDefaultPosition, wxDefaultSize, 0 ); bRightSizer->Add( m_buttonDown, 0, wxALL, 5 ); + sbLibsChoiceSizer->Add( bRightSizer, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + bMainSizer->Add( sbLibsChoiceSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); wxStaticBoxSizer* sbModulesDocSizer; @@ -67,6 +70,7 @@ DIALOG_PCBNEW_CONFIG_LIBS_FBP::DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, m_buttonModDoc = new wxButton( this, wxID_BROWSE_MOD_DOC, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 ); sbModulesDocSizer->Add( m_buttonModDoc, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 10 ); + bMainSizer->Add( sbModulesDocSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); wxStaticBoxSizer* sbSizer4; @@ -81,6 +85,7 @@ DIALOG_PCBNEW_CONFIG_LIBS_FBP::DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, bUserListSizer->Add( m_listUserPaths, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + sbSizer4->Add( bUserListSizer, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); wxBoxSizer* bUserPathsButtonsSizer; @@ -95,8 +100,10 @@ DIALOG_PCBNEW_CONFIG_LIBS_FBP::DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, m_buttonRemovePath = new wxButton( this, wxID_REMOVE_PATH, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 ); bUserPathsButtonsSizer->Add( m_buttonRemovePath, 0, wxALL|wxBOTTOM, 5 ); + sbSizer4->Add( bUserPathsButtonsSizer, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + bMainSizer->Add( sbSizer4, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); wxStaticBoxSizer* sbLibPathSizer; @@ -105,6 +112,7 @@ DIALOG_PCBNEW_CONFIG_LIBS_FBP::DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, wxBoxSizer* bUserLibPathSizer; bUserLibPathSizer = new wxBoxSizer( wxHORIZONTAL ); + sbLibPathSizer->Add( bUserLibPathSizer, 1, wxEXPAND, 5 ); m_DefaultLibraryPathslistBox = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_NEEDED_SB ); @@ -113,6 +121,7 @@ DIALOG_PCBNEW_CONFIG_LIBS_FBP::DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, sbLibPathSizer->Add( m_DefaultLibraryPathslistBox, 0, wxALL|wxEXPAND, 5 ); + bMainSizer->Add( sbLibPathSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); @@ -124,8 +133,10 @@ DIALOG_PCBNEW_CONFIG_LIBS_FBP::DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); + bMainSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); + this->SetSizer( bMainSizer ); this->Layout(); bMainSizer->Fit( this ); diff --git a/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.fbp b/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.fbp index d44c0053c0..8afce21b01 100644 --- a/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.fbp +++ b/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.fbp @@ -1,12 +1,14 @@ - + C++ 1 source_name + 0 0 + res UTF-8 connect dialog_pcbnew_config_libs_and_paths_fbp @@ -18,10 +20,13 @@ . 1 + 1 1 1 0 + 0 + wxAUI_MGR_DEFAULT wxBOTH @@ -39,18 +44,20 @@ -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + DIALOG_SHIM; dialog_shim.h - - wxFILTER_NONE - wxDefaultValidator - + + + + + + OnCloseWindow @@ -112,23 +119,54 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 1 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 + + 0 400,90 + 1 m_ListLibr + 1 + + protected + 1 + Resizable + 1 wxLB_EXTENDED|wxLB_HSCROLL|wxLB_NEEDED_SB|wxLB_SINGLE + 0 List of active library files. Only library files in this list are loaded by Pcbnew. The order of this list is important: Pcbnew searchs for a given footprint using this list order priority. wxFILTER_NONE @@ -178,24 +216,55 @@ wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 ID_ADD_LIB Add + + 0 + + 0 + 1 m_buttonAddLib + 1 + + protected + 1 + Resizable + 1 + 0 Add a new library after the selected library, and load it wxFILTER_NONE @@ -235,24 +304,55 @@ wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Insert + + 0 + + 0 + 1 m_buttonIns + 1 + + protected + 1 + Resizable + 1 + 0 Add a new library before the selected library, and load it wxFILTER_NONE @@ -292,24 +392,55 @@ wxALL|wxALIGN_CENTER_HORIZONTAL 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 ID_REMOVE_LIB Remove + + 0 + + 0 + 1 m_buttonRemoveLib + 1 + + protected + 1 + Resizable + 1 + 0 Unload the selected library wxFILTER_NONE @@ -349,24 +480,55 @@ wxTOP|wxRIGHT|wxLEFT 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Up + + 0 + + 0 + 1 m_buttonUp + 1 + + protected + 1 + Resizable + 1 + 0 wxFILTER_NONE @@ -406,24 +568,55 @@ wxALL 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY Down + + 0 + + 0 + 1 m_buttonDown + 1 + + protected + 1 + Resizable + 1 + 0 wxFILTER_NONE @@ -479,23 +672,54 @@ wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 1 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 0 + + 0 + 1 m_TextHelpModulesFileName + 1 + + protected + 1 + Resizable + 1 + 0 wxFILTER_NONE @@ -539,24 +763,55 @@ wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_BROWSE_MOD_DOC Browse + + 0 + + 0 + 1 m_buttonModDoc + 1 + + protected + 1 + Resizable + 1 + 0 wxFILTER_NONE @@ -619,23 +874,54 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 1 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 + + 0 + 1 m_listUserPaths + 1 + + protected + 1 + Resizable + 1 + 0 Additional paths used in this project. The priority is higher than default KiCad paths. wxFILTER_NONE @@ -687,24 +973,55 @@ wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 ID_LIB_PATH_SEL Add + + 0 + + 0 + 1 m_buttonAddPath + 1 + + protected + 1 + Resizable + 1 + 0 wxFILTER_NONE @@ -744,24 +1061,55 @@ wxLEFT|wxRIGHT|wxTOP 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_INSERT_PATH Insert + + 0 + + 0 + 1 m_buttonInsPath + 1 + + protected + 1 + Resizable + 1 + 0 wxFILTER_NONE @@ -801,24 +1149,55 @@ wxALL|wxBOTTOM 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 0 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_REMOVE_PATH Remove + + 0 + + 0 + 1 m_buttonRemovePath + 1 + + protected + 1 + Resizable + 1 + 0 wxFILTER_NONE @@ -885,23 +1264,54 @@ wxALL|wxEXPAND 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 + + 0 -1,70 + 1 m_DefaultLibraryPathslistBox + 1 + + protected + 1 + Resizable + 1 wxLB_NEEDED_SB + 0 System and user paths used to search and load library files and component doc files. Sorted by decreasing priority order. wxFILTER_NONE @@ -944,27 +1354,54 @@ wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 + 1 + 1 + 1 + 1 + + + + + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left 1 + 1 + 0 0 wxID_ANY + + 0 + + 0 + 1 m_staticline1 + 1 + + protected + 1 + Resizable + 1 wxLI_HORIZONTAL + 0 - - wxFILTER_NONE - wxDefaultValidator - diff --git a/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.h b/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.h index 9716749cf6..9a52a9bffa 100644 --- a/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.h +++ b/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.h @@ -1,15 +1,17 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Sep 8 2010) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __dialog_pcbnew_config_libs_and_paths_fbp__ -#define __dialog_pcbnew_config_libs_and_paths_fbp__ +#ifndef __DIALOG_PCBNEW_CONFIG_LIBS_AND_PATHS_FBP_H__ +#define __DIALOG_PCBNEW_CONFIG_LIBS_AND_PATHS_FBP_H__ +#include +#include #include - +#include "dialog_shim.h" #include #include #include @@ -28,7 +30,7 @@ /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_PCBNEW_CONFIG_LIBS_FBP /////////////////////////////////////////////////////////////////////////////// -class DIALOG_PCBNEW_CONFIG_LIBS_FBP : public wxDialog +class DIALOG_PCBNEW_CONFIG_LIBS_FBP : public DIALOG_SHIM { private: @@ -40,7 +42,7 @@ class DIALOG_PCBNEW_CONFIG_LIBS_FBP : public wxDialog wxID_BROWSE_MOD_DOC, ID_LIB_PATH_SEL, wxID_INSERT_PATH, - wxID_REMOVE_PATH, + wxID_REMOVE_PATH }; wxListBox* m_ListLibr; @@ -76,9 +78,9 @@ class DIALOG_PCBNEW_CONFIG_LIBS_FBP : public wxDialog public: - DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_PCBNEW_CONFIG_LIBS_FBP(); }; -#endif //__dialog_pcbnew_config_libs_and_paths_fbp__ +#endif //__DIALOG_PCBNEW_CONFIG_LIBS_AND_PATHS_FBP_H__ diff --git a/pcbnew/dialogs/dialog_print_for_modedit_base.fbp b/pcbnew/dialogs/dialog_print_for_modedit_base.fbp index dd61d5cdb5..770a136b83 100644 --- a/pcbnew/dialogs/dialog_print_for_modedit_base.fbp +++ b/pcbnew/dialogs/dialog_print_for_modedit_base.fbp @@ -1,696 +1,662 @@ - - - - - - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - dialog_print_for_modedit_base - 1000 - none - 1 - DialogPrintModedit_base - - . - - 1 - 1 - 1 - 1 - 0 - - 1 - 1 - 1 - 1 - - 0 - - - - - - - 1 - wxBOTH - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - impl_virtual - - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - -1,-1 - 1 - DIALOG_PRINT_FOR_MODEDIT_BASE - 1 - - - 1 - - Resizable - 1 - -1,-1 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - DIALOG_SHIM; dialog_shim.h - Print - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - OnCloseWindow - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bMainSizer - wxHORIZONTAL - none - - 5 - wxEXPAND - 0 - - - bmiddleLeftSizer - wxVERTICAL - none - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "fit in page" "Scale 0.5" "Scale 0.7" "Scale 1" "Scale 1.4" "Scale 2" "Scale 3" "Scale 4" "Scale 8" "Scale 16" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Approx. Scale: - 1 - - 0 - - - 0 - - 1 - m_ScaleOption - 1 - - - protected - 1 - - Resizable - 3 - 1 - - wxRA_SPECIFY_COLS - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - - 1 - - - bmiddleRightSizer - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Color" "Black and white" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_PRINT_MODE - Print Mode - 1 - - 0 - - - 0 - - 1 - m_ModeColorOption - 1 - - - protected - 1 - - Resizable - 1 - 1 - - wxRA_SPECIFY_COLS - - 0 - Choose if you want to draw the sheet like it appears on screen, or in black and white mode, better to print it when using black and white printers - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - - 0 - - - bbuttonsSizer - wxVERTICAL - none - - 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_PRINT_OPTIONS - Page Options - - 0 - - - 0 - - 1 - m_buttonOption - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnPrintSetup - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_PREVIEW - Preview - - 0 - - - 0 - - 1 - m_buttonPreview - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnPrintPreview - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_PRINT_ALL - Print - - 0 - - - 0 - - 1 - m_buttonPrint - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnPrintButtonClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_CANCEL - Close - - 0 - - - 0 - - 1 - m_buttonQuit - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnButtonCancelClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + C++ + 1 + source_name + 0 + 0 + res + UTF-8 + connect + dialog_print_for_modedit_base + 1000 + none + 1 + DialogPrintModedit_base + + . + + 1 + 1 + 1 + 1 + 0 + + 0 + wxAUI_MGR_DEFAULT + + wxBOTH + + 1 + 1 + impl_virtual + + + + 0 + wxID_ANY + + -1,-1 + DIALOG_PRINT_FOR_MODEDIT_BASE + + -1,-1 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + DIALOG_SHIM; dialog_shim.h + Print + + + + + + + + + + + + + + OnCloseWindow + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bMainSizer + wxHORIZONTAL + none + + 5 + wxEXPAND + 0 + + + bmiddleLeftSizer + wxVERTICAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "fit in page" "Scale 0.5" "Scale 0.7" "Scale 1" "Scale 1.4" "Scale 2" "Scale 3" "Scale 4" "Scale 8" "Scale 16" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Approx. Scale: + 1 + + 0 + + + 0 + + 1 + m_ScaleOption + 1 + + + protected + 1 + + Resizable + 3 + 1 + + wxRA_SPECIFY_COLS + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + + 1 + + + bmiddleRightSizer + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Color" "Black and white" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_PRINT_MODE + Print Mode + 1 + + 0 + + + 0 + + 1 + m_ModeColorOption + 1 + + + protected + 1 + + Resizable + 1 + 1 + + wxRA_SPECIFY_COLS + + 0 + Choose if you want to draw the sheet like it appears on screen, or in black and white mode, better to print it when using black and white printers + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + + 0 + + + bbuttonsSizer + wxVERTICAL + none + + 5 + wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_PRINT_OPTIONS + Page Options + + 0 + + + 0 + + 1 + m_buttonOption + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnPrintSetup + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_PREVIEW + Preview + + 0 + + + 0 + + 1 + m_buttonPreview + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnPrintPreview + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_PRINT_ALL + Print + + 0 + + + 0 + + 1 + m_buttonPrint + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnPrintButtonClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_CANCEL + Close + + 0 + + + 0 + + 1 + m_buttonQuit + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnButtonCancelClick + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcbnew/dialogs/dialog_print_using_printer_base.fbp b/pcbnew/dialogs/dialog_print_using_printer_base.fbp index d20b3170f9..d470c1d576 100644 --- a/pcbnew/dialogs/dialog_print_using_printer_base.fbp +++ b/pcbnew/dialogs/dialog_print_using_printer_base.fbp @@ -1,1761 +1,1715 @@ - - - - - - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - dialog_print_using_printer_base - 1000 - none - 1 - DialogPrint_base - - . - - 1 - 1 - 1 - 1 - 0 - - 1 - 1 - 1 - 1 - - 0 - - - - - - - 1 - wxBOTH - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - impl_virtual - - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - -1,-1 - 1 - DIALOG_PRINT_USING_PRINTER_base - 1 - - - 1 - - Resizable - 1 - -1,-1 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - DIALOG_SHIM; dialog_shim.h - Print - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - OnCloseWindow - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bMainSizer - wxHORIZONTAL - none - - 5 - wxEXPAND - 1 - - wxID_ANY - Layers: - - sbLayersSizer - wxVERTICAL - none - - - 5 - wxEXPAND - 1 - - - bleftSizer - wxHORIZONTAL - none - - 5 - wxALL - 1 - - wxID_ANY - Copper Layers: - - m_CopperLayersBoxSizer - wxVERTICAL - protected - - - - - 5 - wxALL - 1 - - wxID_ANY - Technical Layers: - - m_TechnicalLayersBoxSizer - wxVERTICAL - protected - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Exclude Edges_Pcb Layer - - 0 - - - 0 - - 1 - m_Exclude_Edges_Pcb - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Exclude contents of Edges_Pcb layer from all other layers - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 0 - - - bmiddleLeftSizer - wxVERTICAL - none - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "fit in page" "Scale 0.5" "Scale 0.7" "Approx. Scale 1" "Accurate Scale 1" "Scale 1.4" "Scale 2" "Scale 3" "Scale 4" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Approx. Scale: - 1 - - 0 - - - 0 - - 1 - m_ScaleOption - 1 - - - protected - 1 - - Resizable - 4 - 1 - - wxRA_SPECIFY_COLS - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - OnScaleSelectionClick - - - - - - - - - - 5 - wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - X Scale Adjust - - 0 - - - 0 - - 1 - m_FineAdjustXscaleTitle - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_FineAdjustXscaleOpt - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Set X scale adjust for exact scale plotting - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Y Scale Adjust - - 0 - - - 0 - - 1 - m_FineAdjustYscaleTitle - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_FineAdjustYscaleOpt - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Set Y scale adjust for exact scale plotting - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 0 - - - bmiddleRightSizer - wxVERTICAL - none - - 5 - wxEXPAND|wxALL - 0 - - wxID_ANY - Options: - - sbOptionsSizer - wxVERTICAL - none - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Default pen size - - 0 - - - 0 - - 1 - m_TextPenWidth - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Pen size used to draw items that have no pen size specified. Used mainly to draw items in sketch mode. - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - -1,-1 - 1 - m_DialogPenWidth - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_FRAME_SEL - Print frame ref - - 0 - - - 0 - - 1 - m_Print_Sheet_Ref - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Print (or not) the Frame references. - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Mirror - - 0 - - - 0 - - 1 - m_Print_Mirror - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "No drill mark" "Small mark" "Real drill" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Pads Drill Opt - 1 - - 0 - - - 0 - - 1 - m_Drill_Shape_Opt - 1 - - - protected - 1 - - Resizable - 1 - 1 - - wxRA_SPECIFY_COLS - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Color" "Black and white" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_PRINT_MODE - Print Mode - 1 - - 0 - - - 0 - - 1 - m_ModeColorOption - 1 - - - protected - 1 - - Resizable - 1 - 1 - - wxRA_SPECIFY_COLS - - 0 - Choose if you want to draw the sheet like it appears on screen, or in black and white mode, better to print it when using black and white printers - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND - 0 - - - bbuttonsSizer - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "1 Page per Layer" "Single page" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_PAGE_MODE - Page Print - 1 - - 0 - - - 0 - - 1 - m_PagesOption - 1 - - - protected - 1 - - Resizable - 0 - 1 - - wxRA_SPECIFY_COLS - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_PRINT_OPTIONS - Page Options - - 0 - - - 0 - - 1 - m_buttonOption - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnPageSetup - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_PREVIEW - Preview - - 0 - - - 0 - - 1 - m_buttonPreview - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnPrintPreview - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_PRINT_ALL - Print - - 0 - - - 0 - - 1 - m_buttonPrint - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnPrintButtonClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_CANCEL - Close - - 0 - - - 0 - - 1 - m_buttonQuit - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnButtonCancelClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - - - - - + + + + + + C++ + 1 + source_name + 0 + 0 + res + UTF-8 + connect + dialog_print_using_printer_base + 1000 + none + 1 + DialogPrint_base + + . + + 1 + 1 + 1 + 1 + 0 + + 0 + wxAUI_MGR_DEFAULT + + wxBOTH + + 1 + 1 + impl_virtual + + + + 0 + wxID_ANY + + -1,-1 + DIALOG_PRINT_USING_PRINTER_base + + -1,-1 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + DIALOG_SHIM; dialog_shim.h + Print + + + + + + + + + + + + + + OnCloseWindow + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bMainSizer + wxHORIZONTAL + none + + 5 + wxEXPAND + 1 + + wxID_ANY + Layers: + + sbLayersSizer + wxVERTICAL + none + + + 5 + wxEXPAND + 1 + + + bleftSizer + wxHORIZONTAL + none + + 5 + wxALL + 1 + + wxID_ANY + Copper Layers: + + m_CopperLayersBoxSizer + wxVERTICAL + protected + + + + + 5 + wxALL + 1 + + wxID_ANY + Technical Layers: + + m_TechnicalLayersBoxSizer + wxVERTICAL + protected + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Exclude Edges_Pcb Layer + + 0 + + + 0 + + 1 + m_Exclude_Edges_Pcb + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Exclude contents of Edges_Pcb layer from all other layers + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 0 + + + bmiddleLeftSizer + wxVERTICAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "fit in page" "Scale 0.5" "Scale 0.7" "Approx. Scale 1" "Accurate Scale 1" "Scale 1.4" "Scale 2" "Scale 3" "Scale 4" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Approx. Scale: + 1 + + 0 + + + 0 + + 1 + m_ScaleOption + 1 + + + protected + 1 + + Resizable + 4 + 1 + + wxRA_SPECIFY_COLS + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + OnScaleSelectionClick + + + + + + + + + + 5 + wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + X Scale Adjust + + 0 + + + 0 + + 1 + m_FineAdjustXscaleTitle + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_FineAdjustXscaleOpt + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Set X scale adjust for exact scale plotting + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Y Scale Adjust + + 0 + + + 0 + + 1 + m_FineAdjustYscaleTitle + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_FineAdjustYscaleOpt + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Set Y scale adjust for exact scale plotting + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 0 + + + bmiddleRightSizer + wxVERTICAL + none + + 5 + wxEXPAND|wxALL + 0 + + wxID_ANY + Options: + + sbOptionsSizer + wxVERTICAL + none + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Default pen size + + 0 + + + 0 + + 1 + m_TextPenWidth + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Pen size used to draw items that have no pen size specified. Used mainly to draw items in sketch mode. + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + -1,-1 + 1 + m_DialogPenWidth + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_FRAME_SEL + Print frame ref + + 0 + + + 0 + + 1 + m_Print_Sheet_Ref + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Print (or not) the Frame references. + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Mirror + + 0 + + + 0 + + 1 + m_Print_Mirror + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "No drill mark" "Small mark" "Real drill" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Pads Drill Opt + 1 + + 0 + + + 0 + + 1 + m_Drill_Shape_Opt + 1 + + + protected + 1 + + Resizable + 1 + 1 + + wxRA_SPECIFY_COLS + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Color" "Black and white" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_PRINT_MODE + Print Mode + 1 + + 0 + + + 0 + + 1 + m_ModeColorOption + 1 + + + protected + 1 + + Resizable + 1 + 1 + + wxRA_SPECIFY_COLS + + 0 + Choose if you want to draw the sheet like it appears on screen, or in black and white mode, better to print it when using black and white printers + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxEXPAND + 0 + + + bbuttonsSizer + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "1 Page per Layer" "Single page" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_PAGE_MODE + Page Print + 1 + + 0 + + + 0 + + 1 + m_PagesOption + 1 + + + protected + 1 + + Resizable + 0 + 1 + + wxRA_SPECIFY_COLS + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_PRINT_OPTIONS + Page Options + + 0 + + + 0 + + 1 + m_buttonOption + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnPageSetup + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_PREVIEW + Preview + + 0 + + + 0 + + 1 + m_buttonPreview + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnPrintPreview + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_PRINT_ALL + Print + + 0 + + + 0 + + 1 + m_buttonPrint + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnPrintButtonClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_CANCEL + Close + + 0 + + + 0 + + 1 + m_buttonQuit + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnButtonCancelClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + + + + + diff --git a/pcbnew/dialogs/dialog_scripting_base.fbp b/pcbnew/dialogs/dialog_scripting_base.fbp index 0852d2f913..ea3e79de5a 100644 --- a/pcbnew/dialogs/dialog_scripting_base.fbp +++ b/pcbnew/dialogs/dialog_scripting_base.fbp @@ -1,207 +1,207 @@ - - - - - - C++ - 1 - source_name - 0 - UTF-8 - connect - dialog_scripting_base - 1000 - none - 0 - DIALOG_SCRIPTING_BASE - - . - - 1 - 1 - 0 - 0 - - - wxBOTH - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - - - DIALOG_SCRIPTING_BASE - - 500,600 - wxDEFAULT_FRAME_STYLE - - Scripting Test Window - - - wxFILTER_NONE - wxDefaultValidator - - - - wxTAB_TRAVERSAL - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer4 - wxVERTICAL - none - - 5 - wxALL - 0 - - - - 1 - 1 - - - 0 - wxID_ANY - - 0 - 480,500 - m_txScript - protected - - - wxHSCROLL|wxTE_MULTILINE - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - - 1 - 0 - 1 - - - 0 - wxID_ANY - &Run - - - m_btRun - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnRunButtonClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + C++ + 1 + source_name + 0 + UTF-8 + connect + dialog_scripting_base + 1000 + none + 0 + DIALOG_SCRIPTING_BASE + + . + + 1 + 1 + 0 + 0 + + + wxBOTH + + 1 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + DIALOG_SCRIPTING_BASE + + 500,600 + wxDEFAULT_FRAME_STYLE + + Scripting Test Window + + + wxFILTER_NONE + wxDefaultValidator + + + + wxTAB_TRAVERSAL + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bSizer4 + wxVERTICAL + none + + 5 + wxALL + 0 + + + + 1 + 1 + + + 0 + wxID_ANY + + 0 + 480,500 + m_txScript + protected + + + wxHSCROLL|wxTE_MULTILINE + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + + + 1 + 0 + 1 + + + 0 + wxID_ANY + &Run + + + m_btRun + protected + + + + + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnRunButtonClick + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcbnew/dialogs/dialog_set_grid.fbp b/pcbnew/dialogs/dialog_set_grid.fbp index 8bcd80c353..2861883161 100644 --- a/pcbnew/dialogs/dialog_set_grid.fbp +++ b/pcbnew/dialogs/dialog_set_grid.fbp @@ -1,1148 +1,1621 @@ - - - - - - C++ - 1 - source_name - 0 - UTF-8 - connect - dialog_set_grid_base - 1000 - none - 1 - dialog_set_grid - - . - - 1 - 1 - 0 - 0 - - - - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - - - DIALOG_SET_GRID_BASE - - -1,-1 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - - Grid Origin and User Grid Size - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerMain - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - - bUpperSizer - wxHORIZONTAL - none - - 5 - wxEXPAND|wxALL - 1 - - wxID_ANY - User Grid Size - - sbLeftSizer - wxVERTICAL - none - - - 5 - wxALL|wxEXPAND - 0 - - - "Inches" "mm" - - 1 - 1 - - - 0 - wxID_ANY - Grid Size Units - 1 - - - m_UnitGrid - protected - - 0 - - wxRA_SPECIFY_COLS - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - - 0 - - 10 - protected - 10 - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - 1 - - - 0 - wxID_ANY - User Grid Size X - - - m_staticTextSizeX - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - - - 1 - 1 - - - 0 - wxID_ANY - - 0 - - m_OptGridSizeX - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - 1 - - - 0 - wxID_ANY - User Grid Size Y - - - m_staticTextSizeY - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - - - 1 - 1 - - - 0 - wxID_ANY - - 0 - - m_OptGridSizeY - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - bSizer4 - wxVERTICAL - none - - 5 - wxEXPAND|wxALL - 1 - - wxID_ANY - Grid Origin - - sbRightSizer - wxVERTICAL - none - - - 5 - wxALL|wxEXPAND - 0 - - 3 - wxBOTH - 1 - - 0 - - fgSizerGridOrigin - wxFLEX_GROWMODE_SPECIFIED - none - 2 - 0 - - 5 - wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT - 0 - - - - 1 - 1 - - - 0 - wxID_ANY - Grid origin X: - - - m_staticTextGridPosX - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL - 0 - - - - 1 - 1 - - - 0 - wxID_ANY - - 0 - - m_GridOriginXCtrl - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - - - 1 - 1 - - - 0 - wxID_ANY - Inches - - - m_TextPosXUnits - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT - 0 - - - - 1 - 1 - - - 0 - wxID_ANY - Grid origin Y: - - - m_staticTextGridPosY - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL - 0 - - - - 1 - 1 - - - 0 - wxID_ANY - - 0 - - m_GridOriginYCtrl - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - - - 1 - 1 - - - 0 - wxID_ANY - Inches - - - m_TextPosYUnits - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - - 1 - 0 - 1 - - - 0 - wxID_ANY - Reset Grid Origin - - - m_buttonReset - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnResetGridOrgClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 1 - - wxID_ANY - Grid for fast switching - - sbSizer4 - wxVERTICAL - none - - - 5 - wxALL|wxEXPAND - 1 - - 2 - wxBOTH - 1 - - 0 - - fgSizer3 - wxFLEX_GROWMODE_SPECIFIED - none - 2 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 - - - - 1 - 1 - - - 0 - wxID_ANY - Fast Grid 1: - - - m_staticTextGrid1 - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - - - - 1 - 1 - - - 0 - wxID_ANY - - - m_comboBoxGrid1 - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - Combo! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 - - - - 1 - 1 - - - 0 - wxID_ANY - Fast Grid 2: - - - m_staticTextGrid2 - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - - - - 1 - 1 - - - 0 - wxID_ANY - - - m_comboBoxGrid2 - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - Combo! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_RIGHT|wxTOP|wxBOTTOM - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer1 - protected - - OnCancelClick - - - - OnOkClick - - - - - - - - + + + + + + C++ + 1 + source_name + 0 + 0 + res + UTF-8 + connect + dialog_set_grid_base + 1000 + none + 1 + dialog_set_grid + + . + + 1 + 1 + 1 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + + 1 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + DIALOG_SET_GRID_BASE + + -1,-1 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + DIALOG_SHIM; dialog_shim.h + Grid Origin and User Grid Size + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bSizerMain + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + + bUpperSizer + wxHORIZONTAL + none + + 5 + wxEXPAND|wxALL + 1 + + wxID_ANY + User Grid Size + + sbLeftSizer + wxVERTICAL + none + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Inches" "mm" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Grid Size Units + 1 + + 0 + + + 0 + + 1 + m_UnitGrid + 1 + + + protected + 1 + + Resizable + 0 + 1 + + wxRA_SPECIFY_COLS + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + + 0 + + 10 + protected + 10 + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + User Grid Size X + + 0 + + + 0 + + 1 + m_staticTextSizeX + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_OptGridSizeX + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + User Grid Size Y + + 0 + + + 0 + + 1 + m_staticTextSizeY + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_OptGridSizeY + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + bSizer4 + wxVERTICAL + none + + 5 + wxEXPAND|wxALL + 1 + + wxID_ANY + Grid Origin + + sbRightSizer + wxVERTICAL + none + + + 5 + wxALL|wxEXPAND + 0 + + 3 + wxBOTH + 1 + + 0 + + fgSizerGridOrigin + wxFLEX_GROWMODE_SPECIFIED + none + 2 + 0 + + 5 + wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Grid origin X: + + 0 + + + 0 + + 1 + m_staticTextGridPosX + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_GridOriginXCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Inches + + 0 + + + 0 + + 1 + m_TextPosXUnits + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Grid origin Y: + + 0 + + + 0 + + 1 + m_staticTextGridPosY + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_GridOriginYCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Inches + + 0 + + + 0 + + 1 + m_TextPosYUnits + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Reset Grid Origin + + 0 + + + 0 + + 1 + m_buttonReset + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnResetGridOrgClick + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 1 + + wxID_ANY + Grid for fast switching + + sbSizer4 + wxVERTICAL + none + + + 5 + wxALL|wxEXPAND + 1 + + 2 + wxBOTH + 1 + + 0 + + fgSizer3 + wxFLEX_GROWMODE_SPECIFIED + none + 2 + 0 + + 5 + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Fast Grid 1: + + 0 + + + 0 + + 1 + m_staticTextGrid1 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_comboBoxGrid1 + 1 + + + protected + 1 + + Resizable + -1 + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + Combo! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Fast Grid 2: + + 0 + + + 0 + + 1 + m_staticTextGrid2 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_comboBoxGrid2 + 1 + + + protected + 1 + + Resizable + -1 + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + Combo! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_RIGHT|wxTOP|wxBOTTOM + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer1 + protected + + OnCancelClick + + + + OnOkClick + + + + + + + + diff --git a/pcbnew/dialogs/dialog_set_grid_base.cpp b/pcbnew/dialogs/dialog_set_grid_base.cpp index 62c30c3776..d50d1d185a 100644 --- a/pcbnew/dialogs/dialog_set_grid_base.cpp +++ b/pcbnew/dialogs/dialog_set_grid_base.cpp @@ -1,147 +1,156 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Sep 6 2011) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include "dialog_set_grid_base.h" - -/////////////////////////////////////////////////////////////////////////// - -DIALOG_SET_GRID_BASE::DIALOG_SET_GRID_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) -{ - this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - - wxBoxSizer* bSizerMain; - bSizerMain = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bUpperSizer; - bUpperSizer = new wxBoxSizer( wxHORIZONTAL ); - - wxStaticBoxSizer* sbLeftSizer; - sbLeftSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("User Grid Size") ), wxVERTICAL ); - - wxString m_UnitGridChoices[] = { _("Inches"), _("mm") }; - int m_UnitGridNChoices = sizeof( m_UnitGridChoices ) / sizeof( wxString ); - m_UnitGrid = new wxRadioBox( this, wxID_ANY, _("Grid Size Units"), wxDefaultPosition, wxDefaultSize, m_UnitGridNChoices, m_UnitGridChoices, 1, wxRA_SPECIFY_COLS ); - m_UnitGrid->SetSelection( 0 ); - sbLeftSizer->Add( m_UnitGrid, 0, wxALL|wxEXPAND, 5 ); - - - sbLeftSizer->Add( 10, 10, 0, 0, 5 ); - - m_staticTextSizeX = new wxStaticText( this, wxID_ANY, _("User Grid Size X"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextSizeX->Wrap( -1 ); - sbLeftSizer->Add( m_staticTextSizeX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_OptGridSizeX = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - sbLeftSizer->Add( m_OptGridSizeX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - m_staticTextSizeY = new wxStaticText( this, wxID_ANY, _("User Grid Size Y"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextSizeY->Wrap( -1 ); - sbLeftSizer->Add( m_staticTextSizeY, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_OptGridSizeY = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - sbLeftSizer->Add( m_OptGridSizeY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - bUpperSizer->Add( sbLeftSizer, 1, wxEXPAND|wxALL, 5 ); - - wxBoxSizer* bSizer4; - bSizer4 = new wxBoxSizer( wxVERTICAL ); - - wxStaticBoxSizer* sbRightSizer; - sbRightSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Grid Origin") ), wxVERTICAL ); - - wxFlexGridSizer* fgSizerGridOrigin; - fgSizerGridOrigin = new wxFlexGridSizer( 2, 3, 0, 0 ); - fgSizerGridOrigin->AddGrowableCol( 1 ); - fgSizerGridOrigin->SetFlexibleDirection( wxBOTH ); - fgSizerGridOrigin->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_staticTextGridPosX = new wxStaticText( this, wxID_ANY, _("Grid origin X:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextGridPosX->Wrap( -1 ); - fgSizerGridOrigin->Add( m_staticTextGridPosX, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - - m_GridOriginXCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerGridOrigin->Add( m_GridOriginXCtrl, 0, wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - m_TextPosXUnits = new wxStaticText( this, wxID_ANY, _("Inches"), wxDefaultPosition, wxDefaultSize, 0 ); - m_TextPosXUnits->Wrap( -1 ); - fgSizerGridOrigin->Add( m_TextPosXUnits, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - m_staticTextGridPosY = new wxStaticText( this, wxID_ANY, _("Grid origin Y:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextGridPosY->Wrap( -1 ); - fgSizerGridOrigin->Add( m_staticTextGridPosY, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - - m_GridOriginYCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerGridOrigin->Add( m_GridOriginYCtrl, 0, wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - m_TextPosYUnits = new wxStaticText( this, wxID_ANY, _("Inches"), wxDefaultPosition, wxDefaultSize, 0 ); - m_TextPosYUnits->Wrap( -1 ); - fgSizerGridOrigin->Add( m_TextPosYUnits, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - sbRightSizer->Add( fgSizerGridOrigin, 0, wxALL|wxEXPAND, 5 ); - - m_buttonReset = new wxButton( this, wxID_ANY, _("Reset Grid Origin"), wxDefaultPosition, wxDefaultSize, 0 ); - sbRightSizer->Add( m_buttonReset, 0, wxALL|wxEXPAND, 5 ); - - bSizer4->Add( sbRightSizer, 1, wxEXPAND|wxALL, 5 ); - - wxStaticBoxSizer* sbSizer4; - sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Grid for fast switching") ), wxVERTICAL ); - - wxFlexGridSizer* fgSizer3; - fgSizer3 = new wxFlexGridSizer( 2, 2, 0, 0 ); - fgSizer3->AddGrowableCol( 1 ); - fgSizer3->SetFlexibleDirection( wxBOTH ); - fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_staticTextGrid1 = new wxStaticText( this, wxID_ANY, _("Fast Grid 1:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextGrid1->Wrap( -1 ); - fgSizer3->Add( m_staticTextGrid1, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_comboBoxGrid1 = new wxComboBox( this, wxID_ANY, _("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - fgSizer3->Add( m_comboBoxGrid1, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - - m_staticTextGrid2 = new wxStaticText( this, wxID_ANY, _("Fast Grid 2:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextGrid2->Wrap( -1 ); - fgSizer3->Add( m_staticTextGrid2, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_comboBoxGrid2 = new wxComboBox( this, wxID_ANY, _("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - fgSizer3->Add( m_comboBoxGrid2, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - - sbSizer4->Add( fgSizer3, 1, wxALL|wxEXPAND, 5 ); - - bSizer4->Add( sbSizer4, 1, wxALL|wxEXPAND, 5 ); - - bUpperSizer->Add( bSizer4, 1, wxEXPAND, 5 ); - - bSizerMain->Add( bUpperSizer, 1, wxEXPAND, 5 ); - - m_sdbSizer1 = new wxStdDialogButtonSizer(); - m_sdbSizer1OK = new wxButton( this, wxID_OK ); - m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); - m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); - m_sdbSizer1->Realize(); - bSizerMain->Add( m_sdbSizer1, 0, wxALIGN_RIGHT|wxTOP|wxBOTTOM, 5 ); - - this->SetSizer( bSizerMain ); - this->Layout(); - bSizerMain->Fit( this ); - - // Connect Events - m_buttonReset->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SET_GRID_BASE::OnResetGridOrgClick ), NULL, this ); - m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SET_GRID_BASE::OnCancelClick ), NULL, this ); - m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SET_GRID_BASE::OnOkClick ), NULL, this ); -} - -DIALOG_SET_GRID_BASE::~DIALOG_SET_GRID_BASE() -{ - // Disconnect Events - m_buttonReset->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SET_GRID_BASE::OnResetGridOrgClick ), NULL, this ); - m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SET_GRID_BASE::OnCancelClick ), NULL, this ); - m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SET_GRID_BASE::OnOkClick ), NULL, this ); - -} +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Apr 10 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include "dialog_set_grid_base.h" + +/////////////////////////////////////////////////////////////////////////// + +DIALOG_SET_GRID_BASE::DIALOG_SET_GRID_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* bSizerMain; + bSizerMain = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer* bUpperSizer; + bUpperSizer = new wxBoxSizer( wxHORIZONTAL ); + + wxStaticBoxSizer* sbLeftSizer; + sbLeftSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("User Grid Size") ), wxVERTICAL ); + + wxString m_UnitGridChoices[] = { _("Inches"), _("mm") }; + int m_UnitGridNChoices = sizeof( m_UnitGridChoices ) / sizeof( wxString ); + m_UnitGrid = new wxRadioBox( this, wxID_ANY, _("Grid Size Units"), wxDefaultPosition, wxDefaultSize, m_UnitGridNChoices, m_UnitGridChoices, 1, wxRA_SPECIFY_COLS ); + m_UnitGrid->SetSelection( 0 ); + sbLeftSizer->Add( m_UnitGrid, 0, wxALL|wxEXPAND, 5 ); + + + sbLeftSizer->Add( 10, 10, 0, 0, 5 ); + + m_staticTextSizeX = new wxStaticText( this, wxID_ANY, _("User Grid Size X"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextSizeX->Wrap( -1 ); + sbLeftSizer->Add( m_staticTextSizeX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_OptGridSizeX = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + sbLeftSizer->Add( m_OptGridSizeX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + + m_staticTextSizeY = new wxStaticText( this, wxID_ANY, _("User Grid Size Y"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextSizeY->Wrap( -1 ); + sbLeftSizer->Add( m_staticTextSizeY, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_OptGridSizeY = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + sbLeftSizer->Add( m_OptGridSizeY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + + + bUpperSizer->Add( sbLeftSizer, 1, wxEXPAND|wxALL, 5 ); + + wxBoxSizer* bSizer4; + bSizer4 = new wxBoxSizer( wxVERTICAL ); + + wxStaticBoxSizer* sbRightSizer; + sbRightSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Grid Origin") ), wxVERTICAL ); + + wxFlexGridSizer* fgSizerGridOrigin; + fgSizerGridOrigin = new wxFlexGridSizer( 2, 3, 0, 0 ); + fgSizerGridOrigin->AddGrowableCol( 1 ); + fgSizerGridOrigin->SetFlexibleDirection( wxBOTH ); + fgSizerGridOrigin->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + m_staticTextGridPosX = new wxStaticText( this, wxID_ANY, _("Grid origin X:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextGridPosX->Wrap( -1 ); + fgSizerGridOrigin->Add( m_staticTextGridPosX, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); + + m_GridOriginXCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizerGridOrigin->Add( m_GridOriginXCtrl, 0, wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + m_TextPosXUnits = new wxStaticText( this, wxID_ANY, _("Inches"), wxDefaultPosition, wxDefaultSize, 0 ); + m_TextPosXUnits->Wrap( -1 ); + fgSizerGridOrigin->Add( m_TextPosXUnits, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + m_staticTextGridPosY = new wxStaticText( this, wxID_ANY, _("Grid origin Y:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextGridPosY->Wrap( -1 ); + fgSizerGridOrigin->Add( m_staticTextGridPosY, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); + + m_GridOriginYCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizerGridOrigin->Add( m_GridOriginYCtrl, 0, wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + m_TextPosYUnits = new wxStaticText( this, wxID_ANY, _("Inches"), wxDefaultPosition, wxDefaultSize, 0 ); + m_TextPosYUnits->Wrap( -1 ); + fgSizerGridOrigin->Add( m_TextPosYUnits, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + + sbRightSizer->Add( fgSizerGridOrigin, 0, wxALL|wxEXPAND, 5 ); + + m_buttonReset = new wxButton( this, wxID_ANY, _("Reset Grid Origin"), wxDefaultPosition, wxDefaultSize, 0 ); + sbRightSizer->Add( m_buttonReset, 0, wxALL|wxEXPAND, 5 ); + + + bSizer4->Add( sbRightSizer, 1, wxEXPAND|wxALL, 5 ); + + wxStaticBoxSizer* sbSizer4; + sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Grid for fast switching") ), wxVERTICAL ); + + wxFlexGridSizer* fgSizer3; + fgSizer3 = new wxFlexGridSizer( 2, 2, 0, 0 ); + fgSizer3->AddGrowableCol( 1 ); + fgSizer3->SetFlexibleDirection( wxBOTH ); + fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + m_staticTextGrid1 = new wxStaticText( this, wxID_ANY, _("Fast Grid 1:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextGrid1->Wrap( -1 ); + fgSizer3->Add( m_staticTextGrid1, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); + + m_comboBoxGrid1 = new wxComboBox( this, wxID_ANY, _("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + fgSizer3->Add( m_comboBoxGrid1, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + + m_staticTextGrid2 = new wxStaticText( this, wxID_ANY, _("Fast Grid 2:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextGrid2->Wrap( -1 ); + fgSizer3->Add( m_staticTextGrid2, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); + + m_comboBoxGrid2 = new wxComboBox( this, wxID_ANY, _("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + fgSizer3->Add( m_comboBoxGrid2, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + + + sbSizer4->Add( fgSizer3, 1, wxALL|wxEXPAND, 5 ); + + + bSizer4->Add( sbSizer4, 1, wxALL|wxEXPAND, 5 ); + + + bUpperSizer->Add( bSizer4, 1, wxEXPAND, 5 ); + + + bSizerMain->Add( bUpperSizer, 1, wxEXPAND, 5 ); + + m_sdbSizer1 = new wxStdDialogButtonSizer(); + m_sdbSizer1OK = new wxButton( this, wxID_OK ); + m_sdbSizer1->AddButton( m_sdbSizer1OK ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); + m_sdbSizer1->Realize(); + + bSizerMain->Add( m_sdbSizer1, 0, wxALIGN_RIGHT|wxTOP|wxBOTTOM, 5 ); + + + this->SetSizer( bSizerMain ); + this->Layout(); + bSizerMain->Fit( this ); + + // Connect Events + m_buttonReset->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SET_GRID_BASE::OnResetGridOrgClick ), NULL, this ); + m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SET_GRID_BASE::OnCancelClick ), NULL, this ); + m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SET_GRID_BASE::OnOkClick ), NULL, this ); +} + +DIALOG_SET_GRID_BASE::~DIALOG_SET_GRID_BASE() +{ + // Disconnect Events + m_buttonReset->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SET_GRID_BASE::OnResetGridOrgClick ), NULL, this ); + m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SET_GRID_BASE::OnCancelClick ), NULL, this ); + m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SET_GRID_BASE::OnOkClick ), NULL, this ); + +} diff --git a/pcbnew/dialogs/dialog_set_grid_base.h b/pcbnew/dialogs/dialog_set_grid_base.h index 0ca1808db8..0fc0dc5bac 100644 --- a/pcbnew/dialogs/dialog_set_grid_base.h +++ b/pcbnew/dialogs/dialog_set_grid_base.h @@ -1,72 +1,73 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Sep 6 2011) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __dialog_set_grid_base__ -#define __dialog_set_grid_base__ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - - -/////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_SET_GRID_BASE -/////////////////////////////////////////////////////////////////////////////// -class DIALOG_SET_GRID_BASE : public wxDialog -{ - private: - - protected: - wxRadioBox* m_UnitGrid; - - wxStaticText* m_staticTextSizeX; - wxTextCtrl* m_OptGridSizeX; - wxStaticText* m_staticTextSizeY; - wxTextCtrl* m_OptGridSizeY; - wxStaticText* m_staticTextGridPosX; - wxTextCtrl* m_GridOriginXCtrl; - wxStaticText* m_TextPosXUnits; - wxStaticText* m_staticTextGridPosY; - wxTextCtrl* m_GridOriginYCtrl; - wxStaticText* m_TextPosYUnits; - wxButton* m_buttonReset; - wxStaticText* m_staticTextGrid1; - wxComboBox* m_comboBoxGrid1; - wxStaticText* m_staticTextGrid2; - wxComboBox* m_comboBoxGrid2; - wxStdDialogButtonSizer* m_sdbSizer1; - wxButton* m_sdbSizer1OK; - wxButton* m_sdbSizer1Cancel; - - // Virtual event handlers, overide them in your derived class - virtual void OnResetGridOrgClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } - - - public: - - DIALOG_SET_GRID_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Grid Origin and User Grid Size"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DIALOG_SET_GRID_BASE(); - -}; - -#endif //__dialog_set_grid_base__ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Apr 10 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#ifndef __DIALOG_SET_GRID_BASE_H__ +#define __DIALOG_SET_GRID_BASE_H__ + +#include +#include +#include +#include "dialog_shim.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////////////// +/// Class DIALOG_SET_GRID_BASE +/////////////////////////////////////////////////////////////////////////////// +class DIALOG_SET_GRID_BASE : public DIALOG_SHIM +{ + private: + + protected: + wxRadioBox* m_UnitGrid; + wxStaticText* m_staticTextSizeX; + wxTextCtrl* m_OptGridSizeX; + wxStaticText* m_staticTextSizeY; + wxTextCtrl* m_OptGridSizeY; + wxStaticText* m_staticTextGridPosX; + wxTextCtrl* m_GridOriginXCtrl; + wxStaticText* m_TextPosXUnits; + wxStaticText* m_staticTextGridPosY; + wxTextCtrl* m_GridOriginYCtrl; + wxStaticText* m_TextPosYUnits; + wxButton* m_buttonReset; + wxStaticText* m_staticTextGrid1; + wxComboBox* m_comboBoxGrid1; + wxStaticText* m_staticTextGrid2; + wxComboBox* m_comboBoxGrid2; + wxStdDialogButtonSizer* m_sdbSizer1; + wxButton* m_sdbSizer1OK; + wxButton* m_sdbSizer1Cancel; + + // Virtual event handlers, overide them in your derived class + virtual void OnResetGridOrgClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } + + + public: + + DIALOG_SET_GRID_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Grid Origin and User Grid Size"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_SET_GRID_BASE(); + +}; + +#endif //__DIALOG_SET_GRID_BASE_H__