diff --git a/common/dialog_shim.cpp b/common/dialog_shim.cpp index af8d011f3c..3e0f951e5e 100644 --- a/common/dialog_shim.cpp +++ b/common/dialog_shim.cpp @@ -421,41 +421,48 @@ void DIALOG_SHIM::SaveControlState() geom[ "h" ] = rect.GetHeight(); dlgMap[ "__geometry" ] = geom; - std::function saveFn = [&]( wxWindow* win ) + std::function saveFn = + [&]( wxWindow* win ) + { + if( PROPERTY_HOLDER* props = PROPERTY_HOLDER::SafeCast( win->GetClientData() ) ) + { + if( !props->GetPropertyOr( "persist", false ) ) + return; + } + + std::string key = generateKey( win ); + + if( !key.empty() ) + { + if( wxComboBox* combo = dynamic_cast( win ) ) + dlgMap[ key ] = combo->GetSelection(); + else if( wxChoice* choice = dynamic_cast( win ) ) + dlgMap[ key ] = choice->GetSelection(); + else if( wxCheckBox* check = dynamic_cast( win ) ) + dlgMap[ key ] = check->GetValue(); + else if( wxSpinCtrl* spin = dynamic_cast( win ) ) + dlgMap[ key ] = spin->GetValue(); + else if( wxRadioButton* radio = dynamic_cast( win ) ) + dlgMap[ key ] = radio->GetValue(); + else if( wxRadioBox* radioBox = dynamic_cast( win ) ) + dlgMap[ key ] = radioBox->GetSelection(); + else if( wxSplitterWindow* splitter = dynamic_cast( win ) ) + dlgMap[ key ] = splitter->GetSashPosition(); + else if( wxScrolledWindow* scrolled = dynamic_cast( win ) ) + dlgMap[ key ] = scrolled->GetScrollPos( wxVERTICAL ); + else if( wxNotebook* notebook = dynamic_cast( win ) ) + dlgMap[ key ] = notebook->GetSelection(); + } + + for( wxWindow* child : win->GetChildren() ) + saveFn( child ); + }; + + if( PROPERTY_HOLDER* props = PROPERTY_HOLDER::SafeCast( GetClientData() ) ) { - if( PROPERTY_HOLDER* props = PROPERTY_HOLDER::SafeCast( win->GetClientData() ) ) - { - if( !props->GetPropertyOr( "persist", false ) ) - return; - } - - std::string key = generateKey( win ); - - if( !key.empty() ) - { - if( wxComboBox* combo = dynamic_cast( win ) ) - dlgMap[ key ] = combo->GetSelection(); - else if( wxChoice* choice = dynamic_cast( win ) ) - dlgMap[ key ] = choice->GetSelection(); - else if( wxCheckBox* check = dynamic_cast( win ) ) - dlgMap[ key ] = check->GetValue(); - else if( wxSpinCtrl* spin = dynamic_cast( win ) ) - dlgMap[ key ] = spin->GetValue(); - else if( wxRadioButton* radio = dynamic_cast( win ) ) - dlgMap[ key ] = radio->GetValue(); - else if( wxRadioBox* radioBox = dynamic_cast( win ) ) - dlgMap[ key ] = radioBox->GetSelection(); - else if( wxSplitterWindow* splitter = dynamic_cast( win ) ) - dlgMap[ key ] = splitter->GetSashPosition(); - else if( wxScrolledWindow* scrolled = dynamic_cast( win ) ) - dlgMap[ key ] = scrolled->GetScrollPos( wxVERTICAL ); - else if( wxNotebook* notebook = dynamic_cast( win ) ) - dlgMap[ key ] = notebook->GetSelection(); - } - - for( wxWindow* child : win->GetChildren() ) - saveFn( child ); - }; + if( !props->GetPropertyOr( "persist", false ) ) + return; + } for( wxWindow* child : GetChildren() ) saveFn( child ); @@ -473,75 +480,82 @@ void DIALOG_SHIM::LoadControlState() const auto& dlgMap = dlgIt->second; - std::function loadFn = [&]( wxWindow* win ) - { - if( PROPERTY_HOLDER* props = PROPERTY_HOLDER::SafeCast( win->GetClientData() ) ) - { - if( !props->GetPropertyOr( "persist", false ) ) - return; - } - - std::string key = generateKey( win ); - - if( !key.empty() ) - { - auto it = dlgMap.find( key ); - - if( it != dlgMap.end() ) + std::function loadFn = + [&]( wxWindow* win ) { - const nlohmann::json& j = it->second; + if( PROPERTY_HOLDER* props = PROPERTY_HOLDER::SafeCast( win->GetClientData() ) ) + { + if( !props->GetPropertyOr( "persist", false ) ) + return; + } - if( wxComboBox* combo = dynamic_cast( win ) ) - { - if( j.is_string() ) - combo->SetValue( wxString::FromUTF8( j.get().c_str() ) ); - } - else if( wxChoice* choice = dynamic_cast( win ) ) - { - if( j.is_number_integer() ) - choice->SetSelection( j.get() ); - } - else if( wxCheckBox* check = dynamic_cast( win ) ) - { - if( j.is_boolean() ) - check->SetValue( j.get() ); - } - else if( wxSpinCtrl* spin = dynamic_cast( win ) ) - { - if( j.is_number_integer() ) - spin->SetValue( j.get() ); - } - else if( wxRadioButton* radio = dynamic_cast( win ) ) - { - if( j.is_boolean() ) - radio->SetValue( j.get() ); - } - else if( wxRadioBox* radioBox = dynamic_cast( win ) ) - { - if( j.is_number_integer() ) - radioBox->SetSelection( j.get() ); - } - else if( wxSplitterWindow* splitter = dynamic_cast( win ) ) - { - if( j.is_number_integer() ) - splitter->SetSashPosition( j.get() ); - } - else if( wxScrolledWindow* scrolled = dynamic_cast( win ) ) - { - if( j.is_number_integer() ) - scrolled->SetScrollPos( wxVERTICAL, j.get() ); - } - else if( wxNotebook* notebook = dynamic_cast( win ) ) - { - if( j.is_number_integer() ) - notebook->SetSelection( j.get() ); - } - } - } + std::string key = generateKey( win ); - for( wxWindow* child : win->GetChildren() ) - loadFn( child ); - }; + if( !key.empty() ) + { + auto it = dlgMap.find( key ); + + if( it != dlgMap.end() ) + { + const nlohmann::json& j = it->second; + + if( wxComboBox* combo = dynamic_cast( win ) ) + { + if( j.is_string() ) + combo->SetValue( wxString::FromUTF8( j.get().c_str() ) ); + } + else if( wxChoice* choice = dynamic_cast( win ) ) + { + if( j.is_number_integer() ) + choice->SetSelection( j.get() ); + } + else if( wxCheckBox* check = dynamic_cast( win ) ) + { + if( j.is_boolean() ) + check->SetValue( j.get() ); + } + else if( wxSpinCtrl* spin = dynamic_cast( win ) ) + { + if( j.is_number_integer() ) + spin->SetValue( j.get() ); + } + else if( wxRadioButton* radio = dynamic_cast( win ) ) + { + if( j.is_boolean() ) + radio->SetValue( j.get() ); + } + else if( wxRadioBox* radioBox = dynamic_cast( win ) ) + { + if( j.is_number_integer() ) + radioBox->SetSelection( j.get() ); + } + else if( wxSplitterWindow* splitter = dynamic_cast( win ) ) + { + if( j.is_number_integer() ) + splitter->SetSashPosition( j.get() ); + } + else if( wxScrolledWindow* scrolled = dynamic_cast( win ) ) + { + if( j.is_number_integer() ) + scrolled->SetScrollPos( wxVERTICAL, j.get() ); + } + else if( wxNotebook* notebook = dynamic_cast( win ) ) + { + if( j.is_number_integer() ) + notebook->SetSelection( j.get() ); + } + } + } + + for( wxWindow* child : win->GetChildren() ) + loadFn( child ); + }; + + if( PROPERTY_HOLDER* props = PROPERTY_HOLDER::SafeCast( GetClientData() ) ) + { + if( !props->GetPropertyOr( "persist", false ) ) + return; + } for( wxWindow* child : GetChildren() ) loadFn( child ); diff --git a/pcbnew/dialogs/dialog_global_deletion.cpp b/pcbnew/dialogs/dialog_global_deletion.cpp index 04d71373c1..f3aaba83d7 100644 --- a/pcbnew/dialogs/dialog_global_deletion.cpp +++ b/pcbnew/dialogs/dialog_global_deletion.cpp @@ -24,6 +24,7 @@ #include using namespace std::placeholders; +#include #include #include #include @@ -38,18 +39,24 @@ using namespace std::placeholders; DIALOG_GLOBAL_DELETION::DIALOG_GLOBAL_DELETION( PCB_EDIT_FRAME* parent ) : - DIALOG_GLOBAL_DELETION_BASE( parent ) + DIALOG_GLOBAL_DELETION_BASE( parent ) { m_Parent = parent; m_currentLayer = F_Cu; m_trackFilterLocked->Enable( m_delTracks->GetValue() ); m_trackFilterUnlocked->Enable( m_delTracks->GetValue() ); - m_trackFilterVias->Enable( m_delTracks->GetValue() ); + m_viaFilterLocked->Enable( m_delTracks->GetValue() ); + m_viaFilterUnlocked->Enable( m_delTracks->GetValue() ); m_footprintFilterLocked->Enable( m_delFootprints->GetValue() ); m_footprintFilterUnlocked->Enable( m_delFootprints->GetValue() ); m_drawingFilterLocked->Enable( m_delDrawings->GetValue() ); m_drawingFilterUnlocked->Enable( m_delDrawings->GetValue() ); + // This is a destructive dialog. Don't save control state; we always want to come up in a benign state. + PROPERTY_HOLDER* props = new PROPERTY_HOLDER(); + props->SetProperty( "persist", false ); + SetClientData( props ); + SetupStandardButtons(); SetFocus(); @@ -75,7 +82,9 @@ int GLOBAL_EDIT_TOOL::GlobalDeletions( const TOOL_EVENT& aEvent ) void DIALOG_GLOBAL_DELETION::SetCurrentLayer( int aLayer ) { m_currentLayer = aLayer; - m_textCtrlCurrLayer->SetValue( m_Parent->GetBoard()->GetLayerName( ToLAYER_ID( aLayer ) ) ); + m_rbLayersOption->SetString( 1, wxString::Format( m_rbLayersOption->GetString( 1 ), + m_Parent->GetBoard()->GetLayerName( ToLAYER_ID( aLayer ) ) ) ); + m_rbLayersOption->SetSelection( 0 ); } @@ -83,7 +92,8 @@ void DIALOG_GLOBAL_DELETION::onCheckDeleteTracks( wxCommandEvent& event ) { m_trackFilterLocked->Enable( m_delTracks->GetValue() ); m_trackFilterUnlocked->Enable( m_delTracks->GetValue() ); - m_trackFilterVias->Enable( m_delTracks->GetValue() ); + m_viaFilterLocked->Enable( m_delTracks->GetValue() ); + m_viaFilterUnlocked->Enable( m_delTracks->GetValue() ); } @@ -239,18 +249,29 @@ void DIALOG_GLOBAL_DELETION::DoGlobalDeletions() } else if( track->Type() == PCB_VIA_T ) { - if( m_trackFilterVias->GetValue() ) - processConnectedItem( track, layers_filter ); - } - else if( track->IsLocked() ) - { - if( m_trackFilterLocked->GetValue() ) - processConnectedItem( track, layers_filter ); + if( track->IsLocked() ) + { + if( m_viaFilterLocked->GetValue() ) + processConnectedItem( track, layers_filter ); + } + else + { + if( m_viaFilterUnlocked->GetValue() ) + processConnectedItem( track, layers_filter ); + } } else { - if( m_trackFilterUnlocked->GetValue() ) - processConnectedItem( track, layers_filter ); + if( track->IsLocked() ) + { + if( m_trackFilterLocked->GetValue() ) + processConnectedItem( track, layers_filter ); + } + else + { + if( m_trackFilterUnlocked->GetValue() ) + processConnectedItem( track, layers_filter ); + } } } } diff --git a/pcbnew/dialogs/dialog_global_deletion_base.cpp b/pcbnew/dialogs/dialog_global_deletion_base.cpp index b8df8e9595..5dec8b60d9 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 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -57,60 +57,56 @@ DIALOG_GLOBAL_DELETION_BASE::DIALOG_GLOBAL_DELETION_BASE( wxWindow* parent, wxWi sbFilter = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Filter Settings") ), wxVERTICAL ); + wxFlexGridSizer* fgSizer2; + fgSizer2 = new wxFlexGridSizer( 0, 1, 3, 0 ); + fgSizer2->SetFlexibleDirection( wxBOTH ); + fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + m_drawingFilterLocked = new wxCheckBox( sbFilter->GetStaticBox(), wxID_ANY, _("Locked graphics"), wxDefaultPosition, wxDefaultSize, 0 ); - sbFilter->Add( m_drawingFilterLocked, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizer2->Add( m_drawingFilterLocked, 0, wxRIGHT|wxLEFT, 5 ); m_drawingFilterUnlocked = new wxCheckBox( sbFilter->GetStaticBox(), wxID_ANY, _("Unlocked graphics"), wxDefaultPosition, wxDefaultSize, 0 ); - sbFilter->Add( m_drawingFilterUnlocked, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + m_drawingFilterUnlocked->SetValue(true); + fgSizer2->Add( m_drawingFilterUnlocked, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_footprintFilterLocked = new wxCheckBox( sbFilter->GetStaticBox(), wxID_ANY, _("Locked footprints"), wxDefaultPosition, wxDefaultSize, 0 ); - sbFilter->Add( m_footprintFilterLocked, 0, wxALL, 5 ); + fgSizer2->Add( m_footprintFilterLocked, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_footprintFilterUnlocked = new wxCheckBox( sbFilter->GetStaticBox(), wxID_ANY, _("Unlocked footprints"), wxDefaultPosition, wxDefaultSize, 0 ); m_footprintFilterUnlocked->SetValue(true); - sbFilter->Add( m_footprintFilterUnlocked, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + fgSizer2->Add( m_footprintFilterUnlocked, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); m_trackFilterLocked = new wxCheckBox( sbFilter->GetStaticBox(), wxID_ANY, _("Locked tracks"), wxDefaultPosition, wxDefaultSize, 0 ); - sbFilter->Add( m_trackFilterLocked, 0, wxALL, 5 ); + fgSizer2->Add( m_trackFilterLocked, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_trackFilterUnlocked = new wxCheckBox( sbFilter->GetStaticBox(), wxID_ANY, _("Unlocked tracks"), wxDefaultPosition, wxDefaultSize, 0 ); m_trackFilterUnlocked->SetValue(true); - sbFilter->Add( m_trackFilterUnlocked, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizer2->Add( m_trackFilterUnlocked, 0, wxRIGHT|wxLEFT, 5 ); - m_trackFilterVias = new wxCheckBox( sbFilter->GetStaticBox(), wxID_ANY, _("Vias"), wxDefaultPosition, wxDefaultSize, 0 ); - m_trackFilterVias->SetValue(true); - sbFilter->Add( m_trackFilterVias, 0, wxRIGHT|wxLEFT, 5 ); + m_viaFilterLocked = new wxCheckBox( sbFilter->GetStaticBox(), wxID_ANY, _("Locked vias"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer2->Add( m_viaFilterLocked, 0, wxRIGHT|wxLEFT, 5 ); + + m_viaFilterUnlocked = new wxCheckBox( sbFilter->GetStaticBox(), wxID_ANY, _("Unlocked vias"), wxDefaultPosition, wxDefaultSize, 0 ); + m_viaFilterUnlocked->SetValue(true); + fgSizer2->Add( m_viaFilterUnlocked, 0, wxRIGHT|wxLEFT, 5 ); - bSizerRight->Add( sbFilter, 0, wxALL|wxEXPAND, 5 ); + sbFilter->Add( fgSizer2, 1, wxEXPAND, 5 ); - wxString m_rbLayersOptionChoices[] = { _("All layers"), _("Current layer only") }; + + bSizerRight->Add( sbFilter, 1, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 ); + + + bSizerUpper->Add( bSizerRight, 0, wxEXPAND|wxLEFT, 5 ); + + + bSizerMain->Add( bSizerUpper, 1, wxEXPAND|wxALL, 5 ); + + wxString m_rbLayersOptionChoices[] = { _("All layers"), _("Current layer (%s) only") }; int m_rbLayersOptionNChoices = sizeof( m_rbLayersOptionChoices ) / sizeof( wxString ); m_rbLayersOption = new wxRadioBox( this, wxID_ANY, _("Layer Filter"), wxDefaultPosition, wxDefaultSize, m_rbLayersOptionNChoices, m_rbLayersOptionChoices, 1, wxRA_SPECIFY_COLS ); - m_rbLayersOption->SetSelection( 0 ); - bSizerRight->Add( m_rbLayersOption, 0, wxALL|wxEXPAND, 5 ); - - - bSizerUpper->Add( bSizerRight, 0, wxEXPAND, 5 ); - - - bSizerMain->Add( bSizerUpper, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - - wxFlexGridSizer* fgSizer1; - fgSizer1 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer1->AddGrowableCol( 1 ); - fgSizer1->SetFlexibleDirection( wxBOTH ); - fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_staticText1 = new wxStaticText( this, wxID_ANY, _("Current layer:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText1->Wrap( -1 ); - fgSizer1->Add( m_staticText1, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - m_textCtrlCurrLayer = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); - fgSizer1->Add( m_textCtrlCurrLayer, 0, wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - - bSizerMain->Add( fgSizer1, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + m_rbLayersOption->SetSelection( 1 ); + bSizerMain->Add( m_rbLayersOption, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 ); m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); diff --git a/pcbnew/dialogs/dialog_global_deletion_base.fbp b/pcbnew/dialogs/dialog_global_deletion_base.fbp index 49d0a29054..7b01b55c9b 100644 --- a/pcbnew/dialogs/dialog_global_deletion_base.fbp +++ b/pcbnew/dialogs/dialog_global_deletion_base.fbp @@ -1,1372 +1,1332 @@ - + - - - - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - dialog_global_deletion_base - 1000 - none - - - 1 - dialog_global_deletion - - . - - 1 - 1 - 1 - 1 - UI - 0 - 0 - 0 - - 0 - wxAUI_MGR_DEFAULT - - wxBOTH - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - + + + C++ + + 1 + connect + none + + + 0 + 0 + res + UTF-8 + dialog_global_deletion_base + 1000 + 1 + 1 + UI + dialog_global_deletion + . + 0 + source_name + 1 + 0 + source_name + + + 1 + 1 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + wxBOTH + + 1 + 0 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + DIALOG_GLOBAL_DELETION_BASE + + -1,-1 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + DIALOG_SHIM; dialog_shim.h + Delete Items + + 0 + + + + + + bSizerMain + wxVERTICAL + none + + 5 + wxEXPAND|wxALL + 1 + - DIALOG_GLOBAL_DELETION_BASE - - -1,-1 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - DIALOG_SHIM; dialog_shim.h - Delete Items - - 0 - - - - + bSizerUpper + wxHORIZONTAL + none + + 5 + wxEXPAND|wxALL + 0 + + wxID_ANY + Items to Delete - bSizerMain + sbSizerLeft + wxVERTICAL + 1 + none + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Zones + + 0 + + + 0 + + 1 + m_delZones + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Text + + 0 + + + 0 + + 1 + m_delTexts + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Board outlines + + 0 + + + 0 + + 1 + m_delBoardEdges + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + onCheckDeleteBoardOutlines + + + + 5 + wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Graphics + + 0 + + + 0 + + 1 + m_delDrawings + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + onCheckDeleteDrawings + + + + 5 + wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Footprints + + 0 + + + 0 + + 1 + m_delFootprints + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + onCheckDeleteFootprints + + + + 5 + wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Tracks && vias + + 0 + + + 0 + + 1 + m_delTracks + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + onCheckDeleteTracks + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Teardrops + + 0 + + + 0 + + 1 + m_delTeardrops + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Markers + + 0 + + + 0 + + 1 + m_delMarkers + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Clear board + + 0 + + + 0 + + 1 + m_delAll + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + 5 + wxEXPAND|wxLEFT + 0 + + + bSizerRight wxVERTICAL none - - 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 1 - - - bSizerUpper - wxHORIZONTAL - none - - 5 - wxEXPAND|wxALL - 0 - - wxID_ANY - Items to Delete - - sbSizerLeft - wxVERTICAL - 1 - none - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Zones - - 0 - - - 0 - - 1 - m_delZones - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxBOTTOM|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Text - - 0 - - - 0 - - 1 - m_delTexts - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxBOTTOM|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Board outlines - - 0 - - - 0 - - 1 - m_delBoardEdges - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - onCheckDeleteBoardOutlines - - - - 5 - wxBOTTOM|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Graphics - - 0 - - - 0 - - 1 - m_delDrawings - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - onCheckDeleteDrawings - - - - 5 - wxBOTTOM|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Footprints - - 0 - - - 0 - - 1 - m_delFootprints - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - onCheckDeleteFootprints - - - - 5 - wxBOTTOM|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Tracks && vias - - 0 - - - 0 - - 1 - m_delTracks - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - onCheckDeleteTracks - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Teardrops - - 0 - - - 0 - - 1 - m_delTeardrops - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxBOTTOM|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Markers - - 0 - - - 0 - - 1 - m_delMarkers - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxBOTTOM|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Clear board - - 0 - - - 0 - - 1 - m_delAll - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - 5 - wxEXPAND - 0 - - - bSizerRight - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 0 - - wxID_ANY - Filter Settings - - sbFilter - wxVERTICAL - 1 - protected - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Locked graphics - - 0 - - - 0 - - 1 - m_drawingFilterLocked - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Unlocked graphics - - 0 - - - 0 - - 1 - m_drawingFilterUnlocked - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - 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 - Locked footprints - - 0 - - - 0 - - 1 - m_footprintFilterLocked - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxBOTTOM|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Unlocked footprints - - 0 - - - 0 - - 1 - m_footprintFilterUnlocked - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - 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 - Locked tracks - - 0 - - - 0 - - 1 - m_trackFilterLocked - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Unlocked tracks - - 0 - - - 0 - - 1 - m_trackFilterUnlocked - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Vias - - 0 - - - 0 - - 1 - m_trackFilterVias - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "All layers" "Current layer only" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Layer Filter - 1 - - 0 - - - 0 - - 1 - m_rbLayersOption - 1 - - - protected - 1 - - Resizable - 0 - 1 - - wxRA_SPECIFY_COLS - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT - 0 - - 2 + + 5 + wxEXPAND|wxTOP|wxBOTTOM|wxLEFT + 1 + + wxID_ANY + Filter Settings + + sbFilter + wxVERTICAL + 1 + protected + + 5 + wxEXPAND + 1 + + 1 wxBOTH - 1 + 0 - fgSizer1 + fgSizer2 wxFLEX_GROWMODE_SPECIFIED none 0 - 0 - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Current layer: - 0 - - 0 - - - 0 - - 1 - m_staticText1 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - + 3 + + 5 + wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Locked graphics + + 0 + + + 0 + + 1 + m_drawingFilterLocked + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + - - 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_textCtrlCurrLayer - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_READONLY - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Unlocked graphics + + 0 + + + 0 + + 1 + m_drawingFilterUnlocked + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Locked footprints + + 0 + + + 0 + + 1 + m_footprintFilterLocked + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Unlocked footprints + + 0 + + + 0 + + 1 + m_footprintFilterUnlocked + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Locked tracks + + 0 + + + 0 + + 1 + m_trackFilterLocked + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Unlocked tracks + + 0 + + + 0 + + 1 + m_trackFilterUnlocked + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Locked vias + + 0 + + + 0 + + 1 + m_viaFilterLocked + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Unlocked vias + + 0 + + + 0 + + 1 + m_viaFilterUnlocked + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + - - 5 - wxBOTTOM|wxEXPAND|wxTOP - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer1 - protected - - + + + + 10 + wxEXPAND|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "All layers" "Current layer (%s) only" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Layer Filter + 1 + + 0 + + + 0 + + 1 + m_rbLayersOption + 1 + + + protected + 1 + + Resizable + 1 + 1 + + wxRA_SPECIFY_COLS + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxEXPAND|wxTOP + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer1 + protected + + + + diff --git a/pcbnew/dialogs/dialog_global_deletion_base.h b/pcbnew/dialogs/dialog_global_deletion_base.h index 035d735af7..b265879f82 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 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -20,14 +20,11 @@ #include #include #include -#include -#include #include #include /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_GLOBAL_DELETION_BASE /////////////////////////////////////////////////////////////////////////////// @@ -52,10 +49,9 @@ class DIALOG_GLOBAL_DELETION_BASE : public DIALOG_SHIM wxCheckBox* m_footprintFilterUnlocked; wxCheckBox* m_trackFilterLocked; wxCheckBox* m_trackFilterUnlocked; - wxCheckBox* m_trackFilterVias; + wxCheckBox* m_viaFilterLocked; + wxCheckBox* m_viaFilterUnlocked; wxRadioBox* m_rbLayersOption; - wxStaticText* m_staticText1; - wxTextCtrl* m_textCtrlCurrLayer; wxStdDialogButtonSizer* m_sdbSizer1; wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1Cancel;