From c59bf4de5c07cc261530a001e7133e1a14d2e146 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 1 May 2023 08:33:29 +0300 Subject: [PATCH 37/37] Client: Skip internal actions when constructing "Goto and..." menu See osdn #47935 Signed-off-by: Marko Lindqvist --- client/gui-gtk-3.22/menu.c | 4 ++-- client/gui-gtk-4.0/menu.c | 4 ++-- client/gui-qt/menu.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/gui-gtk-3.22/menu.c b/client/gui-gtk-3.22/menu.c index f8ef5abc0e..d1e7a4d8d8 100644 --- a/client/gui-gtk-3.22/menu.c +++ b/client/gui-gtk-3.22/menu.c @@ -3070,7 +3070,7 @@ void real_menus_init(void) /* Add the new action entries grouped by target kind. */ for (tgt_kind_group = 0; tgt_kind_group < ATK_COUNT; tgt_kind_group++) { - action_iterate(act_id) { + action_noninternal_iterate(act_id) { struct action *paction = action_by_number(act_id); if (action_id_get_actor_kind(act_id) != AAK_UNIT) { @@ -3158,7 +3158,7 @@ void real_menus_init(void) gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); gtk_widget_show(item); - } action_iterate_end; + } action_noninternal_iterate_end; } } diff --git a/client/gui-gtk-4.0/menu.c b/client/gui-gtk-4.0/menu.c index 0cbf8160bd..4ad898acf2 100644 --- a/client/gui-gtk-4.0/menu.c +++ b/client/gui-gtk-4.0/menu.c @@ -3463,7 +3463,7 @@ void real_menus_update(void) j = 0; /* Add the new action entries grouped by target kind. */ for (tgt_kind_group = 0; tgt_kind_group < ATK_COUNT; tgt_kind_group++) { - action_iterate(act_id) { + action_noninternal_iterate(act_id) { struct action *paction = action_by_number(act_id); GSimpleAction *act; char actname[256]; @@ -3553,7 +3553,7 @@ void real_menus_update(void) G_CALLBACK(unit_goto_and_callback), paction); menu_item_append_unref(submenu, g_menu_item_new(name, actname)); } - } action_iterate_end; + } action_noninternal_iterate_end; } g_menu_remove(unit_menu, 1); g_menu_insert_submenu(unit_menu, 1, _("Go to a_nd..."), G_MENU_MODEL(submenu)); diff --git a/client/gui-qt/menu.cpp b/client/gui-qt/menu.cpp index ef3ac0a70c..a373fc77d0 100644 --- a/client/gui-qt/menu.cpp +++ b/client/gui-qt/menu.cpp @@ -729,7 +729,7 @@ void go_act_menu::create() // Group goto and perform action menu items by target kind. for (tgt_kind_group = 0; tgt_kind_group < ATK_COUNT; tgt_kind_group++) { - action_iterate(act_id) { + action_noninternal_iterate(act_id) { struct action *paction = action_by_number(act_id); QString action_name = (QString(action_name_translation(paction)) .replace("&", "&&")); @@ -819,7 +819,7 @@ void go_act_menu::create() QObject::connect(item, &QAction::triggered, [this,act_id]() { start_go_act(act_id, NO_TARGET); }); - } action_iterate_end; + } action_noninternal_iterate_end; } } -- 2.39.2