From dba2afb0ac6937f6fe0f7b5bbceffe85ac0e6494 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 28 Sep 2023 04:38:32 +0300 Subject: [PATCH 52/52] gtk3.22: Add "About Current Musicset" menu entry See osdn #48598 Signed-off-by: Marko Lindqvist --- client/gui-gtk-3.22/helpdlg.c | 4 ++-- client/gui-gtk-3.22/menu.c | 11 +++++++++++ data/gtk3.22_menus.xml | 3 +++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/client/gui-gtk-3.22/helpdlg.c b/client/gui-gtk-3.22/helpdlg.c index 67b3623233..ca0deb946c 100644 --- a/client/gui-gtk-3.22/helpdlg.c +++ b/client/gui-gtk-3.22/helpdlg.c @@ -782,8 +782,8 @@ static void create_help_dialog(void) gtk_widget_show(help_tree); gtk_container_add(GTK_CONTAINER(help_box), help_tree_sw); - help_tree_expand = - gtk_button_new_with_label(_("Expand All")); + help_tree_expand + = gtk_button_new_with_label(_("Expand All")); help_tree_collapse = gtk_button_new_with_label(_("Collapse All")); g_signal_connect(help_tree_expand, "clicked", diff --git a/client/gui-gtk-3.22/menu.c b/client/gui-gtk-3.22/menu.c index b490bd235d..a1a2e11cb9 100644 --- a/client/gui-gtk-3.22/menu.c +++ b/client/gui-gtk-3.22/menu.c @@ -156,6 +156,7 @@ static void help_tech_callback(GtkMenuItem *item, gpointer data); static void help_space_race_callback(GtkMenuItem *item, gpointer data); static void help_ruleset_callback(GtkMenuItem *item, gpointer data); static void help_tileset_callback(GtkMenuItem *item, gpointer data); +static void help_musicset_callback(GtkMenuItem *item, gpointer data); static void help_nations_callback(GtkMenuItem *item, gpointer data); static void help_connecting_callback(GtkMenuItem *item, gpointer data); static void help_controls_callback(GtkMenuItem *item, gpointer data); @@ -405,6 +406,8 @@ static struct menu_entry_info menu_entries[] = G_CALLBACK(help_ruleset_callback), MGROUP_SAFE }, { "HELP_TILESET", N_("About Current Tileset"), 0, 0, G_CALLBACK(help_tileset_callback), MGROUP_SAFE }, + { "HELP_MUSICSET", N_("About Current Musicset"), 0, 0, + G_CALLBACK(help_musicset_callback), MGROUP_SAFE }, { "HELP_NATIONS", N_("About Nations"), 0, 0, G_CALLBACK(help_nations_callback), MGROUP_SAFE }, { "HELP_CONNECTING", N_("Connecting"), 0, 0, @@ -1012,6 +1015,14 @@ static void help_tileset_callback(GtkMenuItem *item, gpointer data) popup_help_dialog_string(HELP_TILESET_ITEM); } +/************************************************************************//** + Item "HELP_MUSICSET" callback. +****************************************************************************/ +static void help_musicset_callback(GtkMenuItem *item, gpointer data) +{ + popup_help_dialog_string(HELP_MUSICSET_ITEM); +} + /************************************************************************//** Item "HELP_ECONOMY" callback. ****************************************************************************/ diff --git a/data/gtk3.22_menus.xml b/data/gtk3.22_menus.xml index 50deb080e6..3fca3ba009 100644 --- a/data/gtk3.22_menus.xml +++ b/data/gtk3.22_menus.xml @@ -599,6 +599,9 @@ + + + -- 2.40.1