From e543bd7c22654847d5e9d5a60ed37441d9ee6617 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 22 Jan 2023 08:21:21 +0200 Subject: [PATCH 48/48] gtk3.22: Correct battle groups key bindings See osdn #46588 Signed-off-by: Marko Lindqvist --- client/gui-gtk-3.22/menu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/client/gui-gtk-3.22/menu.c b/client/gui-gtk-3.22/menu.c index cb60a0aa0d..af3c46fecc 100644 --- a/client/gui-gtk-3.22/menu.c +++ b/client/gui-gtk-3.22/menu.c @@ -340,31 +340,31 @@ static struct menu_entry_info menu_entries[] = GDK_KEY_F1, GDK_SHIFT_MASK | GDK_CONTROL_MASK, G_CALLBACK(bg_append0_callback), MGROUP_SAFE }, { "BATTLE_GROUP_SELECT_1", N_("Select Battle Group 2"), - GDK_KEY_F1, GDK_SHIFT_MASK, + GDK_KEY_F2, GDK_SHIFT_MASK, G_CALLBACK(bg_select1_callback), MGROUP_SAFE }, { "BATTLE_GROUP_ASSIGN_1", N_("Assign Battle Group 2"), - GDK_KEY_F1, GDK_CONTROL_MASK, + GDK_KEY_F2, GDK_CONTROL_MASK, G_CALLBACK(bg_assign1_callback), MGROUP_SAFE }, { "BATTLE_GROUP_APPEND_1", N_("Append to Battle Group 2"), - GDK_KEY_F1, GDK_SHIFT_MASK | GDK_CONTROL_MASK, + GDK_KEY_F2, GDK_SHIFT_MASK | GDK_CONTROL_MASK, G_CALLBACK(bg_append1_callback), MGROUP_SAFE }, { "BATTLE_GROUP_SELECT_2", N_("Select Battle Group 3"), - GDK_KEY_F1, GDK_SHIFT_MASK, + GDK_KEY_F3, GDK_SHIFT_MASK, G_CALLBACK(bg_select2_callback), MGROUP_SAFE }, { "BATTLE_GROUP_ASSIGN_2", N_("Assign Battle Group 3"), - GDK_KEY_F1, GDK_CONTROL_MASK, + GDK_KEY_F3, GDK_CONTROL_MASK, G_CALLBACK(bg_assign2_callback), MGROUP_SAFE }, { "BATTLE_GROUP_APPEND_2", N_("Append to Battle Group 3"), - GDK_KEY_F1, GDK_SHIFT_MASK | GDK_CONTROL_MASK, + GDK_KEY_F3, GDK_SHIFT_MASK | GDK_CONTROL_MASK, G_CALLBACK(bg_append2_callback), MGROUP_SAFE }, { "BATTLE_GROUP_SELECT_3", N_("Select Battle Group 4"), - GDK_KEY_F1, GDK_SHIFT_MASK, + GDK_KEY_F4, GDK_SHIFT_MASK, G_CALLBACK(bg_select3_callback), MGROUP_SAFE }, { "BATTLE_GROUP_ASSIGN_3", N_("Assign Battle Group 4"), - GDK_KEY_F1, GDK_CONTROL_MASK, + GDK_KEY_F4, GDK_CONTROL_MASK, G_CALLBACK(bg_assign3_callback), MGROUP_SAFE }, { "BATTLE_GROUP_APPEND_3", N_("Append to Battle Group 4"), - GDK_KEY_F1, GDK_SHIFT_MASK | GDK_CONTROL_MASK, + GDK_KEY_F4, GDK_SHIFT_MASK | GDK_CONTROL_MASK, G_CALLBACK(bg_append3_callback), MGROUP_SAFE }, { "HELP_OVERVIEW", N_("?help:Overview"), 0, 0, -- 2.39.0