From 05419bca470420f7036c01226feb0e5402bc6f9c Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 2 Sep 2023 23:29:39 +0300 Subject: [PATCH 10/10] gtk4: Make toplevel window title to tell gui type See osdn #48569 Signed-off-by: Marko Lindqvist --- client/gui-gtk-4.0/gui_main.c | 6 ++++-- client/gui-gtk-4.0/gui_main.h | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/client/gui-gtk-4.0/gui_main.c b/client/gui-gtk-4.0/gui_main.c index 99b73957d0..07cc24abc8 100644 --- a/client/gui-gtk-4.0/gui_main.c +++ b/client/gui-gtk-4.0/gui_main.c @@ -101,7 +101,7 @@ #include "gui_main.h" -const char *client_string = "gui-gtk-4.0"; +const char *client_string = GUI_NAME_FULL; GtkWidget *map_canvas; /* GtkDrawingArea */ GtkWidget *map_horizontal_scrollbar; @@ -1892,6 +1892,7 @@ static void activate_gui(GtkApplication *app, gpointer data) { PangoFontDescription *toplevel_font_name; guint sig; + char window_name[1024]; toplevel = gtk_application_window_new(app); if (vmode.width > 0 && vmode.height > 0) { @@ -1935,7 +1936,8 @@ static void activate_gui(GtkApplication *app, gpointer data) 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, "close-request", G_CALLBACK(quit_dialog_callback), NULL); diff --git a/client/gui-gtk-4.0/gui_main.h b/client/gui-gtk-4.0/gui_main.h index 1f094f0fed..51f3e47441 100644 --- a/client/gui-gtk-4.0/gui_main.h +++ b/client/gui-gtk-4.0/gui_main.h @@ -19,6 +19,9 @@ #include "gui_main_g.h" #include "options.h" +#define GUI_NAME_FULL "gui-gtk-4.0" +#define GUI_NAME_SHORT "gtk4" + #define GUI_GTK_OPTION(optname) gui_options.gui_gtk4_##optname #define GUI_GTK_OPTION_STR(optname) "gui_gtk4_" #optname #define GUI_GTK_DEFAULT_THEME_NAME FC_GTK4_DEFAULT_THEME_NAME -- 2.40.1