diff --git a/pcbnew/dialogs/dialog_exchange_footprints.cpp b/pcbnew/dialogs/dialog_exchange_footprints.cpp index 8ff5d54eed..86b1724832 100644 --- a/pcbnew/dialogs/dialog_exchange_footprints.cpp +++ b/pcbnew/dialogs/dialog_exchange_footprints.cpp @@ -55,6 +55,7 @@ int g_matchModeForExchangeSelected = ID_MATCH_FP_SELECTED; bool g_removeExtraTextItems[2] = { false, false }; bool g_resetTextItemLayers[2] = { false, true }; bool g_resetTextItemEffects[2] = { false, true }; +bool g_resetTextItemContent[2] = { false, true }; bool g_resetFabricationAttrs[2] = { false, true }; bool g_reset3DModels[2] = { true, true }; @@ -78,6 +79,7 @@ DIALOG_EXCHANGE_FOOTPRINTS::DIALOG_EXCHANGE_FOOTPRINTS( PCB_EDIT_FRAME* aParent, m_matchSpecifiedID->SetLabel( _( "Change footprints with library id:" ) ); m_resetTextItemLayers->SetLabel( _( "Update text layers and visibilities" ) ); m_resetTextItemEffects->SetLabel( _( "Update text sizes, styles and positions" ) ); + m_resetTextItemContent->SetLabel( _( "Update text content" ) ); m_resetFabricationAttrs->SetLabel( _( "Update fabrication attributes" ) ); m_reset3DModels->SetLabel( _( "Update 3D models" ) ); } @@ -142,6 +144,7 @@ DIALOG_EXCHANGE_FOOTPRINTS::DIALOG_EXCHANGE_FOOTPRINTS( PCB_EDIT_FRAME* aParent, m_removeExtraBox->SetValue( g_removeExtraTextItems[ m_updateMode ? 0 : 1 ] ); m_resetTextItemLayers->SetValue( g_resetTextItemLayers[ m_updateMode ? 0 : 1 ] ); m_resetTextItemEffects->SetValue( g_resetTextItemEffects[ m_updateMode ? 0 : 1 ] ); + m_resetTextItemContent->SetValue( g_resetTextItemContent[ m_updateMode ? 0 : 1 ] ); m_resetFabricationAttrs->SetValue( g_resetFabricationAttrs[ m_updateMode ? 0 : 1 ] ); m_reset3DModels->SetValue( g_reset3DModels[ m_updateMode ? 0 : 1 ] ); @@ -167,6 +170,7 @@ DIALOG_EXCHANGE_FOOTPRINTS::~DIALOG_EXCHANGE_FOOTPRINTS() g_removeExtraTextItems[ m_updateMode ? 0 : 1 ] = m_removeExtraBox->GetValue(); g_resetTextItemLayers[ m_updateMode ? 0 : 1 ] = m_resetTextItemLayers->GetValue(); g_resetTextItemEffects[ m_updateMode ? 0 : 1 ] = m_resetTextItemEffects->GetValue(); + g_resetTextItemContent[ m_updateMode ? 0 : 1 ] = m_resetTextItemContent->GetValue(); g_resetFabricationAttrs[ m_updateMode ? 0 : 1 ] = m_resetFabricationAttrs->GetValue(); g_reset3DModels[ m_updateMode ? 0 : 1 ] = m_reset3DModels->GetValue(); } @@ -379,6 +383,7 @@ void DIALOG_EXCHANGE_FOOTPRINTS::processFootprint( FOOTPRINT* aFootprint, const m_removeExtraBox->GetValue(), m_resetTextItemLayers->GetValue(), m_resetTextItemEffects->GetValue(), + m_resetTextItemContent->GetValue(), m_resetFabricationAttrs->GetValue(), m_reset3DModels->GetValue(), &updated ); diff --git a/pcbnew/dialogs/dialog_exchange_footprints_base.cpp b/pcbnew/dialogs/dialog_exchange_footprints_base.cpp index 09f188363e..7dfc74a065 100644 --- a/pcbnew/dialogs/dialog_exchange_footprints_base.cpp +++ b/pcbnew/dialogs/dialog_exchange_footprints_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf-dirty) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -105,6 +105,9 @@ DIALOG_EXCHANGE_FOOTPRINTS_BASE::DIALOG_EXCHANGE_FOOTPRINTS_BASE( wxWindow* pare m_resetTextItemEffects = new wxCheckBox( m_updateOptionsSizer->GetStaticBox(), wxID_ANY, _("Update/reset text sizes, styles and positions"), wxDefaultPosition, wxDefaultSize, 0 ); m_updateOptionsSizer->Add( m_resetTextItemEffects, 0, wxBOTTOM|wxRIGHT, 5 ); + m_resetTextItemContent = new wxCheckBox( m_updateOptionsSizer->GetStaticBox(), wxID_ANY, _("Update/reset text content"), wxDefaultPosition, wxDefaultSize, 0 ); + m_updateOptionsSizer->Add( m_resetTextItemContent, 0, wxBOTTOM|wxRIGHT, 5 ); + m_resetFabricationAttrs = new wxCheckBox( m_updateOptionsSizer->GetStaticBox(), wxID_ANY, _("Update/reset fabrication attributes"), wxDefaultPosition, wxDefaultSize, 0 ); m_updateOptionsSizer->Add( m_resetFabricationAttrs, 0, wxBOTTOM|wxRIGHT, 5 ); diff --git a/pcbnew/dialogs/dialog_exchange_footprints_base.fbp b/pcbnew/dialogs/dialog_exchange_footprints_base.fbp index 7ae982440c..f2b8e0e3fd 100644 --- a/pcbnew/dialogs/dialog_exchange_footprints_base.fbp +++ b/pcbnew/dialogs/dialog_exchange_footprints_base.fbp @@ -1,1403 +1,1488 @@ - + - - - - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - dialog_exchange_footprints_base - 4200 - none - - - 1 - dialog_exchange_footprints_base - - . - - 1 - 1 - 1 - 1 - UI - 0 - 0 - 0 - - 0 - wxAUI_MGR_DEFAULT + + + + C++ + 1 + source_name + 0 + 0 + res + UTF-8 + connect + dialog_exchange_footprints_base + 4200 + none + + + 1 + dialog_exchange_footprints_base + + . + + 1 + 1 + 1 + 1 + UI + 0 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + + 1 + 0 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + DIALOG_EXCHANGE_FOOTPRINTS_BASE + + -1,-1 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + DIALOG_SHIM; dialog_shim.h + Update Footprints from Library + + 0 + + + + updateMatchModeRadioButtons + + + m_mainSizer + wxVERTICAL + protected + + 10 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + + wxBOTH + 1 + + 0 + + m_upperSizer + wxFLEX_GROWMODE_SPECIFIED + protected + 0 + + 5 + 2 + 0 + wxEXPAND|wxALL + 0 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Update all footprints on board + + 0 + + + 0 + -1,-1 + 1 + m_matchAll + 1 + + + protected + 1 + + Resizable + 1 + + + ; + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + OnMatchAllClicked + + + + 5 + 1 + 0 + wxALL + 1 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Update selected footprint(s) + + 0 + + + 0 + + 1 + m_matchSelected + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + OnMatchSelectedClicked + + + + 5 + 1 + 0 + wxALL|wxEXPAND + 2 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Update footprints matching reference designator: + + 0 + + + 0 + -1,-1 + 1 + m_matchSpecifiedRef + 1 + + + protected + 1 + + Resizable + 1 + + + ; + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + OnMatchRefClicked + + + + 5 + 1 + 1 + wxBOTTOM|wxRIGHT|wxTOP|wxEXPAND + 2 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + -1,-1 + + + 0 + 200,-1 + 1 + m_specifiedRef + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_PROCESS_ENTER + ; + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + OnMatchRefClicked + OnMatchRefClicked + + + + 5 + 1 + 0 + wxEXPAND|wxALL + 3 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Update footprints matching value: + + 0 + + + 0 + -1,-1 + 1 + m_matchSpecifiedValue + 1 + + + protected + 1 + + Resizable + 1 + + + ; + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + OnMatchValueClicked + + + + 5 + 1 + 1 + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT + 3 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + -1,-1 + 1 + m_specifiedValue + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_PROCESS_ENTER + ; + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + OnMatchValueClicked + OnMatchValueClicked + + + + 5 + 2 + 0 + wxLEFT|wxRIGHT|wxTOP|wxEXPAND + 4 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Update footprints with library id: + + 0 + + + 0 + -1,-1 + 1 + m_matchSpecifiedID + 1 + + + protected + 1 + + Resizable + 1 + + + ; + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + OnMatchIDClicked + + + + + + 10 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + + bSizer4 + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + 500,-1 + 1 + m_specifiedID + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_PROCESS_ENTER + ; + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + OnMatchIDClicked + OnMatchIDClicked + + + + 2 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Browse Library + + 0 + + 0 + + + 0 + -1,-1 + 1 + m_specifiedIDBrowseButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + ViewAndSelectFootprint + + + + + + 10 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + + m_changeSizer + wxVERTICAL + protected + + 5 + wxEXPAND|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + staticline1 + 1 + + + none + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + + 0 + + + + + + + + 5 + wxLEFT|wxRIGHT|wxTOP|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + New footprint library id: + 0 + + 0 + + + 0 + + 1 + newIdLabel + 1 + + + none + 1 + + Resizable + 1 + + + ; + 0 + + + + + -1 + + + + 5 + wxEXPAND|wxLEFT + 1 + + + bSizer3 + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + 500,-1 + 1 + m_newID + 1 + + + protected + 1 + + Resizable + 1 + + + ; + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 2 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + MyButton + + 0 + + 0 + + + 0 + -1,-1 + 1 + m_newIDBrowseButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + ViewAndSelectFootprint + + + + + + + + 10 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + wxID_ANY + Update Options + + m_updateOptionsSizer + wxVERTICAL + 1 + protected + + 5 + wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Remove text items which are not in library footprint + + 0 + + + 0 + + 1 + m_removeExtraBox + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Removes fields that do not occur in the original library symbols + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Update/reset text layers and visibilities + + 0 + + + 0 + + 1 + m_resetTextItemLayers + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Update/reset text sizes, styles and positions + + 0 + + + 0 + + 1 + m_resetTextItemEffects + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Update/reset text content + + 0 + + + 0 + + 1 + m_resetTextItemContent + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Update/reset fabrication attributes + + 0 + + + 0 + + 1 + m_resetFabricationAttrs + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Update/reset 3D models + + 0 + + + 0 + + 1 + m_reset3DModels + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + 10 + wxEXPAND|wxRIGHT|wxLEFT + 5 + + 1 + 1 + 1 + 1 + + + + + - + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left + 0 1 - impl_virtual - + 1 + 0 0 wxID_ANY + + 0 - - DIALOG_EXCHANGE_FOOTPRINTS_BASE + + 0 + -1,240 + 1 + m_MessageWindow + 1 + + + protected + 1 - -1,-1 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - DIALOG_SHIM; dialog_shim.h - Update Footprints from Library + Resizable + 1 + + WX_HTML_REPORT_PANEL; widgets/wx_html_report_panel.h; forward_declare + 0 - 0 - - updateMatchModeRadioButtons - - - m_mainSizer - wxVERTICAL - protected - - 10 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - - wxBOTH - 1 - - 0 - - m_upperSizer - wxFLEX_GROWMODE_SPECIFIED - protected - 0 - - 5 - 2 - 0 - wxEXPAND|wxALL - 0 - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Update all footprints on board - - 0 - - - 0 - -1,-1 - 1 - m_matchAll - 1 - - - protected - 1 - - Resizable - 1 - - - ; - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - OnMatchAllClicked - - - - 5 - 1 - 0 - wxALL - 1 - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Update selected footprint(s) - - 0 - - - 0 - - 1 - m_matchSelected - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - OnMatchSelectedClicked - - - - 5 - 1 - 0 - wxALL|wxEXPAND - 2 - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Update footprints matching reference designator: - - 0 - - - 0 - -1,-1 - 1 - m_matchSpecifiedRef - 1 - - - protected - 1 - - Resizable - 1 - - - ; - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - OnMatchRefClicked - - - - 5 - 1 - 1 - wxBOTTOM|wxRIGHT|wxTOP|wxEXPAND - 2 - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - -1,-1 - - - 0 - 200,-1 - 1 - m_specifiedRef - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_PROCESS_ENTER - ; - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - OnMatchRefClicked - OnMatchRefClicked - - - - 5 - 1 - 0 - wxEXPAND|wxALL - 3 - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Update footprints matching value: - - 0 - - - 0 - -1,-1 - 1 - m_matchSpecifiedValue - 1 - - - protected - 1 - - Resizable - 1 - - - ; - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - OnMatchValueClicked - - - - 5 - 1 - 1 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT - 3 - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - -1,-1 - 1 - m_specifiedValue - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_PROCESS_ENTER - ; - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - OnMatchValueClicked - OnMatchValueClicked - - - - 5 - 2 - 0 - wxLEFT|wxRIGHT|wxTOP|wxEXPAND - 4 - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Update footprints with library id: - - 0 - - - 0 - -1,-1 - 1 - m_matchSpecifiedID - 1 - - - protected - 1 - - Resizable - 1 - - - ; - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - OnMatchIDClicked - - - - - - 10 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - - bSizer4 - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - 500,-1 - 1 - m_specifiedID - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_PROCESS_ENTER - ; - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - OnMatchIDClicked - OnMatchIDClicked - - - - 2 - wxALIGN_CENTER_VERTICAL|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Browse Library - - 0 - - 0 - - - 0 - -1,-1 - 1 - m_specifiedIDBrowseButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - ViewAndSelectFootprint - - - - - - 10 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - - m_changeSizer - wxVERTICAL - protected - - 5 - wxEXPAND|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - staticline1 - 1 - - - none - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - - 0 - - - - - - - - 5 - wxLEFT|wxRIGHT|wxTOP|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - New footprint library id: - 0 - - 0 - - - 0 - - 1 - newIdLabel - 1 - - - none - 1 - - Resizable - 1 - - - ; - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxLEFT - 1 - - - bSizer3 - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_VERTICAL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - 500,-1 - 1 - m_newID - 1 - - - protected - 1 - - Resizable - 1 - - - ; - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 2 - wxALIGN_CENTER_VERTICAL|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - MyButton - - 0 - - 0 - - - 0 - -1,-1 - 1 - m_newIDBrowseButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - ViewAndSelectFootprint - - - - - - - - 10 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - wxID_ANY - Update Options - - m_updateOptionsSizer - wxVERTICAL - 1 - protected - - 5 - wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Remove text items which are not in library footprint - - 0 - - - 0 - - 1 - m_removeExtraBox - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Removes fields that do not occur in the original library symbols - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Update/reset text layers and visibilities - - 0 - - - 0 - - 1 - m_resetTextItemLayers - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Update/reset text sizes, styles and positions - - 0 - - - 0 - - 1 - m_resetTextItemEffects - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Update/reset fabrication attributes - - 0 - - - 0 - - 1 - m_resetFabricationAttrs - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Update/reset 3D models - - 0 - - - 0 - - 1 - m_reset3DModels - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - 10 - wxEXPAND|wxRIGHT|wxLEFT - 5 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - -1,240 - 1 - m_MessageWindow - 1 - - - protected - 1 - - Resizable - 1 - - WX_HTML_REPORT_PANEL; widgets/wx_html_report_panel.h; forward_declare - 0 - - - - wxTAB_TRAVERSAL - - - - 5 - wxEXPAND|wxALL - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer - protected - OnOKClicked - - - + wxTAB_TRAVERSAL + + + 5 + wxEXPAND|wxALL + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer + protected + OnOKClicked + + + + diff --git a/pcbnew/dialogs/dialog_exchange_footprints_base.h b/pcbnew/dialogs/dialog_exchange_footprints_base.h index acc5b3aca6..9c6d17a7c4 100644 --- a/pcbnew/dialogs/dialog_exchange_footprints_base.h +++ b/pcbnew/dialogs/dialog_exchange_footprints_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf-dirty) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -64,6 +64,7 @@ class DIALOG_EXCHANGE_FOOTPRINTS_BASE : public DIALOG_SHIM wxCheckBox* m_removeExtraBox; wxCheckBox* m_resetTextItemLayers; wxCheckBox* m_resetTextItemEffects; + wxCheckBox* m_resetTextItemContent; wxCheckBox* m_resetFabricationAttrs; wxCheckBox* m_reset3DModels; WX_HTML_REPORT_PANEL* m_MessageWindow; diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp index b459bd7266..b82523c893 100644 --- a/pcbnew/pcb_edit_frame.cpp +++ b/pcbnew/pcb_edit_frame.cpp @@ -2244,8 +2244,8 @@ static PCB_TEXT* getMatchingTextItem( PCB_TEXT* aRefItem, FOOTPRINT* aFootprint void PCB_EDIT_FRAME::ExchangeFootprint( FOOTPRINT* aExisting, FOOTPRINT* aNew, BOARD_COMMIT& aCommit, bool deleteExtraTexts, bool resetTextLayers, bool resetTextEffects, - bool resetFabricationAttrs, bool reset3DModels, - bool* aUpdated ) + bool resetTextContent, bool resetFabricationAttrs, + bool reset3DModels, bool* aUpdated ) { PCB_GROUP* parentGroup = aExisting->GetParentGroup(); bool dummyBool = false; @@ -2334,8 +2334,8 @@ void PCB_EDIT_FRAME::ExchangeFootprint( FOOTPRINT* aExisting, FOOTPRINT* aNew, if( destItem ) { - processTextItem( *srcItem, *destItem, false, resetTextLayers, resetTextEffects, - aUpdated ); + processTextItem( *srcItem, *destItem, resetTextContent, resetTextLayers, + resetTextEffects, aUpdated ); } else if( !deleteExtraTexts ) { @@ -2373,7 +2373,8 @@ void PCB_EDIT_FRAME::ExchangeFootprint( FOOTPRINT* aExisting, FOOTPRINT* aNew, } else { - processTextItem( *field, *newField, false, resetTextLayers, resetTextEffects, aUpdated ); + processTextItem( *field, *newField, resetTextContent, resetTextLayers, resetTextEffects, + aUpdated ); } } diff --git a/pcbnew/pcb_edit_frame.h b/pcbnew/pcb_edit_frame.h index 1364f0e957..8319d1f5ed 100644 --- a/pcbnew/pcb_edit_frame.h +++ b/pcbnew/pcb_edit_frame.h @@ -573,7 +573,8 @@ public: void ExchangeFootprint( FOOTPRINT* aExisting, FOOTPRINT* aNew, BOARD_COMMIT& aCommit, bool deleteExtraTexts = true, bool resetTextLayers = true, bool resetTextEffects = true, bool resetFabricationAttrs = true, - bool reset3DModels = true, bool* aUpdated = nullptr ); + bool resetTextContent = true, bool reset3DModels = true, + bool* aUpdated = nullptr ); /** * Install the corresponding dialog editor for the given item.