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

Move delete-again-to-delete-locked-objects to hypertext in infobar. 

Fixes https://gitlab.com/kicad/code/kicad/issues/6367
This commit is contained in:
Jeff Young 2020-12-09 20:48:04 +00:00
parent ee6f37bdc7
commit 65782d5c5a
2 changed files with 56 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
pcbnew/tools/edit_tool.cpp
View File

@ -55,6 +55,8 @@
#include <functional> #include <functional>
using namespace std::placeholders; using namespace std::placeholders;
#include "kicad_clipboard.h" #include "kicad_clipboard.h"
#include <wx/hyperlink.h>
#include <widgets/infobar.h>
#include <router/router_tool.h> #include <router/router_tool.h>
#include <dialogs/dialog_move_exact.h> #include <dialogs/dialog_move_exact.h>
#include <dialogs/dialog_track_via_properties.h> #include <dialogs/dialog_track_via_properties.h>
@ -120,10 +122,11 @@ void EditToolSelectionFilter( GENERAL_COLLECTOR& aCollector, int aFlags,
EDIT_TOOL::EDIT_TOOL() : EDIT_TOOL::EDIT_TOOL() :
PCB_TOOL_BASE( "pcbnew.InteractiveEdit" ), PCB_TOOL_BASE( "pcbnew.InteractiveEdit" ),
m_selectionTool( NULL ), m_selectionTool( NULL ),
m_dragging( false ), m_dragging( false ),
m_lockedSelected( false ) m_dismissInfobarOnNextSel( false ),
m_forceDeleteLockedItems( false )
{ {
} }
@ -625,7 +628,7 @@ int EDIT_TOOL::doMoveSelection( TOOL_EVENT aEvent, bool aPickReference )
} while( ( evt = Wait() ) ); // Assignment (instead of equality test) is intentional } while( ( evt = Wait() ) ); // Assignment (instead of equality test) is intentional
m_lockedSelected = false; m_forceDeleteLockedItems = false;
controls->ForceCursorPosition( false ); controls->ForceCursorPosition( false );
controls->ShowCursor( false ); controls->ShowCursor( false );
controls->SetAutoPan( false ); controls->SetAutoPan( false );
@ -1279,9 +1282,9 @@ int EDIT_TOOL::Remove( const TOOL_EVENT& aEvent )
return 0; return 0;
// 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 // were copied to the clipboard, no more, no fewer. Any filtering for locked items will be
// done in the copyToClipboard() routine // done in the copyToClipboard() routine
if( !isCut ) if( !m_forceDeleteLockedItems && !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(
@ -1443,29 +1446,34 @@ int EDIT_TOOL::Remove( const TOOL_EVENT& aEvent )
else else
m_commit->Push( _( "Delete" ) ); m_commit->Push( _( "Delete" ) );
if( !m_lockedSelected && !lockedItems.empty() ) if( !m_forceDeleteLockedItems && !lockedItems.empty() )
{ {
///> Popup nag for deleting locked items
m_lockedSelected = true;
m_toolMgr->RunAction( PCB_ACTIONS::selectItems, true, &lockedItems ); m_toolMgr->RunAction( PCB_ACTIONS::selectItems, true, &lockedItems );
m_statusPopup->SetText( _( "Locked items cannot be deleted" ) );
m_statusPopup->PopupFor( 2000 );
m_statusPopup->Move( wxGetMousePosition() + wxPoint( 20, 20 ) );
Activate(); WX_INFOBAR* infobar = frame()->GetInfoBar();
wxString msg = _( "Locked items in the selection were not deleted." );
wxString link = _( "Delete locked items" );
while( m_lockedSelected && m_statusPopup->IsShown() ) wxHyperlinkCtrl* button = new wxHyperlinkCtrl( infobar, wxID_ANY, link, wxEmptyString );
{ button->Bind( wxEVT_COMMAND_HYPERLINK, std::function<void( wxHyperlinkEvent& aEvent )>(
m_statusPopup->Move( wxGetMousePosition() + wxPoint( 20, 20 ) ); [&]( wxHyperlinkEvent& aEvent )
Wait(); {
} m_forceDeleteLockedItems = true;
{
m_toolMgr->RunAction( ACTIONS::doDelete, true );
}
m_forceDeleteLockedItems = false;
// Ensure statusPopup is hidden after use frame()->GetInfoBar()->Dismiss();
m_statusPopup->Hide(); m_dismissInfobarOnNextSel = false;
} ) );
infobar->RemoveAllButtons();
infobar->AddButton( button );
infobar->ShowMessageFor( msg, 4000, wxICON_INFORMATION );
m_dismissInfobarOnNextSel = true;
} }
m_lockedSelected = false;
return 0; return 0;
} }
@ -1924,6 +1932,18 @@ int EDIT_TOOL::cutToClipboard( const TOOL_EVENT& aEvent )
} }
int EDIT_TOOL::onSelectionEvent( const TOOL_EVENT& aEvent )
{
if( m_dismissInfobarOnNextSel )
{
frame()->GetInfoBar()->Dismiss();
m_dismissInfobarOnNextSel = false;
}
return 0;
}
void EDIT_TOOL::setTransitions() void EDIT_TOOL::setTransitions()
{ {
Go( &EDIT_TOOL::GetAndPlace, PCB_ACTIONS::getAndPlace.MakeEvent() ); Go( &EDIT_TOOL::GetAndPlace, PCB_ACTIONS::getAndPlace.MakeEvent() );
@ -1948,6 +1968,9 @@ void EDIT_TOOL::setTransitions()
Go( &EDIT_TOOL::copyToClipboard, ACTIONS::copy.MakeEvent() ); Go( &EDIT_TOOL::copyToClipboard, ACTIONS::copy.MakeEvent() );
Go( &EDIT_TOOL::copyToClipboard, PCB_ACTIONS::copyWithReference.MakeEvent() ); Go( &EDIT_TOOL::copyToClipboard, PCB_ACTIONS::copyWithReference.MakeEvent() );
Go( &EDIT_TOOL::cutToClipboard, ACTIONS::cut.MakeEvent() ); Go( &EDIT_TOOL::cutToClipboard, ACTIONS::cut.MakeEvent() );
Go( &EDIT_TOOL::onSelectionEvent, EVENTS::SelectedEvent );
Go( &EDIT_TOOL::onSelectionEvent, EVENTS::UnselectedEvent );
} }

