Pcbnew: fix global deletion bug and minor dialog changes. (fixes lp:1263795)
* Handle different item global deletions correctly. No more removing of text if graphics is selected. * Layer settings are always obeyed for modules, zones, text, and graphics. * Text will be removed from copper layers if all layers are selected or according to the current layer. * Added check boxes for "normal" and "locked" footprints to be consistent with the naming for the track deletion options.
This commit is contained in:
parent
47e5026cfe
commit
7c3918da2a
|
@ -27,9 +27,11 @@ DIALOG_GLOBAL_DELETION::DIALOG_GLOBAL_DELETION( PCB_EDIT_FRAME* parent )
|
||||||
m_TrackFilterLocked->Enable( m_DelTracks->GetValue() );
|
m_TrackFilterLocked->Enable( m_DelTracks->GetValue() );
|
||||||
m_TrackFilterNormal->Enable( m_DelTracks->GetValue() );
|
m_TrackFilterNormal->Enable( m_DelTracks->GetValue() );
|
||||||
m_TrackFilterVias->Enable( m_DelTracks->GetValue() );
|
m_TrackFilterVias->Enable( m_DelTracks->GetValue() );
|
||||||
|
m_ModuleFilterLocked->Enable( m_DelModules->GetValue() );
|
||||||
|
m_ModuleFilterNormal->Enable( m_DelModules->GetValue() );
|
||||||
SetFocus();
|
SetFocus();
|
||||||
|
|
||||||
GetSizer()->SetSizeHints(this);
|
GetSizer()->SetSizeHints( this );
|
||||||
Centre();
|
Centre();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,12 +44,14 @@ void PCB_EDIT_FRAME::InstallPcbGlobalDeleteFrame( const wxPoint& pos )
|
||||||
dlg.ShowModal();
|
dlg.ShowModal();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void DIALOG_GLOBAL_DELETION::SetCurrentLayer( LAYER_NUM aLayer )
|
void DIALOG_GLOBAL_DELETION::SetCurrentLayer( LAYER_NUM aLayer )
|
||||||
{
|
{
|
||||||
m_currentLayer = aLayer;
|
m_currentLayer = aLayer;
|
||||||
m_textCtrlCurrLayer->SetValue( m_Parent->GetBoard()->GetLayerName( aLayer ) );
|
m_textCtrlCurrLayer->SetValue( m_Parent->GetBoard()->GetLayerName( aLayer ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void DIALOG_GLOBAL_DELETION::OnCheckDeleteTracks( wxCommandEvent& event )
|
void DIALOG_GLOBAL_DELETION::OnCheckDeleteTracks( wxCommandEvent& event )
|
||||||
{
|
{
|
||||||
m_TrackFilterAR->Enable( m_DelTracks->GetValue() );
|
m_TrackFilterAR->Enable( m_DelTracks->GetValue() );
|
||||||
|
@ -56,6 +60,14 @@ void DIALOG_GLOBAL_DELETION::OnCheckDeleteTracks( wxCommandEvent& event )
|
||||||
m_TrackFilterVias->Enable( m_DelTracks->GetValue() );
|
m_TrackFilterVias->Enable( m_DelTracks->GetValue() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void DIALOG_GLOBAL_DELETION::OnCheckDeleteModules( wxCommandEvent& event )
|
||||||
|
{
|
||||||
|
m_ModuleFilterLocked->Enable( m_DelModules->GetValue() );
|
||||||
|
m_ModuleFilterNormal->Enable( m_DelModules->GetValue() );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void DIALOG_GLOBAL_DELETION::AcceptPcbDelete( )
|
void DIALOG_GLOBAL_DELETION::AcceptPcbDelete( )
|
||||||
{
|
{
|
||||||
bool gen_rastnest = false;
|
bool gen_rastnest = false;
|
||||||
|
@ -68,72 +80,102 @@ void DIALOG_GLOBAL_DELETION::AcceptPcbDelete( )
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if( !IsOK( this, _( "OK to delete selected items ?" ) ) )
|
|
||||||
|
if( !IsOK( this, _( "Are you sure you want to delete the selected items?" ) ) )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
BOARD * pcb = m_Parent->GetBoard();
|
BOARD* pcb = m_Parent->GetBoard();
|
||||||
PICKED_ITEMS_LIST pickersList;
|
PICKED_ITEMS_LIST pickersList;
|
||||||
ITEM_PICKER itemPicker( NULL, UR_DELETED );
|
ITEM_PICKER itemPicker( NULL, UR_DELETED );
|
||||||
BOARD_ITEM* item, * nextitem;
|
BOARD_ITEM* item, * nextitem;
|
||||||
|
|
||||||
if( m_DelZones->GetValue() )
|
|
||||||
{
|
|
||||||
gen_rastnest = true;
|
|
||||||
|
|
||||||
/* SEG_ZONE items used in Zone filling selection are now deprecated :
|
|
||||||
* and are deleted but not put in undo buffer if exist
|
|
||||||
*/
|
|
||||||
pcb->m_Zone.DeleteAll();
|
|
||||||
|
|
||||||
while( pcb->GetAreaCount() )
|
|
||||||
{
|
|
||||||
item = pcb->GetArea( 0 );
|
|
||||||
itemPicker.SetItem( item );
|
|
||||||
pickersList.PushItem( itemPicker );
|
|
||||||
pcb->Remove( item );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
LAYER_MSK masque_layer = NO_LAYERS;
|
|
||||||
LAYER_MSK layers_filter = ALL_LAYERS;
|
LAYER_MSK layers_filter = ALL_LAYERS;
|
||||||
|
|
||||||
if( m_rbLayersOption->GetSelection() != 0 ) // Use current layer only
|
if( m_rbLayersOption->GetSelection() != 0 ) // Use current layer only
|
||||||
layers_filter = GetLayerMask( m_currentLayer );
|
layers_filter = GetLayerMask( m_currentLayer );
|
||||||
|
|
||||||
|
if( m_DelZones->GetValue() )
|
||||||
if( m_DelDrawings->GetValue() )
|
|
||||||
masque_layer = (~EDGE_LAYER) & ALL_NO_CU_LAYERS;
|
|
||||||
|
|
||||||
if( m_DelBoardEdges->GetValue() )
|
|
||||||
masque_layer |= EDGE_LAYER;
|
|
||||||
|
|
||||||
layers_filter &= layers_filter;
|
|
||||||
|
|
||||||
for( item = pcb->m_Drawings; item != NULL; item = nextitem )
|
|
||||||
{
|
{
|
||||||
nextitem = item->Next();
|
int area_index = 0;
|
||||||
bool removeme = GetLayerMask( item->GetLayer() ) & masque_layer;
|
item = pcb->GetArea( area_index );
|
||||||
|
|
||||||
if( ( item->Type() == PCB_TEXT_T ) && m_DelTexts->GetValue() )
|
while( item != NULL )
|
||||||
removeme = true;
|
|
||||||
|
|
||||||
if( removeme )
|
|
||||||
{
|
{
|
||||||
itemPicker.SetItem( item );
|
|
||||||
pickersList.PushItem( itemPicker );
|
if( GetLayerMask( item->GetLayer() ) & layers_filter )
|
||||||
item->UnLink();
|
{
|
||||||
|
itemPicker.SetItem( item );
|
||||||
|
pickersList.PushItem( itemPicker );
|
||||||
|
pcb->Remove( item );
|
||||||
|
gen_rastnest = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
area_index++;
|
||||||
|
}
|
||||||
|
|
||||||
|
item = pcb->GetArea( area_index );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if( m_DelDrawings->GetValue() || m_DelBoardEdges->GetValue() )
|
||||||
|
{
|
||||||
|
LAYER_MSK masque_layer = NO_LAYERS;
|
||||||
|
|
||||||
|
if( m_DelDrawings->GetValue() )
|
||||||
|
masque_layer = (~EDGE_LAYER) & ALL_NO_CU_LAYERS;
|
||||||
|
|
||||||
|
if( m_DelBoardEdges->GetValue() )
|
||||||
|
masque_layer |= EDGE_LAYER;
|
||||||
|
|
||||||
|
masque_layer &= layers_filter;
|
||||||
|
|
||||||
|
for( item = pcb->m_Drawings; item != NULL; item = nextitem )
|
||||||
|
{
|
||||||
|
nextitem = item->Next();
|
||||||
|
|
||||||
|
if( ( item->Type() == PCB_LINE_T ) && ( GetLayerMask( item->GetLayer() ) & masque_layer) )
|
||||||
|
{
|
||||||
|
itemPicker.SetItem( item );
|
||||||
|
pickersList.PushItem( itemPicker );
|
||||||
|
item->UnLink();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if( m_DelTexts->GetValue() )
|
||||||
|
{
|
||||||
|
LAYER_MSK del_text_layers = ALL_LAYERS & layers_filter;
|
||||||
|
|
||||||
|
for( item = pcb->m_Drawings; item != NULL; item = nextitem )
|
||||||
|
{
|
||||||
|
nextitem = item->Next();
|
||||||
|
|
||||||
|
if( ( item->Type() == PCB_TEXT_T ) && ( GetLayerMask( item->GetLayer() ) & del_text_layers ) )
|
||||||
|
{
|
||||||
|
itemPicker.SetItem( item );
|
||||||
|
pickersList.PushItem( itemPicker );
|
||||||
|
item->UnLink();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if( m_DelModules->GetValue() )
|
if( m_DelModules->GetValue() )
|
||||||
{
|
{
|
||||||
gen_rastnest = true;
|
|
||||||
|
|
||||||
for( item = pcb->m_Modules; item; item = nextitem )
|
for( item = pcb->m_Modules; item; item = nextitem )
|
||||||
{
|
{
|
||||||
nextitem = item->Next();
|
nextitem = item->Next();
|
||||||
itemPicker.SetItem( item );
|
|
||||||
pickersList.PushItem( itemPicker );
|
if( ( GetLayerMask( item->GetLayer() ) & layers_filter ) &&
|
||||||
item->UnLink();
|
( ( m_ModuleFilterNormal->GetValue() && !item->IsLocked() ) ||
|
||||||
|
( m_ModuleFilterLocked->GetValue() && item->IsLocked() ) ) )
|
||||||
|
{
|
||||||
|
itemPicker.SetItem( item );
|
||||||
|
pickersList.PushItem( itemPicker );
|
||||||
|
item->UnLink();
|
||||||
|
gen_rastnest = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -148,6 +190,7 @@ void DIALOG_GLOBAL_DELETION::AcceptPcbDelete( )
|
||||||
track_mask_filter |= TRACK_AR;
|
track_mask_filter |= TRACK_AR;
|
||||||
|
|
||||||
TRACK * nexttrack;
|
TRACK * nexttrack;
|
||||||
|
|
||||||
for( TRACK *track = pcb->m_Track; track != NULL; track = nexttrack )
|
for( TRACK *track = pcb->m_Track; track != NULL; track = nexttrack )
|
||||||
{
|
{
|
||||||
nexttrack = track->Next();
|
nexttrack = track->Next();
|
||||||
|
@ -180,6 +223,7 @@ void DIALOG_GLOBAL_DELETION::AcceptPcbDelete( )
|
||||||
|
|
||||||
if( gen_rastnest )
|
if( gen_rastnest )
|
||||||
m_Parent->Compile_Ratsnest( NULL, true );
|
m_Parent->Compile_Ratsnest( NULL, true );
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
m_Parent->GetCanvas()->Refresh();
|
m_Parent->GetCanvas()->Refresh();
|
||||||
|
@ -187,4 +231,3 @@ void DIALOG_GLOBAL_DELETION::AcceptPcbDelete( )
|
||||||
|
|
||||||
EndModal( 1 );
|
EndModal( 1 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -30,6 +30,7 @@ private:
|
||||||
|
|
||||||
void AcceptPcbDelete();
|
void AcceptPcbDelete();
|
||||||
void OnCheckDeleteTracks( wxCommandEvent& event );
|
void OnCheckDeleteTracks( wxCommandEvent& event );
|
||||||
|
void OnCheckDeleteModules( wxCommandEvent& event );
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // _DIALOG_GLOBAL_DELETION_H_
|
#endif // _DIALOG_GLOBAL_DELETION_H_
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// C++ code generated with wxFormBuilder (version Oct 8 2012)
|
// C++ code generated with wxFormBuilder (version Feb 26 2014)
|
||||||
// http://www.wxformbuilder.org/
|
// http://www.wxformbuilder.org/
|
||||||
//
|
//
|
||||||
// PLEASE DO "NOT" EDIT THIS FILE!
|
// PLEASE DO "NOT" EDIT THIS FILE!
|
||||||
|
@ -52,25 +52,32 @@ DIALOG_GLOBAL_DELETION_BASE::DIALOG_GLOBAL_DELETION_BASE( wxWindow* parent, wxWi
|
||||||
wxBoxSizer* bSizerRight;
|
wxBoxSizer* bSizerRight;
|
||||||
bSizerRight = new wxBoxSizer( wxVERTICAL );
|
bSizerRight = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
sbTrackFilter = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Track Filter") ), wxVERTICAL );
|
sbFilter = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Filter Settings") ), wxVERTICAL );
|
||||||
|
|
||||||
m_TrackFilterAR = new wxCheckBox( this, wxID_ANY, _("Automatically routed tracks"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_TrackFilterAR = new wxCheckBox( this, wxID_ANY, _("Automatically routed tracks"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_TrackFilterAR->SetValue(true);
|
m_TrackFilterAR->SetValue(true);
|
||||||
sbTrackFilter->Add( m_TrackFilterAR, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
sbFilter->Add( m_TrackFilterAR, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
||||||
|
|
||||||
m_TrackFilterLocked = new wxCheckBox( this, wxID_ANY, _("Locked tracks"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_TrackFilterLocked = new wxCheckBox( this, wxID_ANY, _("Locked tracks"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
sbTrackFilter->Add( m_TrackFilterLocked, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
sbFilter->Add( m_TrackFilterLocked, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
||||||
|
|
||||||
m_TrackFilterNormal = new wxCheckBox( this, wxID_ANY, _("Normal tracks"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_TrackFilterNormal = new wxCheckBox( this, wxID_ANY, _("Unlocked tracks"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_TrackFilterNormal->SetValue(true);
|
m_TrackFilterNormal->SetValue(true);
|
||||||
sbTrackFilter->Add( m_TrackFilterNormal, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
sbFilter->Add( m_TrackFilterNormal, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
||||||
|
|
||||||
m_TrackFilterVias = new wxCheckBox( this, wxID_ANY, _("Vias"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_TrackFilterVias = new wxCheckBox( this, wxID_ANY, _("Vias"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_TrackFilterVias->SetValue(true);
|
m_TrackFilterVias->SetValue(true);
|
||||||
sbTrackFilter->Add( m_TrackFilterVias, 0, wxALL, 5 );
|
sbFilter->Add( m_TrackFilterVias, 0, wxALL, 5 );
|
||||||
|
|
||||||
|
m_ModuleFilterLocked = new wxCheckBox( this, wxID_ANY, _("Locked footprints"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
sbFilter->Add( m_ModuleFilterLocked, 0, wxALL, 5 );
|
||||||
|
|
||||||
|
m_ModuleFilterNormal = new wxCheckBox( this, wxID_ANY, _("Unlocked footprints"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
m_ModuleFilterNormal->SetValue(true);
|
||||||
|
sbFilter->Add( m_ModuleFilterNormal, 0, wxALL, 5 );
|
||||||
|
|
||||||
|
|
||||||
bSizerRight->Add( sbTrackFilter, 0, wxALL|wxEXPAND, 5 );
|
bSizerRight->Add( sbFilter, 0, wxALL|wxEXPAND, 5 );
|
||||||
|
|
||||||
wxString m_rbLayersOptionChoices[] = { _("All layers"), _("Current layer only") };
|
wxString m_rbLayersOptionChoices[] = { _("All layers"), _("Current layer only") };
|
||||||
int m_rbLayersOptionNChoices = sizeof( m_rbLayersOptionChoices ) / sizeof( wxString );
|
int m_rbLayersOptionNChoices = sizeof( m_rbLayersOptionChoices ) / sizeof( wxString );
|
||||||
|
@ -112,6 +119,7 @@ DIALOG_GLOBAL_DELETION_BASE::DIALOG_GLOBAL_DELETION_BASE( wxWindow* parent, wxWi
|
||||||
this->Centre( wxBOTH );
|
this->Centre( wxBOTH );
|
||||||
|
|
||||||
// Connect Events
|
// Connect Events
|
||||||
|
m_DelModules->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_DELETION_BASE::OnCheckDeleteModules ), NULL, this );
|
||||||
m_DelTracks->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_DELETION_BASE::OnCheckDeleteTracks ), NULL, this );
|
m_DelTracks->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_DELETION_BASE::OnCheckDeleteTracks ), NULL, this );
|
||||||
m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_DELETION_BASE::OnCancelClick ), NULL, this );
|
m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_DELETION_BASE::OnCancelClick ), NULL, this );
|
||||||
m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_DELETION_BASE::OnOkClick ), NULL, this );
|
m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_DELETION_BASE::OnOkClick ), NULL, this );
|
||||||
|
@ -120,6 +128,7 @@ DIALOG_GLOBAL_DELETION_BASE::DIALOG_GLOBAL_DELETION_BASE( wxWindow* parent, wxWi
|
||||||
DIALOG_GLOBAL_DELETION_BASE::~DIALOG_GLOBAL_DELETION_BASE()
|
DIALOG_GLOBAL_DELETION_BASE::~DIALOG_GLOBAL_DELETION_BASE()
|
||||||
{
|
{
|
||||||
// Disconnect Events
|
// Disconnect Events
|
||||||
|
m_DelModules->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_DELETION_BASE::OnCheckDeleteModules ), NULL, this );
|
||||||
m_DelTracks->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_DELETION_BASE::OnCheckDeleteTracks ), NULL, this );
|
m_DelTracks->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_DELETION_BASE::OnCheckDeleteTracks ), NULL, this );
|
||||||
m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_DELETION_BASE::OnCancelClick ), NULL, this );
|
m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_DELETION_BASE::OnCancelClick ), NULL, this );
|
||||||
m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_DELETION_BASE::OnOkClick ), NULL, this );
|
m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_DELETION_BASE::OnOkClick ), NULL, this );
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||||
<wxFormBuilder_Project>
|
<wxFormBuilder_Project>
|
||||||
<FileVersion major="1" minor="11" />
|
<FileVersion major="1" minor="12" />
|
||||||
<object class="Project" expanded="1">
|
<object class="Project" expanded="1">
|
||||||
<property name="class_decoration"></property>
|
<property name="class_decoration"></property>
|
||||||
<property name="code_generation">C++</property>
|
<property name="code_generation">C++</property>
|
||||||
|
@ -20,8 +20,10 @@
|
||||||
<property name="path">.</property>
|
<property name="path">.</property>
|
||||||
<property name="precompiled_header"></property>
|
<property name="precompiled_header"></property>
|
||||||
<property name="relative_path">1</property>
|
<property name="relative_path">1</property>
|
||||||
|
<property name="skip_lua_events">1</property>
|
||||||
<property name="skip_php_events">1</property>
|
<property name="skip_php_events">1</property>
|
||||||
<property name="skip_python_events">1</property>
|
<property name="skip_python_events">1</property>
|
||||||
|
<property name="ui_table">UI</property>
|
||||||
<property name="use_enum">0</property>
|
<property name="use_enum">0</property>
|
||||||
<property name="use_microsoft_bom">0</property>
|
<property name="use_microsoft_bom">0</property>
|
||||||
<object class="Dialog" expanded="1">
|
<object class="Dialog" expanded="1">
|
||||||
|
@ -527,7 +529,7 @@
|
||||||
<property name="window_name"></property>
|
<property name="window_name"></property>
|
||||||
<property name="window_style"></property>
|
<property name="window_style"></property>
|
||||||
<event name="OnChar"></event>
|
<event name="OnChar"></event>
|
||||||
<event name="OnCheckBox"></event>
|
<event name="OnCheckBox">OnCheckDeleteModules</event>
|
||||||
<event name="OnEnterWindow"></event>
|
<event name="OnEnterWindow"></event>
|
||||||
<event name="OnEraseBackground"></event>
|
<event name="OnEraseBackground"></event>
|
||||||
<event name="OnKeyDown"></event>
|
<event name="OnKeyDown"></event>
|
||||||
|
@ -833,9 +835,9 @@
|
||||||
<property name="proportion">0</property>
|
<property name="proportion">0</property>
|
||||||
<object class="wxStaticBoxSizer" expanded="1">
|
<object class="wxStaticBoxSizer" expanded="1">
|
||||||
<property name="id">wxID_ANY</property>
|
<property name="id">wxID_ANY</property>
|
||||||
<property name="label">Track Filter</property>
|
<property name="label">Filter Settings</property>
|
||||||
<property name="minimum_size"></property>
|
<property name="minimum_size"></property>
|
||||||
<property name="name">sbTrackFilter</property>
|
<property name="name">sbFilter</property>
|
||||||
<property name="orient">wxVERTICAL</property>
|
<property name="orient">wxVERTICAL</property>
|
||||||
<property name="permission">protected</property>
|
<property name="permission">protected</property>
|
||||||
<event name="OnUpdateUI"></event>
|
<event name="OnUpdateUI"></event>
|
||||||
|
@ -1048,7 +1050,7 @@
|
||||||
<property name="gripper">0</property>
|
<property name="gripper">0</property>
|
||||||
<property name="hidden">0</property>
|
<property name="hidden">0</property>
|
||||||
<property name="id">wxID_ANY</property>
|
<property name="id">wxID_ANY</property>
|
||||||
<property name="label">Normal tracks</property>
|
<property name="label">Unlocked tracks</property>
|
||||||
<property name="max_size"></property>
|
<property name="max_size"></property>
|
||||||
<property name="maximize_button">0</property>
|
<property name="maximize_button">0</property>
|
||||||
<property name="maximum_size"></property>
|
<property name="maximum_size"></property>
|
||||||
|
@ -1191,6 +1193,182 @@
|
||||||
<event name="OnUpdateUI"></event>
|
<event name="OnUpdateUI"></event>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
<object class="sizeritem" expanded="1">
|
||||||
|
<property name="border">5</property>
|
||||||
|
<property name="flag">wxALL</property>
|
||||||
|
<property name="proportion">0</property>
|
||||||
|
<object class="wxCheckBox" expanded="1">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="checked">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="label">Locked footprints</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_ModuleFilterLocked</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="validator_data_type"></property>
|
||||||
|
<property name="validator_style">wxFILTER_NONE</property>
|
||||||
|
<property name="validator_type">wxDefaultValidator</property>
|
||||||
|
<property name="validator_variable"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<event name="OnChar"></event>
|
||||||
|
<event name="OnCheckBox"></event>
|
||||||
|
<event name="OnEnterWindow"></event>
|
||||||
|
<event name="OnEraseBackground"></event>
|
||||||
|
<event name="OnKeyDown"></event>
|
||||||
|
<event name="OnKeyUp"></event>
|
||||||
|
<event name="OnKillFocus"></event>
|
||||||
|
<event name="OnLeaveWindow"></event>
|
||||||
|
<event name="OnLeftDClick"></event>
|
||||||
|
<event name="OnLeftDown"></event>
|
||||||
|
<event name="OnLeftUp"></event>
|
||||||
|
<event name="OnMiddleDClick"></event>
|
||||||
|
<event name="OnMiddleDown"></event>
|
||||||
|
<event name="OnMiddleUp"></event>
|
||||||
|
<event name="OnMotion"></event>
|
||||||
|
<event name="OnMouseEvents"></event>
|
||||||
|
<event name="OnMouseWheel"></event>
|
||||||
|
<event name="OnPaint"></event>
|
||||||
|
<event name="OnRightDClick"></event>
|
||||||
|
<event name="OnRightDown"></event>
|
||||||
|
<event name="OnRightUp"></event>
|
||||||
|
<event name="OnSetFocus"></event>
|
||||||
|
<event name="OnSize"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
<object class="sizeritem" expanded="1">
|
||||||
|
<property name="border">5</property>
|
||||||
|
<property name="flag">wxALL</property>
|
||||||
|
<property name="proportion">0</property>
|
||||||
|
<object class="wxCheckBox" expanded="1">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="checked">1</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="label">Unlocked footprints</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_ModuleFilterNormal</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="validator_data_type"></property>
|
||||||
|
<property name="validator_style">wxFILTER_NONE</property>
|
||||||
|
<property name="validator_type">wxDefaultValidator</property>
|
||||||
|
<property name="validator_variable"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<event name="OnChar"></event>
|
||||||
|
<event name="OnCheckBox"></event>
|
||||||
|
<event name="OnEnterWindow"></event>
|
||||||
|
<event name="OnEraseBackground"></event>
|
||||||
|
<event name="OnKeyDown"></event>
|
||||||
|
<event name="OnKeyUp"></event>
|
||||||
|
<event name="OnKillFocus"></event>
|
||||||
|
<event name="OnLeaveWindow"></event>
|
||||||
|
<event name="OnLeftDClick"></event>
|
||||||
|
<event name="OnLeftDown"></event>
|
||||||
|
<event name="OnLeftUp"></event>
|
||||||
|
<event name="OnMiddleDClick"></event>
|
||||||
|
<event name="OnMiddleDown"></event>
|
||||||
|
<event name="OnMiddleUp"></event>
|
||||||
|
<event name="OnMotion"></event>
|
||||||
|
<event name="OnMouseEvents"></event>
|
||||||
|
<event name="OnMouseWheel"></event>
|
||||||
|
<event name="OnPaint"></event>
|
||||||
|
<event name="OnRightDClick"></event>
|
||||||
|
<event name="OnRightDown"></event>
|
||||||
|
<event name="OnRightUp"></event>
|
||||||
|
<event name="OnSetFocus"></event>
|
||||||
|
<event name="OnSize"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem" expanded="1">
|
<object class="sizeritem" expanded="1">
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// C++ code generated with wxFormBuilder (version Oct 8 2012)
|
// C++ code generated with wxFormBuilder (version Feb 26 2014)
|
||||||
// http://www.wxformbuilder.org/
|
// http://www.wxformbuilder.org/
|
||||||
//
|
//
|
||||||
// PLEASE DO "NOT" EDIT THIS FILE!
|
// PLEASE DO "NOT" EDIT THIS FILE!
|
||||||
|
@ -48,11 +48,13 @@ class DIALOG_GLOBAL_DELETION_BASE : public DIALOG_SHIM
|
||||||
wxCheckBox* m_DelTracks;
|
wxCheckBox* m_DelTracks;
|
||||||
wxCheckBox* m_DelMarkers;
|
wxCheckBox* m_DelMarkers;
|
||||||
wxCheckBox* m_DelAlls;
|
wxCheckBox* m_DelAlls;
|
||||||
wxStaticBoxSizer* sbTrackFilter;
|
wxStaticBoxSizer* sbFilter;
|
||||||
wxCheckBox* m_TrackFilterAR;
|
wxCheckBox* m_TrackFilterAR;
|
||||||
wxCheckBox* m_TrackFilterLocked;
|
wxCheckBox* m_TrackFilterLocked;
|
||||||
wxCheckBox* m_TrackFilterNormal;
|
wxCheckBox* m_TrackFilterNormal;
|
||||||
wxCheckBox* m_TrackFilterVias;
|
wxCheckBox* m_TrackFilterVias;
|
||||||
|
wxCheckBox* m_ModuleFilterLocked;
|
||||||
|
wxCheckBox* m_ModuleFilterNormal;
|
||||||
wxRadioBox* m_rbLayersOption;
|
wxRadioBox* m_rbLayersOption;
|
||||||
wxStaticText* m_staticText1;
|
wxStaticText* m_staticText1;
|
||||||
wxTextCtrl* m_textCtrlCurrLayer;
|
wxTextCtrl* m_textCtrlCurrLayer;
|
||||||
|
@ -62,6 +64,7 @@ class DIALOG_GLOBAL_DELETION_BASE : public DIALOG_SHIM
|
||||||
wxButton* m_sdbSizer1Cancel;
|
wxButton* m_sdbSizer1Cancel;
|
||||||
|
|
||||||
// Virtual event handlers, overide them in your derived class
|
// Virtual event handlers, overide them in your derived class
|
||||||
|
virtual void OnCheckDeleteModules( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void OnCheckDeleteTracks( wxCommandEvent& event ) { event.Skip(); }
|
virtual void OnCheckDeleteTracks( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
|
virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
|
virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
|
||||||
|
|
Loading…
Reference in New Issue