From 2fba0a4f61346e80df41ede5399701331e781809 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Tue, 27 Aug 2019 14:07:35 +0100
Subject: [PATCH] Register COMMON_CONTROL for help menu actions.

Fixes: lp:1841560
* https://bugs.launchpad.net/kicad/+bug/1841560
---
 eeschema/viewlib_frame.cpp        |  7 +++----
 pcbnew/footprint_viewer_frame.cpp | 10 ++++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/eeschema/viewlib_frame.cpp b/eeschema/viewlib_frame.cpp
index 2b10c9ca0a..6037eab5fa 100644
--- a/eeschema/viewlib_frame.cpp
+++ b/eeschema/viewlib_frame.cpp
@@ -26,14 +26,11 @@
 #include <fctsys.h>
 #include <kiface_i.h>
 #include <pgm_base.h>
-#include <sch_draw_panel.h>
 #include <sch_view.h>
 #include <msgpanel.h>
 #include <bitmaps.h>
 #include <eda_dockart.h>
-#include <sch_edit_frame.h>
 #include <eeschema_id.h>
-#include <general.h>
 #include <viewlib_frame.h>
 #include <symbol_lib_table.h>
 #include <dialog_helpers.h>
@@ -45,9 +42,10 @@
 #include <tool/tool_manager.h>
 #include <tool/action_toolbar.h>
 #include <tool/tool_dispatcher.h>
-#include <tools/ee_actions.h>
 #include <tool/common_tools.h>
+#include <tool/common_control.h>
 #include <tool/zoom_tool.h>
+#include <tools/ee_actions.h>
 #include <tools/lib_control.h>
 #include <tools/ee_inspection_tool.h>
 
@@ -223,6 +221,7 @@ void LIB_VIEW_FRAME::setupTools()
 
     // Register tools
     m_toolManager->RegisterTool( new COMMON_TOOLS );
+    m_toolManager->RegisterTool( new COMMON_CONTROL );
     m_toolManager->RegisterTool( new ZOOM_TOOL );
     m_toolManager->RegisterTool( new EE_INSPECTION_TOOL );  // manage show datasheet
     m_toolManager->RegisterTool( new EE_SELECTION_TOOL );   // manage context menu
diff --git a/pcbnew/footprint_viewer_frame.cpp b/pcbnew/footprint_viewer_frame.cpp
index f7000d58ec..f790fbb96e 100644
--- a/pcbnew/footprint_viewer_frame.cpp
+++ b/pcbnew/footprint_viewer_frame.cpp
@@ -47,10 +47,11 @@
 #include <tool/tool_dispatcher.h>
 #include <tool/action_toolbar.h>
 #include <tool/common_tools.h>
-#include "tools/selection_tool.h"
-#include "tools/pcbnew_control.h"
-#include "tools/pcb_actions.h"
-#include "board_commit.h"
+#include <tool/common_control.h>
+#include <tools/selection_tool.h>
+#include <tools/pcbnew_control.h>
+#include <tools/pcb_actions.h>
+#include <board_commit.h>
 #include <memory>
 #include <eda_pattern_match.h>
 #include <wx/tokenzr.h>
@@ -203,6 +204,7 @@ FOOTPRINT_VIEWER_FRAME::FOOTPRINT_VIEWER_FRAME( KIWAY* aKiway, wxWindow* aParent
     m_toolManager->RegisterTool( new PCBNEW_CONTROL );
     m_toolManager->RegisterTool( new SELECTION_TOOL );
     m_toolManager->RegisterTool( new COMMON_TOOLS );    // for std context menus (zoom & grid)
+    m_toolManager->RegisterTool( new COMMON_CONTROL );
     m_toolManager->InitTools();
     m_toolManager->InvokeTool( "pcbnew.InteractiveSelection" );