16
pcbnew/tools/edit_tool.h
View File

@ -203,14 +203,18 @@ private:
bool pickReferencePoint( const wxString& aTooltip, const wxString& aSuccessMessage, bool pickReferencePoint( const wxString& aTooltip, const wxString& aSuccessMessage,
const wxString& aCanceledMessage, VECTOR2I& aReferencePoint ); const wxString& aCanceledMessage, VECTOR2I& aReferencePoint );
int onSelectionEvent( const TOOL_EVENT& aEvent );
private: private:
SELECTION_TOOL* m_selectionTool; // Selection tool used for obtaining selected items SELECTION_TOOL* m_selectionTool; // Selection tool used for obtaining selected items
bool m_dragging; // Indicates objects are being dragged right now
bool m_lockedSelected; // Determines if we prompt before removing locked objects bool m_dragging; // Indicates objects are being dragged right now
VECTOR2I m_cursor; // Last cursor position (needed for getModificationPoint() bool m_dismissInfobarOnNextSel;
// to avoid changes of edit reference point). bool m_forceDeleteLockedItems; // Delete even locked items if set
std::unique_ptr<BOARD_COMMIT> m_commit; VECTOR2I m_cursor; // Last cursor position (needed for getModificationPoint()
// to avoid changes of edit reference point).
std::unique_ptr<BOARD_COMMIT> m_commit;
std::unique_ptr<STATUS_TEXT_POPUP> m_statusPopup; std::unique_ptr<STATUS_TEXT_POPUP> m_statusPopup;
}; };