From 7273748c579253d82374583f5587c49716cf5d4d Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Wed, 1 May 2019 23:29:53 +0100 Subject: [PATCH] Context menu cleanup for eeschema modern toolset. --- eeschema/onrightclick.cpp | 56 ----------------------------- eeschema/sch_edit_frame.h | 2 +- eeschema/tools/sch_actions.h | 1 + eeschema/tools/sch_drawing_tool.cpp | 5 +++ eeschema/tools/sch_edit_tool.cpp | 3 ++ 5 files changed, 10 insertions(+), 57 deletions(-) diff --git a/eeschema/onrightclick.cpp b/eeschema/onrightclick.cpp index 7119a9f71c..cad67e1a7b 100644 --- a/eeschema/onrightclick.cpp +++ b/eeschema/onrightclick.cpp @@ -47,55 +47,6 @@ #include #include -static void AddMenusForBus( wxMenu* PopMenu, SCH_LINE* Bus, SCH_EDIT_FRAME* frame ); -static void AddMenusForHierchicalSheet( wxMenu* PopMenu, SCH_SHEET* Sheet ); -static void AddMenusForComponent( wxMenu* PopMenu, SCH_COMPONENT* Component, - SYMBOL_LIB_TABLE* aLibs ); - - -bool SCH_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu ) -{ - SCH_ITEM* item = GetScreen()->GetCurItem(); - wxString msg; - - // If a command is in progress: add "cancel" and "end tool" menu - if( GetToolId() != ID_NO_TOOL_SELECTED ) - { - switch( GetToolId() ) - { - case ID_BUS_BUTT: - AddMenusForBus( PopMenu, NULL, this ); - break; - - default: - break; - } - } - - switch( item->Type() ) - { - case SCH_COMPONENT_T: - AddMenusForComponent( PopMenu, (SCH_COMPONENT*) item, Prj().SchSymbolLibTable() ); - break; - - case SCH_LINE_T: - switch( item->GetLayer() ) - { - case LAYER_BUS: - AddMenusForBus( PopMenu, (SCH_LINE*) item, this ); - break; - } - break; - - case SCH_SHEET_T: - AddMenusForHierchicalSheet( PopMenu, (SCH_SHEET*) item ); - break; - } - - return true; -} - - void AddMenusForComponent( wxMenu* PopMenu, SCH_COMPONENT* Component, SYMBOL_LIB_TABLE* aLibs ) { wxString msg; @@ -168,10 +119,3 @@ void AddMenusForBus( wxMenu* PopMenu, SCH_LINE* Bus, SCH_EDIT_FRAME* frame ) } -void AddMenusForHierchicalSheet( wxMenu* PopMenu, SCH_SHEET* Sheet ) -{ - AddMenuItem( PopMenu, ID_POPUP_IMPORT_HLABEL_TO_SHEETPIN, _( "Import Sheet Pins" ), - KiBitmap( import_hierarchical_label_xpm ) ); -} - - diff --git a/eeschema/sch_edit_frame.h b/eeschema/sch_edit_frame.h index 4c5e1d6eee..80a9d5848d 100644 --- a/eeschema/sch_edit_frame.h +++ b/eeschema/sch_edit_frame.h @@ -371,7 +371,7 @@ public: void KiwayMailIn( KIWAY_EXPRESS& aEvent ) override; - bool OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu ) override; + bool OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu ) override { return true; } void OnSelectOptionToolbar( wxCommandEvent& event ); double BestZoom() override; diff --git a/eeschema/tools/sch_actions.h b/eeschema/tools/sch_actions.h index b1375812fb..044a15e0b8 100644 --- a/eeschema/tools/sch_actions.h +++ b/eeschema/tools/sch_actions.h @@ -118,6 +118,7 @@ public: static TOOL_ACTION editFootprint; static TOOL_ACTION autoplaceFields; static TOOL_ACTION convertDeMorgan; + static TOOL_ACTION editSymbolUnit; static TOOL_ACTION doDelete; static TOOL_ACTION addJunction; static TOOL_ACTION addLabel; diff --git a/eeschema/tools/sch_drawing_tool.cpp b/eeschema/tools/sch_drawing_tool.cpp index 29e1034eb9..ad1bb3df00 100644 --- a/eeschema/tools/sch_drawing_tool.cpp +++ b/eeschema/tools/sch_drawing_tool.cpp @@ -263,6 +263,8 @@ bool SCH_DRAWING_TOOL::Init() ctxMenu.AddItem( SCH_ACTIONS::finishWire, wireToolCondition && drawingSegmentsCondition, 1 ); ctxMenu.AddItem( SCH_ACTIONS::finishBus, busToolCondition && drawingSegmentsCondition, 1 ); ctxMenu.AddItem( SCH_ACTIONS::finishLine, lineToolCondition && drawingSegmentsCondition, 1 ); + // TODO(JE): add menu access to unfold bus... + ctxMenu.AddItem( SCH_ACTIONS::resizeSheet, sheetToolCondition && idleCondition, 1 ); ctxMenu.AddSeparator( idleBusOrLineToolCondition, 100 ); @@ -278,12 +280,15 @@ bool SCH_DRAWING_TOOL::Init() // CONDITIONAL_MENU& selToolMenu = m_selectionTool->GetToolMenu().GetMenu(); + // TODO(JE): add menu access to unfold bus on busSelectionCondition... + selToolMenu.AddItem( SCH_ACTIONS::resizeSheet, singleSheetCondition, 1 ); selToolMenu.AddItem( SCH_ACTIONS::addJunction, wireOrBusSelectionCondition, 100 ); selToolMenu.AddItem( SCH_ACTIONS::addLabel, wireOrBusSelectionCondition, 100 ); selToolMenu.AddItem( SCH_ACTIONS::addGlobalLabel, wireOrBusSelectionCondition, 100 ); selToolMenu.AddItem( SCH_ACTIONS::addHierLabel, wireOrBusSelectionCondition, 100 ); + selToolMenu.AddItem( SCH_ACTIONS::importSheetPin, singleSheetCondition, 100 ); return true; } diff --git a/eeschema/tools/sch_edit_tool.cpp b/eeschema/tools/sch_edit_tool.cpp index dd8b192ba9..eed3ee0710 100644 --- a/eeschema/tools/sch_edit_tool.cpp +++ b/eeschema/tools/sch_edit_tool.cpp @@ -352,6 +352,7 @@ bool SCH_EDIT_TOOL::Init() ctxMenu.AddItem( SCH_ACTIONS::editValue, singleComponentCondition ); ctxMenu.AddItem( SCH_ACTIONS::editFootprint, singleComponentCondition ); ctxMenu.AddItem( SCH_ACTIONS::convertDeMorgan, singleDeMorganSymbolCondition ); + // JEY TODO: add menu access for changing symbol unit ctxMenu.AddSeparator( SELECTION_CONDITIONS::NotEmpty ); ctxMenu.AddItem( SCH_ACTIONS::cut, SELECTION_CONDITIONS::NotEmpty ); @@ -375,6 +376,7 @@ bool SCH_EDIT_TOOL::Init() drawingMenu.AddItem( SCH_ACTIONS::editValue, singleComponentCondition, 200 ); drawingMenu.AddItem( SCH_ACTIONS::editFootprint, singleComponentCondition, 200 ); drawingMenu.AddItem( SCH_ACTIONS::convertDeMorgan, singleDeMorganSymbolCondition, 200 ); + // JEY TODO: add menu access for changing symbol unit drawingMenu.AddItem( SCH_ACTIONS::toShapeSlash, entryCondition, 200 ); drawingMenu.AddItem( SCH_ACTIONS::toShapeBackslash, entryCondition, 200 ); drawingMenu.AddItem( SCH_ACTIONS::toLabel, toLabelCondition, 200 ); @@ -405,6 +407,7 @@ bool SCH_EDIT_TOOL::Init() selToolMenu.AddItem( SCH_ACTIONS::editFootprint, singleSymbolCondition, 200 ); selToolMenu.AddItem( SCH_ACTIONS::autoplaceFields, singleComponentCondition, 200 ); selToolMenu.AddItem( SCH_ACTIONS::convertDeMorgan, singleDeMorganSymbolCondition, 200 ); + // JEY TODO: add menu access for changing symbol unit selToolMenu.AddItem( SCH_ACTIONS::showDatasheet, singleSymbolCondition, 200 ); selToolMenu.AddItem( SCH_ACTIONS::toShapeSlash, entryCondition, 200 ); selToolMenu.AddItem( SCH_ACTIONS::toShapeBackslash, entryCondition, 200 );