Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Refactor deleteTool ACTION removing duplicates

pull/15/head
Michael Kavanagh 6 years ago
committed by Wayne Stambaugh
parent
db59c7011b
commit
79b2ff7551
19 changed files with 23 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      common/tool/actions.cpp
  2. 4
      eeschema/libedit/toolbars_libedit.cpp
  3. 2
      eeschema/menubar.cpp
  4. 4
      eeschema/toolbars_sch_editor.cpp
  5. 5
      eeschema/tools/ee_actions.cpp
  6. 1
      eeschema/tools/ee_actions.h
  7. 2
      eeschema/tools/lib_edit_tool.cpp
  8. 2
      eeschema/tools/sch_edit_tool.cpp
  9. 1
      include/tool/actions.h
  10. 4
      pagelayout_editor/toolbars_pl_editor.cpp
  11. 5
      pagelayout_editor/tools/pl_actions.cpp
  12. 1
      pagelayout_editor/tools/pl_actions.h
  13. 3
      pagelayout_editor/tools/pl_edit_tool.cpp
  14. 2
      pcbnew/menubar_pcb_editor.cpp
  15. 4
      pcbnew/toolbars_footprint_editor.cpp
  16. 4
      pcbnew/toolbars_pcb_editor.cpp
  17. 6
      pcbnew/tools/pcb_actions.cpp
  18. 1
      pcbnew/tools/pcb_actions.h
  19. 2
      pcbnew/tools/pcbnew_control.cpp

5
common/tool/actions.cpp
View File

@ -175,6 +175,11 @@ TOOL_ACTION ACTIONS::doDelete( "common.Interactive.delete",
_( "Delete" ), _( "Deletes selected item(s)" ),
delete_xpm );
TOOL_ACTION ACTIONS::deleteTool( "common.Interactive.deleteTool",
AS_GLOBAL, 0, "",
_( "Interactive Delete Tool" ), _( "Delete clicked items" ),
delete_xpm, AF_ACTIVATE );
TOOL_ACTION ACTIONS::activatePointEditor( "common.Control.activatePointEditor",
AS_GLOBAL );

4
eeschema/libedit/toolbars_libedit.cpp
View File

@ -69,7 +69,7 @@ void LIB_EDIT_FRAME::ReCreateVToolbar()
KiScaledBitmap( export_xpm, this ),
_( "Export current drawing" ), wxITEM_CHECK );
m_drawToolBar->Add( EE_ACTIONS::deleteTool, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Add( ACTIONS::deleteTool, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Realize();
}
@ -194,6 +194,6 @@ void LIB_EDIT_FRAME::SyncToolbars()
TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::drawSymbolCircle );
TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::drawSymbolArc );
TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::drawSymbolLines );
TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::deleteTool );
TOGGLE_TOOL( m_drawToolBar, ACTIONS::deleteTool );
m_drawToolBar->Refresh();
}

2
eeschema/menubar.cpp
View File

@ -145,7 +145,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
editMenu->AddItem( ACTIONS::findAndReplace, EE_CONDITIONS::ShowAlways );
editMenu->AddSeparator();
editMenu->AddItem( EE_ACTIONS::deleteTool, EE_CONDITIONS::ShowAlways );
editMenu->AddItem( ACTIONS::deleteTool, EE_CONDITIONS::ShowAlways );
editMenu->AddItem( EE_ACTIONS::editTextAndGraphics, EE_CONDITIONS::ShowAlways );
editMenu->AddItem( EE_ACTIONS::updateFieldsFromLibrary, EE_CONDITIONS::ShowAlways );

4
eeschema/toolbars_sch_editor.cpp
View File

@ -136,7 +136,7 @@ void SCH_EDIT_FRAME::ReCreateVToolbar()
m_drawToolBar->Add( EE_ACTIONS::drawLines, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Add( EE_ACTIONS::placeSchematicText, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Add( EE_ACTIONS::placeImage, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Add( EE_ACTIONS::deleteTool, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Add( ACTIONS::deleteTool, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Realize();
}
@ -204,6 +204,6 @@ void SCH_EDIT_FRAME::SyncToolbars()
TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::drawLines );
TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::placeSchematicText );
TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::placeImage );
TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::deleteTool );
TOGGLE_TOOL( m_drawToolBar, ACTIONS::deleteTool );
m_drawToolBar->Refresh();
}

