From 5bdb111ad51dc179863556c40f1072658c4e13ed Mon Sep 17 00:00:00 2001 From: Dino Date: Tue, 29 Jul 2025 23:44:21 -0400 Subject: [PATCH] #1637 gtks: terrain extras help, don't show "Bonus" for non-roads --- client/gui-gtk-3.22/helpdlg.c | 5 ++++- client/gui-gtk-4.0/helpdlg.c | 5 ++++- client/gui-gtk-5.0/helpdlg.c | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/client/gui-gtk-3.22/helpdlg.c b/client/gui-gtk-3.22/helpdlg.c index 7e47cb6e66..7a1fcf6477 100644 --- a/client/gui-gtk-3.22/helpdlg.c +++ b/client/gui-gtk-3.22/helpdlg.c @@ -1464,8 +1464,11 @@ static void help_update_extra(const struct help_item *pitem, char *title) bonus = Q_("?bonus:None"); } gtk_label_set_text(GTK_LABEL(help_elabel[5]), bonus); + gtk_widget_set_visible(GTK_WIDGET(help_elabel[4]), TRUE); + gtk_widget_set_visible(GTK_WIDGET(help_elabel[5]), TRUE); } else { - gtk_label_set_text(GTK_LABEL(help_elabel[5]), Q_("?bonus:None")); + gtk_widget_set_visible(GTK_WIDGET(help_elabel[4]), FALSE); + gtk_widget_set_visible(GTK_WIDGET(help_elabel[5]), FALSE); } helptext_extra(buf, sizeof(buf), client.conn.playing, pitem->text, pextra); diff --git a/client/gui-gtk-4.0/helpdlg.c b/client/gui-gtk-4.0/helpdlg.c index 0edc4ad882..4eb33776a5 100644 --- a/client/gui-gtk-4.0/helpdlg.c +++ b/client/gui-gtk-4.0/helpdlg.c @@ -1511,8 +1511,11 @@ static void help_update_extra(const struct help_item *pitem, char *title) } } gtk_label_set_text(GTK_LABEL(help_elabel[5]), bonus); + gtk_widget_set_visible(GTK_WIDGET(help_elabel[4]), TRUE); + gtk_widget_set_visible(GTK_WIDGET(help_elabel[5]), TRUE); } else { - gtk_label_set_text(GTK_LABEL(help_elabel[5]), Q_("?bonus:None")); + gtk_widget_set_visible(GTK_WIDGET(help_elabel[4]), FALSE); + gtk_widget_set_visible(GTK_WIDGET(help_elabel[5]), FALSE); } helptext_extra(buf, sizeof(buf), client.conn.playing, pitem->text, pextra); diff --git a/client/gui-gtk-5.0/helpdlg.c b/client/gui-gtk-5.0/helpdlg.c index 942535ce7d..a68e8a8eba 100644 --- a/client/gui-gtk-5.0/helpdlg.c +++ b/client/gui-gtk-5.0/helpdlg.c @@ -1511,8 +1511,11 @@ static void help_update_extra(const struct help_item *pitem, char *title) } } gtk_label_set_text(GTK_LABEL(help_elabel[5]), bonus); + gtk_widget_set_visible(GTK_WIDGET(help_elabel[4]), TRUE); + gtk_widget_set_visible(GTK_WIDGET(help_elabel[5]), TRUE); } else { - gtk_label_set_text(GTK_LABEL(help_elabel[5]), Q_("?bonus:None")); + gtk_widget_set_visible(GTK_WIDGET(help_elabel[4]), FALSE); + gtk_widget_set_visible(GTK_WIDGET(help_elabel[5]), FALSE); } helptext_extra(buf, sizeof(buf), client.conn.playing, pitem->text, pextra); -- 2.31.0