From 1f3d5cee0ec60bd99998ab4855a55b92a3424e21 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Thu, 15 Nov 2018 09:34:29 +0100 Subject: [PATCH] Fix a few minor I18n issues. --- ...ialog_edit_component_in_schematic_base.cpp | 6 +- ...ialog_edit_component_in_schematic_base.fbp | 202 +- .../dialog_edit_component_in_schematic_base.h | 4 +- pagelayout_editor/pl_editor_frame.cpp | 2 +- ...og_edit_footprint_for_BoardEditor_base.fbp | 5840 ++++++++--------- 5 files changed, 3114 insertions(+), 2940 deletions(-) diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp index f76f6df417..581d7835c4 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Jul 11 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -212,11 +212,11 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE bSizer101->Add( 0, 0, 1, wxEXPAND, 5 ); - m_spiceFieldsButton = new wxButton( this, wxID_ANY, _(" Edit Spice Model... "), wxDefaultPosition, wxDefaultSize, 0 ); + m_spiceFieldsButton = new wxButton( this, wxID_ANY, _("Edit Spice Model..."), wxDefaultPosition, wxDefaultSize, 0 ); bSizer101->Add( m_spiceFieldsButton, 0, wxEXPAND|wxALL, 5 ); - bSizer101->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bSizer101->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 15 ); m_stdDialogButtonSizer = new wxStdDialogButtonSizer(); m_stdDialogButtonSizerOK = new wxButton( this, wxID_OK ); diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp b/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp index 8529ac7737..74faeef375 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp @@ -1,6 +1,6 @@ - + ; C++ @@ -14,6 +14,7 @@ dialog_edit_component_in_schematic_base 1000 none + 1 dialog_edit_component_in_schematic_base @@ -54,13 +55,20 @@ - + + + + + + + + @@ -75,17 +83,23 @@ + + + + + + OnUpdateUI @@ -192,7 +206,14 @@ + + + + + + + @@ -280,6 +301,7 @@ 1 1 + 0 0 @@ -293,9 +315,10 @@ 0 0 - wxID_ANY Add Field + + 0 0 @@ -310,8 +333,9 @@ protected 1 + + Resizable - 1 @@ -325,8 +349,15 @@ + + + + + + OnAddField + @@ -373,6 +404,7 @@ 1 1 + 0 0 @@ -386,9 +418,10 @@ 0 0 - wxID_ANY Move Up + + 0 0 @@ -403,8 +436,9 @@ protected 1 + + Resizable - 1 @@ -418,8 +452,15 @@ + + + + + + OnMoveUp + @@ -466,6 +507,7 @@ 1 1 + 0 0 @@ -479,9 +521,10 @@ 0 0 - wxID_ANY Move Down + + 0 0 @@ -496,8 +539,9 @@ protected 1 + + Resizable - 1 @@ -511,8 +555,15 @@ + + + + + + OnMoveDown + @@ -569,6 +620,7 @@ 1 1 + 0 0 @@ -582,9 +634,10 @@ 0 0 - wxID_ANY Delete Field + + 0 0 @@ -599,8 +652,9 @@ protected 1 + + Resizable - 1 @@ -614,8 +668,15 @@ + + + + + + OnDeleteField + @@ -665,25 +726,31 @@ + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY Update Fields from Library... + + 0 0 @@ -698,6 +765,8 @@ protected 1 + + Resizable 1 @@ -712,8 +781,15 @@ + + + + + + UpdateFieldsFromLibrary + @@ -813,6 +889,7 @@ 0 wxID_ANY Library Reference: + 0 0 @@ -838,7 +915,14 @@ -1 + + + + + + + @@ -934,7 +1018,14 @@ + + + + + + + @@ -985,6 +1076,7 @@ 1 1 + 0 0 @@ -998,9 +1090,10 @@ 0 0 - wxID_ANY Browse Library + + 0 0 @@ -1015,8 +1108,9 @@ protected 1 + + Resizable - 1 @@ -1030,8 +1124,15 @@ + + + + + + OnBrowseLibrary + @@ -1091,6 +1192,7 @@ 0 wxID_ANY Unit: + 0 0 @@ -1116,7 +1218,14 @@ -1 + + + + + + + @@ -1203,7 +1312,14 @@ + + + + + + + @@ -1301,7 +1417,14 @@ + + + + + + + @@ -1395,7 +1518,14 @@ + + + + + + + @@ -1485,7 +1615,14 @@ + + + + + + + @@ -1569,7 +1706,14 @@ + + + + + + + @@ -1645,6 +1789,7 @@ 0 wxID_ANY Unique ID: + 0 0 @@ -1670,7 +1815,14 @@ -1 + + + + + + + @@ -1757,7 +1909,14 @@ + + + + + + + @@ -1813,25 +1972,31 @@ + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY - Edit Spice Model... + Edit Spice Model... + + 0 0 @@ -1846,6 +2011,8 @@ protected 1 + + Resizable 1 @@ -1860,8 +2027,15 @@ + + + + + + OnEditSpiceModel + @@ -1887,7 +2061,7 @@ - 5 + 15 wxEXPAND|wxRIGHT|wxLEFT 0 diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_base.h b/eeschema/dialogs/dialog_edit_component_in_schematic_base.h index f8d6370d22..90576faf59 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_base.h +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Jul 11 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -20,10 +20,10 @@ class WX_GRID; #include #include #include +#include #include #include #include -#include #include #include #include diff --git a/pagelayout_editor/pl_editor_frame.cpp b/pagelayout_editor/pl_editor_frame.cpp index 9556a8c5d8..ea279f73c6 100644 --- a/pagelayout_editor/pl_editor_frame.cpp +++ b/pagelayout_editor/pl_editor_frame.cpp @@ -185,7 +185,7 @@ void PL_EDITOR_FRAME::OnCloseWindow( wxCloseEvent& Event ) { if( GetScreen()->IsModify() ) { - if( !HandleUnsavedChanges( this, _( "The current page layout has been modified. Save changes?" ), + if( !HandleUnsavedChanges( this, _( "The current page layout has been modified. Save changes?" ), [&]()->bool { return saveCurrentPageLayout(); } ) ) { Event.Veto(); diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp index dd1e9b1ffd..8aa53d0ba9 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp @@ -1,8 +1,8 @@ - + - + C++ 1 source_name @@ -16,9 +16,9 @@ none 1 dialog_edit_footprint_for_BoardEditor_base - + . - + 1 1 1 @@ -29,67 +29,67 @@ 0 wxAUI_MGR_DEFAULT - - - + + + 1 1 impl_virtual - - - + + + 0 wxID_ANY - - + + DIALOG_FOOTPRINT_BOARD_EDITOR_BASE - + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Footprint Properties - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + OnInitDlg - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + OnUpdateUI - + m_GeneralBoxSizer wxVERTICAL private @@ -102,81 +102,81 @@ 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + General 1 @@ -184,77 +184,77 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_PanelGeneral 1 - - + + protected 1 - + Resizable 1 - - + + 0 - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + m_PanelPropertiesBoxSizer wxVERTICAL none @@ -264,13 +264,13 @@ 1 wxID_ANY - - + + sbSizerTexts wxVERTICAL 1 none - + 5 wxEXPAND|wxBOTTOM @@ -280,20 +280,20 @@ 1 1 1 - - - - + + + + 0 0 - - - + + + 1 - - + + wxALIGN_LEFT - + wxALIGN_TOP 0 1 @@ -303,7 +303,7 @@ wxALIGN_CENTRE 11 116,53,90,90,90,53,106,90,90,90,90 - + 1 0 Dock @@ -315,103 +315,103 @@ 0 1 1 - + 1 - - + + 1 0 0 wxID_ANY - - - + + + 0 0 - + 0 - - + + 0 724,140 1 m_itemsGrid 1 - - + + protected 1 - + Resizable wxALIGN_LEFT 80 "Reference" "Value" wxALIGN_CENTRE - + 2 1 -1,-1 WX_GRID; widgets/wx_grid.h; forward_declare 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnGridSize - + @@ -419,7 +419,7 @@ wxEXPAND 0 - + bButtonSize wxHORIZONTAL none @@ -432,88 +432,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY Add Field - + 0 - - + + 0 30,29 1 m_bpAdd 1 - - + + protected 1 - + Resizable - + 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnAddField - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -535,88 +535,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY Delete Field - + 0 - - + + 0 30,29 1 m_bpDelete 1 - - + + protected 1 - + Resizable - + 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnDeleteField - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -628,7 +628,7 @@ wxEXPAND 0 - + bSizerProperties wxHORIZONTAL none @@ -637,7 +637,7 @@ wxEXPAND 1 - + bSizerLeft wxVERTICAL private @@ -661,7 +661,7 @@ 1 0,1 0 - + fgSizerPos wxFLEX_GROWMODE_SPECIFIED none @@ -676,78 +676,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Position X: - + 0 - - + + 0 - + 1 m_XPosLabel 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -759,86 +759,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 - + 1 m_ModPositionX 1 - - + + protected 1 - + Resizable 1 - - + + ; ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -850,78 +850,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY unit - + 0 - - + + 0 - + 1 m_XPosUnit 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -933,78 +933,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Position Y: - + 0 - - + + 0 - + 1 m_YPosLabel 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1016,86 +1016,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 - + 1 m_ModPositionY 1 - - + + protected 1 - + Resizable 1 - - + + ; ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1107,78 +1107,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY unit - + 0 - - + + 0 - + 1 m_YPosUnit 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1200,23 +1200,23 @@ wxID_ANY Orientation - + sbOrientationSizer wxVERTICAL 1 none - + 5 wxEXPAND 1 - + wxBOTH 1 - + 0 - + gbSizer1 wxFLEX_GROWMODE_SPECIFIED none @@ -1225,7 +1225,7 @@ 5 2 0 - + 0 1 @@ -1233,90 +1233,90 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY 0.0 - + 0 - - + + 0 - + 1 m_Orient0 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - + 0 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + ModuleOrientEvent - - - - - - + + + + + + 5 2 0 - + 1 1 @@ -1324,90 +1324,90 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY 90.0 - + 0 - - + + 0 - + 1 m_Orient90 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - + 0 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + ModuleOrientEvent - - - - - - + + + + + + 5 2 0 - + 2 1 @@ -1415,90 +1415,90 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY -90.0 - + 0 - - + + 0 - + 1 m_Orient270 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - + 0 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + ModuleOrientEvent - - - - - - + + + + + + 5 2 0 - + 3 1 @@ -1506,83 +1506,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY 180.0 - + 0 - - + + 0 - + 1 m_Orient180 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - + 0 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + ModuleOrientEvent - - - - - - + + + + + + @@ -1597,83 +1597,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Other: - + 0 - - + + 0 - + 1 m_OrientOther 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - + 0 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + ModuleOrientEvent - - - - - - + + + + + + @@ -1688,86 +1688,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - - + + + 0 -1,-1 1 m_OrientValueCtrl 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - + + + + + + + + OnOtherOrientation - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1779,7 +1779,7 @@ wxEXPAND|wxALL 0 - + bSizerBoardSize wxHORIZONTAL none @@ -1792,78 +1792,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Board side: - + 0 - - + + 0 - + 1 m_BoardSideLabel 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1875,83 +1875,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 "Front" "Back" 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_BoardSideCtrl 1 - - + + protected 1 - + Resizable 0 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1963,7 +1963,7 @@ wxEXPAND|wxTOP 1 - + bSizerMiddle wxVERTICAL none @@ -1976,85 +1976,85 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 "Free" "Lock pads" "Lock footprint" 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Move and Place 1 - + 0 - - + + 0 - + 1 m_AutoPlaceCtrl 1 - - + + protected 1 - + Resizable 0 1 - + wxRA_SPECIFY_COLS - + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2064,102 +2064,102 @@ wxID_ANY Auto-placement Rules - + m_sizerAP wxVERTICAL 1 protected - + 5 wxEXPAND 0 - + m_sizerAllow90 wxVERTICAL protected 5 - + 0 1 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,90,90,11,70,0 0 0 wxID_ANY Allow 90 degree rotated placement: - + 0 - - + + 0 - + 1 m_allow90Label 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2171,103 +2171,103 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY 10 - + 0 - + 0 - + 0 - + 1 m_CostRot90Ctrl 1 - - + + protected 1 - + Resizable 1 - + wxSL_HORIZONTAL|wxSL_LABELS - + 0 - - + + wxFILTER_NONE wxDefaultValidator - + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2287,91 +2287,91 @@ wxEXPAND 0 - + m_sizerAllow180 wxVERTICAL protected 5 - + 0 1 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,90,90,11,70,0 0 0 wxID_ANY Allow 180 degree rotated placement: - + 0 - - + + 0 - + 1 m_allow180Label 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2383,103 +2383,103 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY 10 - + 0 - + 0 - + 0 - + 1 m_CostRot180Ctrl 1 - - + + protected 1 - + Resizable 1 - + wxSL_HORIZONTAL|wxSL_LABELS - + 0 - - + + wxFILTER_NONE wxDefaultValidator - + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2493,7 +2493,7 @@ wxEXPAND|wxTOP 1 - + bSizerRight wxVERTICAL none @@ -2502,7 +2502,7 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - + bButtonsSizer wxVERTICAL none @@ -2515,17 +2515,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -2533,65 +2533,65 @@ 0 Left 1 - + 1 - + 0 0 ID_MODULE_PROPERTIES_UPDATE Update Footprint from Library... - + 0 - - + + 0 - + 1 m_buttonUpdate 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + UpdateModule - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2603,17 +2603,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -2621,65 +2621,65 @@ 0 Left 1 - + 1 - + 0 0 ID_MODULE_PROPERTIES_EXCHANGE Change Footprint... - + 0 - - + + 0 - + 1 m_buttonExchange 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + ExchangeModule - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2691,17 +2691,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -2709,65 +2709,65 @@ 0 Left 1 - + 1 - + 0 0 ID_EDIT_FOOTPRINT Edit Footprint... - + 0 - - + + 0 - + 1 m_buttonModuleEditor 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + EditFootprint - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2789,17 +2789,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -2807,65 +2807,65 @@ 0 Left 1 - + 1 - + 0 0 ID_EDIT_LIBRARY_FOOTPRINT Edit Library Footprint... - + 0 - - + + 0 - + 1 m_button5 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + EditLibraryFootprint - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2889,85 +2889,85 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 "Through hole" "Surface mount" "Virtual" 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Fabrication Attributes 1 - + 0 - - + + 0 - + 1 m_AttributsCtrl 1 - - + + protected 1 - + Resizable 0 1 - + wxRA_SPECIFY_COLS - + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2978,7 +2978,7 @@ - + Local Clearance and Settings 0 @@ -2986,77 +2986,77 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_PanelClearances 1 - - + + protected 1 - + Resizable 1 - + ; forward_declare 0 - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bSizerPanelClearances wxVERTICAL none @@ -3067,12 +3067,12 @@ wxID_ANY Clearances - + sbSizerLocalProperties wxVERTICAL 1 none - + 10 wxRIGHT @@ -3082,78 +3082,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,90,90,-1,70,0 0 0 wxID_ANY Set values to 0 to use Board Setup values. - + 0 - - + + 0 - + 1 m_staticTextInfo 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3165,78 +3165,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,93,90,12,70,0 0 0 wxID_ANY Positive clearance means area bigger than the pad (usual for mask clearance). - + 0 - - + + 0 - + 1 m_staticTextInfoValPos 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3248,78 +3248,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,93,90,12,70,0 0 0 wxID_ANY Negative clearance means area smaller than the pad (usual for paste clearance). - + 0 - - + + 0 - + 1 m_staticTextInfoValNeg 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3330,9 +3330,9 @@ 3 wxBOTH 1 - + 0 - + fgSizerClearances wxFLEX_GROWMODE_SPECIFIED none @@ -3347,78 +3347,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Pad clearance: - + 0 - - + + 0 - + 1 m_NetClearanceLabel 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 This is the local net clearance for all pad of this footprint If 0, the Netclass values are used This value can be superseded by a pad local value. - - - + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3430,86 +3430,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 - + 1 m_NetClearanceCtrl 1 - - + + protected 1 - + Resizable 1 - - + + ; ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3521,78 +3521,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY unit - + 0 - - + + 0 - + 1 m_NetClearanceUnits 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3604,78 +3604,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Solder mask clearance: - + 0 - - + + 0 - + 1 m_SolderMaskMarginLabel 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 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3687,86 +3687,86 @@ 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 - - + + ; ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3778,78 +3778,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY unit - + 0 - - + + 0 - + 1 m_SolderMaskMarginUnits 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3861,78 +3861,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Solder paste clearance: - + 0 - - + + 0 - + 1 m_SolderPasteMarginLabel 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 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3944,86 +3944,86 @@ 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 - - + + ; ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4035,78 +4035,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY unit - + 0 - - + + 0 - + 1 m_SolderPasteMarginUnits 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4118,78 +4118,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Solder paste ratio clearance: - + 0 - - + + 0 - + 1 m_staticTextRatio 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 This is the local clearance ratio in percent between pads and the solder paste for this footprint. A value of 10 means the clearance value is 10 percent 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 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4201,86 +4201,86 @@ 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 - - + + TEXT_CTRL_EVAL; widgets/text_ctrl_eval.h 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4292,78 +4292,78 @@ 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 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4377,78 +4377,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,90,90,12,70,0 0 0 wxID_ANY Note: solder mask and paste values are used only for pads on copper layers. - + 0 - - + + 0 - + 1 m_staticTextInfoCopper 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4460,12 +4460,12 @@ wxID_ANY Connection to Copper Zones - + sbSizerZoneConnection wxHORIZONTAL 1 none - + 5 wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT @@ -4475,78 +4475,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Pad connection to zones: - + 0 - - + + 0 - + 1 m_staticText16 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4558,83 +4558,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 "Use zone setting" "Solid" "Thermal relief" "None" 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_ZoneConnectionChoice 1 - - + + protected 1 - + Resizable 0 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4643,7 +4643,7 @@ - + 3D Settings 0 @@ -4651,77 +4651,77 @@ 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 - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bSizerMain3D wxVERTICAL protected @@ -4731,13 +4731,13 @@ 5 wxID_ANY - - + + sbSizer3 wxVERTICAL 1 none - + 5 wxEXPAND|wxRIGHT @@ -4747,20 +4747,20 @@ 1 1 1 - - - - + + + + 0 0 - - - + + + 1 - - + + wxALIGN_LEFT - + wxALIGN_TOP 0 1 @@ -4770,7 +4770,7 @@ wxALIGN_CENTRE 2 650,65 - + 1 0 Dock @@ -4782,103 +4782,103 @@ 0 1 1 - + 1 - - + + 1 0 0 wxID_ANY - - - + + + 0 0 - + 0 - - + + 0 -1,86 1 m_modelsGrid 1 - - + + protected 1 - + Resizable wxALIGN_CENTRE 0 - + wxALIGN_CENTRE - + 3 1 - + WX_GRID; widgets/wx_grid.h; forward_declare 0 - - - - - - - - - - - - + + + + + + + + + + + + On3DModelCellChanged - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + On3DModelSelected - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -4886,7 +4886,7 @@ wxEXPAND 0 - + bSizer3DButtons wxHORIZONTAL none @@ -4899,88 +4899,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY Add 3D Model - + 0 - - + + 0 30,29 1 m_buttonAdd 1 - - + + protected 1 - + Resizable - + 1 -1,-1 - + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnAdd3DRow - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4992,88 +4992,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY Browse - + 0 - - + + 0 30,29 1 m_buttonBrowse 1 - - + + protected 1 - + Resizable - + 1 -1,-1 - + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnAdd3DModel - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5095,88 +5095,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY Remove 3D Model - + 0 - - + + 0 30,29 1 m_buttonRemove 1 - - + + protected 1 - + Resizable - + 1 -1,-1 - + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnRemove3DModel - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5198,17 +5198,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -5216,65 +5216,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY Configure Paths... - + 0 - - + + 0 - + 1 m_button8 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + Cfg3DPath - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5286,7 +5286,7 @@ wxEXPAND 10 - + bLowerSizer3D wxHORIZONTAL protected @@ -5302,7 +5302,7 @@ wxEXPAND|wxLEFT 0 - + bSizerButtons wxHORIZONTAL none @@ -5313,10 +5313,10 @@ 2 wxBOTH - - + + 0 - + fgSizerSymbolRef wxFLEX_GROWMODE_SPECIFIED none @@ -5331,78 +5331,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,90,90,11,70,0 0 0 wxID_ANY Library reference: - + 0 - - + + 0 - + 1 m_libraryIDLabel 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5414,78 +5414,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,90,90,11,70,0 0 0 wxID_ANY MyLabel - + 0 - - + + 0 - + 1 m_staticLibraryID 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5503,17 +5503,17 @@ 1 0 0 - + m_sdbSizerStdButtons protected - - - - - - - - + + + + + + + +