From 81e64fdeef2825ad261634156d358e62880bb5e2 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sat, 25 Mar 2023 10:49:10 +0200
Subject: [PATCH 39/39] gtk4: Add "Unsentry All On Tile" menu entry

See osdn #47688

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 client/gui-gtk-4.0/menu.c | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/client/gui-gtk-4.0/menu.c b/client/gui-gtk-4.0/menu.c
index ad87ae67db..bc9b6738c0 100644
--- a/client/gui-gtk-4.0/menu.c
+++ b/client/gui-gtk-4.0/menu.c
@@ -459,9 +459,11 @@ static void unit_convert_callback(GSimpleAction *action,
 static void unit_disband_callback(GSimpleAction *action,
                                   GVariant *parameter,
                                   gpointer data);
+static void unsentry_all_callback(GSimpleAction *action,
+                                  GVariant *parameter,
+                                  gpointer data);
 
 #ifdef MENUS_GTK3
-static void unit_unsentry_callback(GtkMenuItem *item, gpointer data);
 static void unit_unload_transporter_callback(GtkMenuItem *item,
                                              gpointer data);
 #endif /* MENUS_GTK3 */
@@ -742,6 +744,9 @@ static struct menu_entry_info menu_entries[] =
   { "UNIT_SENTRY", N_("_Sentry"),
     "sentry", "s", MGROUP_UNIT,
     NULL, FALSE },
+  { "UNSENTRY_ALL", N_("Uns_entry All On Tile"),
+    "unsentry_all", "<shift>s", MGROUP_UNIT,
+    NULL, FALSE },
   { "UNIT_BOARD", N_("_Load"),
     "board", "l", MGROUP_UNIT,
     NULL, FALSE },
@@ -1007,8 +1012,6 @@ static struct menu_entry_info menu_entries[] =
     GDK_CONTROL_MASK | GDK_SHIFT_MASK,
     G_CALLBACK(toggle_fog_callback), MGROUP_EDIT },
 
-  { "UNIT_UNSENTRY", N_("Uns_entry All On Tile"), GDK_KEY_s, GDK_SHIFT_MASK,
-    G_CALLBACK(unit_unsentry_callback), MGROUP_UNIT },
   { "UNIT_UNLOAD_TRANSPORTER", N_("U_nload All From Transporter"),
     GDK_KEY_t, GDK_SHIFT_MASK,
     G_CALLBACK(unit_unload_transporter_callback), MGROUP_UNIT },
@@ -1088,6 +1091,7 @@ const GActionEntry acts[] = {
   { "patrol", unit_patrol_callback },
   { "teleport", unit_teleport_callback },
   { "sentry", unit_sentry_callback },
+  { "unsentry_all", unsentry_all_callback },
   { "board", unit_board_callback },
   { "deboard", unit_deboard_callback },
   { "homecity", unit_homecity_callback },
@@ -2330,6 +2334,16 @@ static void unit_sentry_callback(GSimpleAction *action,
   key_unit_sentry();
 }
 
+/************************************************************************//**
+  Item "UNSENTRY_ALL" callback.
+****************************************************************************/
+static void unsentry_all_callback(GSimpleAction *action,
+                                  GVariant *parameter,
+                                  gpointer data)
+{
+  key_unit_wakeup_others();
+}
+
 /************************************************************************//**
   Action "FORTIFY" callback.
 ****************************************************************************/
@@ -2342,16 +2356,6 @@ static void fortify_callback(GSimpleAction *action,
   } unit_list_iterate_end;
 }
 
-#ifdef MENUS_GTK3
-/************************************************************************//**
-  Item "UNIT_UNSENTRY" callback.
-****************************************************************************/
-static void unit_unsentry_callback(GtkMenuItem *item, gpointer data)
-{
-  key_unit_wakeup_others();
-}
-#endif /* MENUS_GTK3 */
-
 /************************************************************************//**
   Item "UNIT_BOARD" callback.
 ****************************************************************************/
@@ -3124,6 +3128,7 @@ static GMenu *setup_menus(GtkApplication *app)
   menu_entry_init(unit_menu, "UNIT_PATROL");
   menu_entry_init(unit_menu, "UNIT_TELEPORT");
   menu_entry_init(unit_menu, "UNIT_SENTRY");
+  menu_entry_init(unit_menu, "UNSENTRY_ALL");
   menu_entry_init(unit_menu, "UNIT_BOARD");
   menu_entry_init(unit_menu, "UNIT_DEBOARD");
   menu_entry_init(unit_menu, "UNIT_HOMECITY");
@@ -3940,6 +3945,9 @@ void real_menus_update(void)
                            can_units_do_base_gui(punits, BASE_GUI_AIRBASE));
   menu_entry_set_sensitive(map, "UNIT_SENTRY",
                            can_units_do_activity(punits, ACTIVITY_SENTRY));
+  menu_entry_set_sensitive(map, "UNSENTRY_ALL",
+                           units_have_activity_on_tile(punits,
+                                                       ACTIVITY_SENTRY));
   menu_entry_set_sensitive(map, "UNIT_HOMECITY",
                            can_units_do(punits, can_unit_change_homecity));
   menu_entry_set_sensitive(map, "UNIT_UPGRADE", units_can_upgrade(punits));
@@ -3961,9 +3969,6 @@ void real_menus_update(void)
   /* "UNIT_CONVERT" dealt with below */
   menu_entry_set_sensitive("UNIT_UNLOAD_TRANSPORTER",
                            units_are_occupied(punits));
-  menu_entry_set_sensitive("UNIT_UNSENTRY",
-                           units_have_activity_on_tile(punits,
-                                                       ACTIVITY_SENTRY));
 #endif /* MENUS_GTK3 */
 
   proad = road_by_gui_type(ROAD_GUI_ROAD);
-- 
2.39.2