Fix invoking SC_NUKE from the unit control bar

It's better to route everything routed through the shortcuts handling code.

Closes #1650.

(cherry picked from commit 0906331)

client/hudwidget.cpp

@@ -22,6 +22,7 @@
 #include "movement.h"
 #include "nation.h"
 #include "research.h"
+#include "shortcuts.h"
 #include "tile.h"
 #include "tilespec.h"
 #include "unit.h"
@@ -897,7 +898,8 @@ void hud_action::mouse_right_clicked() {}
  */
 void hud_action::mouse_clicked()
 {
-  king()->menu_bar->execute_shortcut(action_shortcut);
+  // Only works if there's an action in the menu!
+  fc_shortcuts::sc()->invoke(action_shortcut, nullptr);
 }
 
 /**

client/menu.cpp

@@ -1288,30 +1288,6 @@ void mr_menu::set_tile_for_order(tile *ptile)
   }
 }
 
-/**
-   Finds QAction bounded to given shortcut and triggers it
- */
-void mr_menu::execute_shortcut(int sid)
-{
-  if (sid == SC_GOTO) {
-    queen()->mapview_wdg->menu_click = true;
-    slot_unit_goto();
-    return;
-  }
-
-  auto fcs = fc_shortcuts::sc()->get_shortcut(static_cast<shortcut_id>(sid));
-  auto menu_list = findChildren<QMenu *>();
-  for (const QMenu *m : qAsConst(menu_list)) {
-    QList<QAction *> actions = m->actions();
-    for (QAction *a : qAsConst(actions)) {
-      if (a->shortcut() == fcs.keys && a->isEnabled()) {
-        a->activate(QAction::Trigger);
-        return;
-      }
-    }
-  }
-}
-
 /**
    Returns string assigned to shortcut or empty string if doesnt exist
  */

client/menu.h

@@ -182,7 +182,6 @@ class mr_menu : public QMenuBar {
   void update_roads_menu();
   void update_bases_menu();
   void set_tile_for_order(struct tile *ptile);
-  void execute_shortcut(int sid);
   bool shortcut_exists(const fc_shortcut &fcs, QString &where);
   QString shortcut_2_menustring(int sid);
   QAction *minimap_status = nullptr;

client/shortcuts.cpp

@@ -279,6 +279,20 @@ void fc_shortcuts::create_no_action_shortcuts(map_view *parent)
   }
 }
 
+/**
+ * Invokes the action for a shortcut.
+ */
+void fc_shortcuts::invoke(shortcut_id id, map_view *mapview)
+{
+  if (m_actions.count(id) > 0 && m_actions[id] != nullptr) {
+    m_actions[id]->trigger();
+  } else if (mapview) {
+    // Shortcuts with no action are handled by the mapview directly.
+    // Eventually we should create actions and add them to menus...
+    mapview->shortcut_pressed(id);
+  }
+}
+
 /**
  * If the mouse event corresponds to a registered shortcut, fire the
  * corresponding action.
@@ -292,14 +306,7 @@ void fc_shortcuts::maybe_route_mouse_shortcut(QMouseEvent *event,
   for (const auto &[id, shortcut] : shortcuts()) {
     if (shortcut.type == fc_shortcut::mouse && shortcut.buttons == buttons
         && shortcut.modifiers == modifiers) {
-      // Found a matching shortcut
-      if (m_actions.count(id) > 0 && m_actions[id] != nullptr) {
-        m_actions[id]->trigger();
-      } else {
-        // Shortcuts with no action are handled by the mapview directly.
-        // Eventually we should create actions and add them to menus...
-        mapview->shortcut_pressed(id);
-      }
+      invoke(id, mapview);
     }
   }
 }

client/shortcuts.h

@@ -142,6 +142,7 @@ class fc_shortcuts : public QObject {
 
   void link_action(shortcut_id id, QAction *action);
   void create_no_action_shortcuts(map_view *parent);
+  void invoke(shortcut_id id, map_view *mapview);
   void maybe_route_mouse_shortcut(QMouseEvent *event, map_view *mapview);
 
   static fc_shortcuts *sc();