From 83d8e539050bf7d8ff7d7f9ce33182d262ae803e Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 24 Sep 2023 11:34:23 +0300 Subject: [PATCH 22/22] gtk3(.22): Make toplevel window title to tell gui type See osdn #48600 Signed-off-by: Marko Lindqvist --- client/gui-gtk-3.0/gui_main.c | 7 +++++-- client/gui-gtk-3.0/gui_main.h | 3 +++ client/gui-gtk-3.22/gui_main.c | 7 +++++-- client/gui-gtk-3.22/gui_main.h | 3 +++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/client/gui-gtk-3.0/gui_main.c b/client/gui-gtk-3.0/gui_main.c index 59973d228c..ce1959f374 100644 --- a/client/gui-gtk-3.0/gui_main.c +++ b/client/gui-gtk-3.0/gui_main.c @@ -101,7 +101,7 @@ #include "gui_main.h" -const char *client_string = "gui-gtk-3.0"; +const char *client_string = GUI_NAME_FULL; GtkWidget *map_canvas; /* GtkDrawingArea */ GtkWidget *map_horizontal_scrollbar; @@ -1704,6 +1704,8 @@ int ui_main(int argc, char **argv) guint sig; if (parse_options(argc, argv)) { + char window_name[1024]; + /* The locale has already been set in init_nls() and the windows-specific * locale logic in gtk_init() causes problems with zh_CN (see PR#39475) */ gtk_disable_setlocale(); @@ -1753,7 +1755,8 @@ int ui_main(int argc, char **argv) gtk_window_fullscreen(GTK_WINDOW(toplevel)); } - gtk_window_set_title(GTK_WINDOW (toplevel), _("Freeciv")); + fc_snprintf(window_name, sizeof(window_name), _("Freeciv (%s)"), GUI_NAME_SHORT); + gtk_window_set_title(GTK_WINDOW(toplevel), window_name); g_signal_connect(toplevel, "delete_event", G_CALLBACK(quit_dialog_callback), NULL); diff --git a/client/gui-gtk-3.0/gui_main.h b/client/gui-gtk-3.0/gui_main.h index 7288fafb04..d9fc40f370 100644 --- a/client/gui-gtk-3.0/gui_main.h +++ b/client/gui-gtk-3.0/gui_main.h @@ -19,6 +19,9 @@ #include "gui_main_g.h" #include "options.h" +#define GUI_NAME_FULL "gui-gtk-3.0" +#define GUI_NAME_SHORT "gtk3" + #define GUI_GTK_OPTION(optname) gui_options.gui_gtk3_##optname #define GUI_GTK_OPTION_STR(optname) "gui_gtk3_" #optname #define GUI_GTK_DEFAULT_THEME_NAME FC_GTK3_DEFAULT_THEME_NAME diff --git a/client/gui-gtk-3.22/gui_main.c b/client/gui-gtk-3.22/gui_main.c index c63512a182..6d053f86fb 100644 --- a/client/gui-gtk-3.22/gui_main.c +++ b/client/gui-gtk-3.22/gui_main.c @@ -101,7 +101,7 @@ #include "gui_main.h" -const char *client_string = "gui-gtk-3.22"; +const char *client_string = GUI_NAME_FULL; GtkWidget *map_canvas; /* GtkDrawingArea */ GtkWidget *map_horizontal_scrollbar; @@ -1857,6 +1857,8 @@ int ui_main(int argc, char **argv) guint sig; if (parse_options(argc, argv)) { + char window_name[1024]; + /* The locale has already been set in init_nls() and the windows-specific * locale logic in gtk_init() causes problems with zh_CN (see PR#39475) */ gtk_disable_setlocale(); @@ -1910,7 +1912,8 @@ int ui_main(int argc, char **argv) gtk_window_fullscreen(GTK_WINDOW(toplevel)); } - gtk_window_set_title(GTK_WINDOW (toplevel), _("Freeciv")); + fc_snprintf(window_name, sizeof(window_name), _("Freeciv (%s)"), GUI_NAME_SHORT); + gtk_window_set_title(GTK_WINDOW(toplevel), window_name); g_signal_connect(toplevel, "delete_event", G_CALLBACK(quit_dialog_callback), NULL); diff --git a/client/gui-gtk-3.22/gui_main.h b/client/gui-gtk-3.22/gui_main.h index c28adeea87..b958ab5851 100644 --- a/client/gui-gtk-3.22/gui_main.h +++ b/client/gui-gtk-3.22/gui_main.h @@ -19,6 +19,9 @@ #include "gui_main_g.h" #include "options.h" +#define GUI_NAME_FULL "gui-gtk-3.22" +#define GUI_NAME_SHORT "gtk3.22" + #define GUI_GTK_OPTION(optname) gui_options.gui_gtk3_22_##optname #define GUI_GTK_OPTION_STR(optname) "gui_gtk3_22_" #optname #define GUI_GTK_DEFAULT_THEME_NAME FC_GTK3_22_DEFAULT_THEME_NAME -- 2.40.1