From 9f7e0ef8e8daa4c1d3e7d566da18e1fd5b6e92f6 Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Tue, 4 Feb 2020 04:39:26 -0600 Subject: [PATCH] eeschema: Remove Bus-Bus and Place sheet pin buttons Cleaning toolbars of functions that are superfluous or do not match well to the user workflow. --- eeschema/menubar.cpp | 2 -- eeschema/toolbars_sch_editor.cpp | 4 ---- eeschema/tools/ee_selection_tool.cpp | 1 - eeschema/tools/sch_drawing_tools.cpp | 2 -- 4 files changed, 9 deletions(-) diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index bf34059869..49cca1e561 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -218,7 +218,6 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() placeMenu->AddItem( EE_ACTIONS::drawWire, EE_CONDITIONS::ShowAlways ); placeMenu->AddItem( EE_ACTIONS::drawBus, EE_CONDITIONS::ShowAlways ); placeMenu->AddItem( EE_ACTIONS::placeBusWireEntry, EE_CONDITIONS::ShowAlways ); - placeMenu->AddItem( EE_ACTIONS::placeBusBusEntry, EE_CONDITIONS::ShowAlways ); placeMenu->AddItem( EE_ACTIONS::placeNoConnect, EE_CONDITIONS::ShowAlways ); placeMenu->AddItem( EE_ACTIONS::placeJunction, EE_CONDITIONS::ShowAlways ); placeMenu->AddItem( EE_ACTIONS::placeLabel, EE_CONDITIONS::ShowAlways ); @@ -228,7 +227,6 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() placeMenu->AddItem( EE_ACTIONS::placeHierLabel, EE_CONDITIONS::ShowAlways ); placeMenu->AddItem( EE_ACTIONS::drawSheet, EE_CONDITIONS::ShowAlways ); placeMenu->AddItem( EE_ACTIONS::importSheetPin, EE_CONDITIONS::ShowAlways ); - placeMenu->AddItem( EE_ACTIONS::placeSheetPin, EE_CONDITIONS::ShowAlways ); placeMenu->AddSeparator(); placeMenu->AddItem( EE_ACTIONS::drawLines, EE_CONDITIONS::ShowAlways ); diff --git a/eeschema/toolbars_sch_editor.cpp b/eeschema/toolbars_sch_editor.cpp index 016cf3077a..92d9a4bf12 100644 --- a/eeschema/toolbars_sch_editor.cpp +++ b/eeschema/toolbars_sch_editor.cpp @@ -123,7 +123,6 @@ void SCH_EDIT_FRAME::ReCreateVToolbar() m_drawToolBar->Add( EE_ACTIONS::drawWire, ACTION_TOOLBAR::TOGGLE ); m_drawToolBar->Add( EE_ACTIONS::drawBus, ACTION_TOOLBAR::TOGGLE ); m_drawToolBar->Add( EE_ACTIONS::placeBusWireEntry, ACTION_TOOLBAR::TOGGLE ); - m_drawToolBar->Add( EE_ACTIONS::placeBusBusEntry, ACTION_TOOLBAR::TOGGLE ); m_drawToolBar->Add( EE_ACTIONS::placeNoConnect, ACTION_TOOLBAR::TOGGLE ); m_drawToolBar->Add( EE_ACTIONS::placeJunction, ACTION_TOOLBAR::TOGGLE ); m_drawToolBar->Add( EE_ACTIONS::placeLabel, ACTION_TOOLBAR::TOGGLE ); @@ -131,7 +130,6 @@ void SCH_EDIT_FRAME::ReCreateVToolbar() m_drawToolBar->Add( EE_ACTIONS::placeHierLabel, ACTION_TOOLBAR::TOGGLE ); m_drawToolBar->Add( EE_ACTIONS::drawSheet, ACTION_TOOLBAR::TOGGLE ); m_drawToolBar->Add( EE_ACTIONS::importSheetPin, ACTION_TOOLBAR::TOGGLE ); - m_drawToolBar->Add( EE_ACTIONS::placeSheetPin, ACTION_TOOLBAR::TOGGLE ); KiScaledSeparator( m_drawToolBar, this ); m_drawToolBar->Add( EE_ACTIONS::drawLines, ACTION_TOOLBAR::TOGGLE ); @@ -192,7 +190,6 @@ void SCH_EDIT_FRAME::SyncToolbars() TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::drawWire ); TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::drawBus ); TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::placeBusWireEntry ); - TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::placeBusBusEntry ); TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::placeNoConnect ); TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::placeJunction ); TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::placeLabel ); @@ -200,7 +197,6 @@ void SCH_EDIT_FRAME::SyncToolbars() TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::placeHierLabel ); TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::drawSheet ); TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::importSheetPin ); - TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::placeSheetPin ); TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::drawLines ); TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::placeSchematicText ); TOGGLE_TOOL( m_drawToolBar, EE_ACTIONS::placeImage ); diff --git a/eeschema/tools/ee_selection_tool.cpp b/eeschema/tools/ee_selection_tool.cpp index d7df16a5fa..0a526515b7 100644 --- a/eeschema/tools/ee_selection_tool.cpp +++ b/eeschema/tools/ee_selection_tool.cpp @@ -200,7 +200,6 @@ bool EE_SELECTION_TOOL::Init() menu.AddItem( EE_ACTIONS::placeHierLabel, wireOrBusSelection && EE_CONDITIONS::Idle, 250 ); menu.AddItem( EE_ACTIONS::breakWire, wireSelection && EE_CONDITIONS::Idle, 250 ); menu.AddItem( EE_ACTIONS::breakBus, busSelection && EE_CONDITIONS::Idle, 250 ); - menu.AddItem( EE_ACTIONS::placeSheetPin, sheetSelection && EE_CONDITIONS::Idle, 250 ); menu.AddItem( EE_ACTIONS::importSheetPin, sheetSelection && EE_CONDITIONS::Idle, 250 ); menu.AddSeparator( 400 ); diff --git a/eeschema/tools/sch_drawing_tools.cpp b/eeschema/tools/sch_drawing_tools.cpp index a7d2a18369..f76d58e398 100644 --- a/eeschema/tools/sch_drawing_tools.cpp +++ b/eeschema/tools/sch_drawing_tools.cpp @@ -911,12 +911,10 @@ void SCH_DRAWING_TOOLS::setTransitions() Go( &SCH_DRAWING_TOOLS::SingleClickPlace, EE_ACTIONS::placeNoConnect.MakeEvent() ); Go( &SCH_DRAWING_TOOLS::SingleClickPlace, EE_ACTIONS::placeJunction.MakeEvent() ); Go( &SCH_DRAWING_TOOLS::SingleClickPlace, EE_ACTIONS::placeBusWireEntry.MakeEvent() ); - Go( &SCH_DRAWING_TOOLS::SingleClickPlace, EE_ACTIONS::placeBusBusEntry.MakeEvent() ); Go( &SCH_DRAWING_TOOLS::TwoClickPlace, EE_ACTIONS::placeLabel.MakeEvent() ); Go( &SCH_DRAWING_TOOLS::TwoClickPlace, EE_ACTIONS::placeHierLabel.MakeEvent() ); Go( &SCH_DRAWING_TOOLS::TwoClickPlace, EE_ACTIONS::placeGlobalLabel.MakeEvent() ); Go( &SCH_DRAWING_TOOLS::DrawSheet, EE_ACTIONS::drawSheet.MakeEvent() ); - Go( &SCH_DRAWING_TOOLS::TwoClickPlace, EE_ACTIONS::placeSheetPin.MakeEvent() ); Go( &SCH_DRAWING_TOOLS::TwoClickPlace, EE_ACTIONS::importSheetPin.MakeEvent() ); Go( &SCH_DRAWING_TOOLS::TwoClickPlace, EE_ACTIONS::placeSchematicText.MakeEvent() ); Go( &SCH_DRAWING_TOOLS::PlaceImage, EE_ACTIONS::placeImage.MakeEvent() );