5
eeschema/tools/ee_actions.cpp
View File

@ -472,11 +472,6 @@ TOOL_ACTION EE_ACTIONS::pinTable( "eeschema.InteractiveEdit.pinTable",
_( "Pin Table..." ), _( "Displays pin table for bulk editing of pins" ),
pin_table_xpm );
TOOL_ACTION EE_ACTIONS::deleteTool( "eeschema.InteractiveEdit.deleteTool",
AS_GLOBAL, 0, "",
_( "Delete Tool" ), _( "Delete clicked items" ),
delete_xpm, AF_ACTIVATE );
TOOL_ACTION EE_ACTIONS::breakWire( "eeschema.InteractiveEdit.breakWire",
AS_GLOBAL, 0, "",
_( "Break Wire" ), _( "Divide a wire into segments which can be dragged independently" ),

1
eeschema/tools/ee_actions.h
View File

@ -93,7 +93,6 @@ public:
static TOOL_ACTION placeSchematicText;
static TOOL_ACTION drawLines;
static TOOL_ACTION placeImage;
static TOOL_ACTION deleteTool;
static TOOL_ACTION finishLineWireOrBus;
static TOOL_ACTION finishWire;
static TOOL_ACTION finishBus;

2
eeschema/tools/lib_edit_tool.cpp
View File

@ -754,7 +754,7 @@ void LIB_EDIT_TOOL::setTransitions()
Go( &LIB_EDIT_TOOL::Mirror, EE_ACTIONS::mirrorX.MakeEvent() );
Go( &LIB_EDIT_TOOL::Mirror, EE_ACTIONS::mirrorY.MakeEvent() );
Go( &LIB_EDIT_TOOL::DoDelete, EE_ACTIONS::doDelete.MakeEvent() );
Go( &LIB_EDIT_TOOL::DeleteItemCursor, EE_ACTIONS::deleteTool.MakeEvent() );
Go( &LIB_EDIT_TOOL::DeleteItemCursor, ACTIONS::deleteTool.MakeEvent() );
Go( &LIB_EDIT_TOOL::Properties, EE_ACTIONS::properties.MakeEvent() );
Go( &LIB_EDIT_TOOL::Properties, EE_ACTIONS::symbolProperties.MakeEvent() );

2
eeschema/tools/sch_edit_tool.cpp
View File

@ -1397,7 +1397,7 @@ void SCH_EDIT_TOOL::setTransitions()
Go( &SCH_EDIT_TOOL::Mirror, EE_ACTIONS::mirrorX.MakeEvent() );
Go( &SCH_EDIT_TOOL::Mirror, EE_ACTIONS::mirrorY.MakeEvent() );
Go( &SCH_EDIT_TOOL::DoDelete, EE_ACTIONS::doDelete.MakeEvent() );
Go( &SCH_EDIT_TOOL::DeleteItemCursor, EE_ACTIONS::deleteTool.MakeEvent() );
Go( &SCH_EDIT_TOOL::DeleteItemCursor, ACTIONS::deleteTool.MakeEvent() );
Go( &SCH_EDIT_TOOL::Properties, EE_ACTIONS::properties.MakeEvent() );
Go( &SCH_EDIT_TOOL::EditField, EE_ACTIONS::editReference.MakeEvent() );

1
include/tool/actions.h
View File

@ -71,6 +71,7 @@ public:
static TOOL_ACTION paste;
static TOOL_ACTION duplicate;
static TOOL_ACTION doDelete; // sadly 'delete' is a reserved word
static TOOL_ACTION deleteTool;
// Find and Replace
static TOOL_ACTION find;

4
pagelayout_editor/toolbars_pl_editor.cpp
View File

@ -135,7 +135,7 @@ void PL_EDITOR_FRAME::ReCreateVToolbar()
m_drawToolBar->Add( PL_ACTIONS::appendImportedWorksheet, ACTION_TOOLBAR::TOGGLE );
KiScaledSeparator( m_drawToolBar, this );
m_drawToolBar->Add( PL_ACTIONS::deleteTool, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Add( ACTIONS::deleteTool, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Realize();
}
@ -161,7 +161,7 @@ void PL_EDITOR_FRAME::SyncToolbars()
TOGGLE_TOOL( m_drawToolBar, PL_ACTIONS::drawRectangle );
TOGGLE_TOOL( m_drawToolBar, PL_ACTIONS::placeText );
TOGGLE_TOOL( m_drawToolBar, PL_ACTIONS::placeImage );
TOGGLE_TOOL( m_drawToolBar, PL_ACTIONS::deleteTool );
TOGGLE_TOOL( m_drawToolBar, ACTIONS::deleteTool );
m_drawToolBar->Toggle( PL_ACTIONS::appendImportedWorksheet, false ); // Not really a tool
m_drawToolBar->Refresh();

5
pagelayout_editor/tools/pl_actions.cpp
View File

@ -72,11 +72,6 @@ TOOL_ACTION PL_ACTIONS::appendImportedWorksheet( "plEditor.InteractiveEdit.appen
_( "Append an existing page layout design file to current file" ),
import_xpm, AF_ACTIVATE );
TOOL_ACTION PL_ACTIONS::deleteTool( "plEditor.InteractiveEdit.deleteTool",
AS_GLOBAL, 0, "",
_( "Delete Items" ), _( "Delete clicked items" ),
delete_xpm, AF_ACTIVATE );
// PL_EDITOR_CONTROL
//

1
pagelayout_editor/tools/pl_actions.h
View File

@ -70,7 +70,6 @@ public:
static TOOL_ACTION move;
// Miscellaneous
static TOOL_ACTION deleteTool;
static TOOL_ACTION refreshPreview;
static TOOL_ACTION toggleBackground;
static TOOL_ACTION showInspector;

3
pagelayout_editor/tools/pl_edit_tool.cpp
View File

@ -502,7 +502,6 @@ void PL_EDIT_TOOL::setTransitions()
Go( &PL_EDIT_TOOL::Main, PL_ACTIONS::move.MakeEvent() );
Go( &PL_EDIT_TOOL::ImportWorksheetContent, PL_ACTIONS::appendImportedWorksheet.MakeEvent() );
Go( &PL_EDIT_TOOL::DeleteItemCursor, PL_ACTIONS::deleteTool.MakeEvent() );
Go( &PL_EDIT_TOOL::Undo, ACTIONS::undo.MakeEvent() );
Go( &PL_EDIT_TOOL::Redo, ACTIONS::redo.MakeEvent() );
@ -511,4 +510,6 @@ void PL_EDIT_TOOL::setTransitions()
Go( &PL_EDIT_TOOL::Copy, ACTIONS::copy.MakeEvent() );
Go( &PL_EDIT_TOOL::Paste, ACTIONS::paste.MakeEvent() );
Go( &PL_EDIT_TOOL::DoDelete, ACTIONS::doDelete.MakeEvent() );
Go( &PL_EDIT_TOOL::DeleteItemCursor, ACTIONS::deleteTool.MakeEvent() );
}

2
pcbnew/menubar_pcb_editor.cpp
View File

@ -235,7 +235,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
editMenu->AddItem( PCB_ACTIONS::zoneUnfillAll, SELECTION_CONDITIONS::ShowAlways );
editMenu->AddSeparator();
editMenu->AddItem( PCB_ACTIONS::deleteTool, SELECTION_CONDITIONS::ShowAlways );
editMenu->AddItem( ACTIONS::deleteTool, SELECTION_CONDITIONS::ShowAlways );
editMenu->AddItem( PCB_ACTIONS::globalDeletions, SELECTION_CONDITIONS::ShowAlways );
editMenu->AddItem( PCB_ACTIONS::cleanupTracksAndVias, SELECTION_CONDITIONS::ShowAlways );

4
pcbnew/toolbars_footprint_editor.cpp
View File

@ -135,7 +135,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateVToolbar()
m_drawToolBar->Add( PCB_ACTIONS::drawArc, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Add( PCB_ACTIONS::drawPolygon, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Add( PCB_ACTIONS::placeText, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Add( PCB_ACTIONS::deleteTool, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Add( ACTIONS::deleteTool, ACTION_TOOLBAR::TOGGLE );
KiScaledSeparator( m_drawToolBar, this );
m_drawToolBar->Add( PCB_ACTIONS::setAnchor, ACTION_TOOLBAR::TOGGLE );
@ -206,7 +206,7 @@ void FOOTPRINT_EDIT_FRAME::SyncToolbars()
TOGGLE_TOOL( m_drawToolBar, PCB_ACTIONS::drawArc );
TOGGLE_TOOL( m_drawToolBar, PCB_ACTIONS::drawPolygon );
TOGGLE_TOOL( m_drawToolBar, PCB_ACTIONS::placeText );
TOGGLE_TOOL( m_drawToolBar, PCB_ACTIONS::deleteTool );
TOGGLE_TOOL( m_drawToolBar, ACTIONS::deleteTool );
TOGGLE_TOOL( m_drawToolBar, PCB_ACTIONS::setAnchor );
TOGGLE_TOOL( m_drawToolBar, PCB_ACTIONS::gridSetOrigin );
TOGGLE_TOOL( m_drawToolBar, ACTIONS::measureTool );

4
pcbnew/toolbars_pcb_editor.cpp
View File

@ -380,7 +380,7 @@ void PCB_EDIT_FRAME::ReCreateVToolbar()
m_drawToolBar->Add( PCB_ACTIONS::placeText, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Add( PCB_ACTIONS::drawDimension, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Add( PCB_ACTIONS::placeTarget, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Add( PCB_ACTIONS::deleteTool, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Add( ACTIONS::deleteTool, ACTION_TOOLBAR::TOGGLE );
KiScaledSeparator( m_drawToolBar, this );
m_drawToolBar->Add( PCB_ACTIONS::drillOrigin, ACTION_TOOLBAR::TOGGLE );
@ -716,7 +716,7 @@ void PCB_EDIT_FRAME::SyncToolbars()
TOGGLE_TOOL( m_drawToolBar, PCB_ACTIONS::placeText );
TOGGLE_TOOL( m_drawToolBar, PCB_ACTIONS::drawDimension );
TOGGLE_TOOL( m_drawToolBar, PCB_ACTIONS::placeTarget );
TOGGLE_TOOL( m_drawToolBar, PCB_ACTIONS::deleteTool );
TOGGLE_TOOL( m_drawToolBar, ACTIONS::deleteTool );
TOGGLE_TOOL( m_drawToolBar, PCB_ACTIONS::drillOrigin );
TOGGLE_TOOL( m_drawToolBar, PCB_ACTIONS::gridSetOrigin );
TOGGLE_TOOL( m_drawToolBar, ACTIONS::measureTool );

6
pcbnew/tools/pcb_actions.cpp
View File

@ -898,12 +898,6 @@ TOOL_ACTION PCB_ACTIONS::layerChanged( "pcbnew.Control.layerChanged",
"", "",
nullptr, AF_NOTIFY );
// Miscellaneous
TOOL_ACTION PCB_ACTIONS::deleteTool( "pcbnew.Control.deleteTool",
AS_GLOBAL, 0, "",
_( "Delete Items Tool" ), _( "Click on items to delete them" ),
delete_xpm, AF_ACTIVATE );
//Show board statistics tool
TOOL_ACTION PCB_ACTIONS::boardStatistics( "pcbnew.InspectionTool.ShowStatisticsDialog", AS_GLOBAL,
0, LEGACY_HK_NAME( "Show Board Statistics" ), _( "Show Board Statistics" ),

1
pcbnew/tools/pcb_actions.h
View File

@ -401,7 +401,6 @@ public:
static TOOL_ACTION pickerTool;
static TOOL_ACTION measureTool;
static TOOL_ACTION updateUnits;
static TOOL_ACTION deleteTool;
static TOOL_ACTION clearHighlight;
static TOOL_ACTION highlightNet;
static TOOL_ACTION toggleLastNetHighlight;

2
pcbnew/tools/pcbnew_control.cpp
View File

@ -1008,7 +1008,7 @@ void PCBNEW_CONTROL::setTransitions()
Go( &PCBNEW_CONTROL::Redo, ACTIONS::redo.MakeEvent() );
// Miscellaneous
Go( &PCBNEW_CONTROL::DeleteItemCursor, PCB_ACTIONS::deleteTool.MakeEvent() );
Go( &PCBNEW_CONTROL::DeleteItemCursor, ACTIONS::deleteTool.MakeEvent() );
Go( &PCBNEW_CONTROL::Show3DViewer, ACTIONS::show3DViewer.MakeEvent() );
// Append control

Write Preview
Loading…
Cancel
Save