haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

REMOVED: "Delete twice to delete locked" action 

Now that it is possible to disable selection of locked
items, it is better to just prevent accidental editing
of locked items

Fixes https://gitlab.com/kicad/code/kicad/-/issues/5793
This commit is contained in:
Jon Evans 2020-09-28 20:35:31 -04:00
parent 74b0e1fa47
commit e4ca4a2a47
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcbnew/tools/edit_tool.cpp
View File

@ -1080,7 +1080,7 @@ int EDIT_TOOL::Remove( const TOOL_EVENT& aEvent )
// N.B. Setting the CUT flag prevents lock filtering as we only want to delete the items that // N.B. Setting the CUT flag prevents lock filtering as we only want to delete the items that
// were copied to the clipboard, no more, no fewer. Filtering for locked item, if any will be done // were copied to the clipboard, no more, no fewer. Filtering for locked item, if any will be done
// in the copyToClipboard() routine // in the copyToClipboard() routine
if( !m_lockedSelected && !isCut ) if( !isCut )
{ {
// Second RequestSelection removes locked items but keeps a copy of their pointers // Second RequestSelection removes locked items but keeps a copy of their pointers
selectionCopy = m_selectionTool->RequestSelection( selectionCopy = m_selectionTool->RequestSelection(
@ -1232,7 +1232,7 @@ int EDIT_TOOL::Remove( const TOOL_EVENT& aEvent )
///> Popup nag for deleting locked items ///> Popup nag for deleting locked items
m_lockedSelected = true; m_lockedSelected = true;
m_toolMgr->RunAction( PCB_ACTIONS::selectItems, true, &lockedItems ); m_toolMgr->RunAction( PCB_ACTIONS::selectItems, true, &lockedItems );
m_statusPopup->SetText( _( "Delete again to remove locked items" ) ); m_statusPopup->SetText( _( "Locked items cannot be deleted" ) );
m_statusPopup->PopupFor( 2000 ); m_statusPopup->PopupFor( 2000 );
m_statusPopup->Move( wxGetMousePosition() + wxPoint( 20, 20 ) ); m_statusPopup->Move( wxGetMousePosition() + wxPoint( 20, 20 ) );
@ -1639,8 +1639,10 @@ int EDIT_TOOL::copyToClipboard( const TOOL_EVENT& aEvent )
Activate(); Activate();
PCBNEW_SELECTION& selection = m_selectionTool->RequestSelection( PCBNEW_SELECTION& selection = m_selectionTool->RequestSelection(
[]( const VECTOR2I& aPt, GENERAL_COLLECTOR& aCollector, SELECTION_TOOL* sTool ) { []( const VECTOR2I& aPt, GENERAL_COLLECTOR& aCollector, SELECTION_TOOL* sTool )
EditToolSelectionFilter( aCollector, EXCLUDE_LOCKED_PADS | EXCLUDE_TRANSIENTS, sTool ); {
EditToolSelectionFilter( aCollector, EXCLUDE_LOCKED_PADS | EXCLUDE_TRANSIENTS,
sTool );
} ); } );
if( !selection.Empty() ) if( !selection.Empty() )
@ -1650,7 +1652,8 @@ int EDIT_TOOL::copyToClipboard( const TOOL_EVENT& aEvent )
for( EDA_ITEM* item : selection ) for( EDA_ITEM* item : selection )
items.push_back( static_cast<BOARD_ITEM*>( item ) ); items.push_back( static_cast<BOARD_ITEM*>( item ) );
VECTOR2I refPoint = grid.BestDragOrigin( getViewControls()->GetCursorPosition( false ), items ); VECTOR2I refPoint = grid.BestDragOrigin( getViewControls()->GetCursorPosition( false ),
items );
selection.SetReferencePoint( refPoint ); selection.SetReferencePoint( refPoint );
io.SetBoard( board() ); io.SetBoard( board() );