From 31d353216e569ef9f93c6d5ebc27b351765da140 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 18 Oct 2023 03:47:09 +0300 Subject: [PATCH 32/32] gtk4x: Replace gtk4 references with gtk4x/gtk5 See osdn #48864 Signed-off-by: Marko Lindqvist --- client/gui-gtk-5.0/action_dialog.c | 2 +- client/gui-gtk-5.0/canvas.c | 2 +- client/gui-gtk-5.0/chatline.c | 2 +- client/gui-gtk-5.0/choice_dialog.c | 2 +- client/gui-gtk-5.0/citizensinfo.c | 2 +- client/gui-gtk-5.0/citydlg.c | 10 +++++----- client/gui-gtk-5.0/cityrep.c | 2 +- client/gui-gtk-5.0/cma_fe.c | 2 +- client/gui-gtk-5.0/colors.c | 2 +- client/gui-gtk-5.0/connectdlg.c | 2 +- client/gui-gtk-5.0/dialogs.c | 2 +- client/gui-gtk-5.0/diplodlg.c | 2 +- client/gui-gtk-5.0/editgui.c | 2 +- client/gui-gtk-5.0/editprop.c | 2 +- client/gui-gtk-5.0/finddlg.c | 2 +- client/gui-gtk-5.0/gamedlgs.c | 2 +- client/gui-gtk-5.0/gotodlg.c | 2 +- client/gui-gtk-5.0/graphics.c | 4 ++-- client/gui-gtk-5.0/graphics.h | 2 +- client/gui-gtk-5.0/gui_main.c | 18 +++++++++--------- client/gui-gtk-5.0/gui_main.h | 10 +++++----- client/gui-gtk-5.0/gui_stuff.c | 2 +- client/gui-gtk-5.0/happiness.c | 2 +- client/gui-gtk-5.0/happiness.h | 2 +- client/gui-gtk-5.0/helpdlg.c | 2 +- client/gui-gtk-5.0/infradlg.c | 2 +- client/gui-gtk-5.0/inputdlg.c | 2 +- client/gui-gtk-5.0/inteldlg.c | 2 +- client/gui-gtk-5.0/luaconsole.c | 2 +- client/gui-gtk-5.0/mapctrl.c | 2 +- client/gui-gtk-5.0/mapview.c | 2 +- client/gui-gtk-5.0/mapview.h | 2 +- client/gui-gtk-5.0/menu.c | 2 +- client/gui-gtk-5.0/messagedlg.c | 2 +- client/gui-gtk-5.0/messagewin.c | 2 +- client/gui-gtk-5.0/optiondlg.c | 2 +- client/gui-gtk-5.0/pages.c | 2 +- client/gui-gtk-5.0/plrdlg.c | 2 +- client/gui-gtk-5.0/rallypointdlg.c | 2 +- client/gui-gtk-5.0/repodlgs.c | 2 +- client/gui-gtk-5.0/soundset_dlg.c | 2 +- client/gui-gtk-5.0/spaceshipdlg.c | 2 +- client/gui-gtk-5.0/sprite.c | 2 +- client/gui-gtk-5.0/theme_dlg.c | 4 ++-- client/gui-gtk-5.0/themes.c | 10 +++++----- client/gui-gtk-5.0/tileset_dlg.c | 2 +- client/gui-gtk-5.0/transportdlg.c | 2 +- client/gui-gtk-5.0/unitselect.c | 2 +- client/gui-gtk-5.0/unitselextradlg.c | 2 +- client/gui-gtk-5.0/unitselunitdlg.c | 2 +- client/gui-gtk-5.0/voteinfo_bar.c | 2 +- client/gui-gtk-5.0/wldlg.c | 2 +- 52 files changed, 74 insertions(+), 74 deletions(-) diff --git a/client/gui-gtk-5.0/action_dialog.c b/client/gui-gtk-5.0/action_dialog.c index fcf46e8f41..22ec6e9ad3 100644 --- a/client/gui-gtk-5.0/action_dialog.c +++ b/client/gui-gtk-5.0/action_dialog.c @@ -44,7 +44,7 @@ #include "packhand.h" #include "text.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "citydlg.h" #include "dialogs.h" #include "unitselextradlg.h" diff --git a/client/gui-gtk-5.0/canvas.c b/client/gui-gtk-5.0/canvas.c index 6467873cbf..6e9b9bd498 100644 --- a/client/gui-gtk-5.0/canvas.c +++ b/client/gui-gtk-5.0/canvas.c @@ -15,7 +15,7 @@ #include #endif -/* gui-gtk-4.0 */ +/* gui-gtk-5.0 */ #include "colors.h" #include "gui_main.h" #include "mapview.h" diff --git a/client/gui-gtk-5.0/chatline.c b/client/gui-gtk-5.0/chatline.c index 682480bbdb..2d404f155e 100644 --- a/client/gui-gtk-5.0/chatline.c +++ b/client/gui-gtk-5.0/chatline.c @@ -42,7 +42,7 @@ #include "mapview_common.h" #include "update_queue.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "colors.h" #include "gui_main.h" #include "gui_stuff.h" diff --git a/client/gui-gtk-5.0/choice_dialog.c b/client/gui-gtk-5.0/choice_dialog.c index acb64eb929..76f7b0f6d2 100644 --- a/client/gui-gtk-5.0/choice_dialog.c +++ b/client/gui-gtk-5.0/choice_dialog.c @@ -21,7 +21,7 @@ /* utility */ #include "support.h" -/* gui-gtk-4.0 */ +/* gui-gtk-5.0 */ #include "gui_main.h" #include "gui_stuff.h" diff --git a/client/gui-gtk-5.0/citizensinfo.c b/client/gui-gtk-5.0/citizensinfo.c index f5987ba8f1..800a55467d 100644 --- a/client/gui-gtk-5.0/citizensinfo.c +++ b/client/gui-gtk-5.0/citizensinfo.c @@ -28,7 +28,7 @@ #include "nation.h" #include "player.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "gui_stuff.h" #include "plrdlg.h" diff --git a/client/gui-gtk-5.0/citydlg.c b/client/gui-gtk-5.0/citydlg.c index c1a49c8bf6..1acf2b6528 100644 --- a/client/gui-gtk-5.0/citydlg.c +++ b/client/gui-gtk-5.0/citydlg.c @@ -52,7 +52,7 @@ /* client/agents */ #include "cma_fec.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "choice_dialog.h" #include "citizensinfo.h" #include "cityrep.h" @@ -3480,13 +3480,13 @@ static void city_destroy_callback(GtkWidget *w, gpointer data) /* Save size of the city dialog. */ GUI_GTK_OPTION(citydlg_xsize) - = CLIP(GUI_GTK4_CITYDLG_MIN_XSIZE, + = CLIP(GUI_GTK5_CITYDLG_MIN_XSIZE, gtk_widget_get_allocated_width(pdialog->shell), - GUI_GTK4_CITYDLG_MAX_XSIZE); + GUI_GTK5_CITYDLG_MAX_XSIZE); GUI_GTK_OPTION(citydlg_ysize) - = CLIP(GUI_GTK4_CITYDLG_MIN_XSIZE, + = CLIP(GUI_GTK5_CITYDLG_MIN_XSIZE, gtk_widget_get_allocated_height(pdialog->shell), - GUI_GTK4_CITYDLG_MAX_XSIZE); + GUI_GTK5_CITYDLG_MAX_XSIZE); last_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(pdialog->notebook)); diff --git a/client/gui-gtk-5.0/cityrep.c b/client/gui-gtk-5.0/cityrep.c index 273e64932d..96ce914808 100644 --- a/client/gui-gtk-5.0/cityrep.c +++ b/client/gui-gtk-5.0/cityrep.c @@ -47,7 +47,7 @@ #include "mapview_common.h" #include "options.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "chatline.h" #include "citydlg.h" #include "gui_main.h" diff --git a/client/gui-gtk-5.0/cma_fe.c b/client/gui-gtk-5.0/cma_fe.c index 12b49d4b36..e6355d144b 100644 --- a/client/gui-gtk-5.0/cma_fe.c +++ b/client/gui-gtk-5.0/cma_fe.c @@ -35,7 +35,7 @@ #include "messagewin_g.h" #include "options.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "cityrep.h" #include "dialogs.h" #include "gui_main.h" diff --git a/client/gui-gtk-5.0/colors.c b/client/gui-gtk-5.0/colors.c index 5a914f0db2..5f2cfbfdf6 100644 --- a/client/gui-gtk-5.0/colors.c +++ b/client/gui-gtk-5.0/colors.c @@ -26,7 +26,7 @@ /* common */ #include "rgbcolor.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "gui_main.h" #include "colors.h" diff --git a/client/gui-gtk-5.0/connectdlg.c b/client/gui-gtk-5.0/connectdlg.c index 46b9a5cfd1..f9be85d749 100644 --- a/client/gui-gtk-5.0/connectdlg.c +++ b/client/gui-gtk-5.0/connectdlg.c @@ -38,7 +38,7 @@ #include "packhand.h" #include "tilespec.h" -/* gui-gtk-4.0 */ +/* gui-gtk-5.0 */ #include "chatline.h" #include "colors.h" #include "dialogs.h" diff --git a/client/gui-gtk-5.0/dialogs.c b/client/gui-gtk-5.0/dialogs.c index b78df57ba0..a338e8660c 100644 --- a/client/gui-gtk-5.0/dialogs.c +++ b/client/gui-gtk-5.0/dialogs.c @@ -52,7 +52,7 @@ #include "text.h" #include "tilespec.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "chatline.h" #include "choice_dialog.h" #include "citydlg.h" diff --git a/client/gui-gtk-5.0/diplodlg.c b/client/gui-gtk-5.0/diplodlg.c index 42302f9126..827c21ef0d 100644 --- a/client/gui-gtk-5.0/diplodlg.c +++ b/client/gui-gtk-5.0/diplodlg.c @@ -43,7 +43,7 @@ #include "climisc.h" #include "options.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "diplodlg.h" #include "gui_main.h" #include "gui_stuff.h" diff --git a/client/gui-gtk-5.0/editgui.c b/client/gui-gtk-5.0/editgui.c index 53f89d6ea5..85561acd94 100644 --- a/client/gui-gtk-5.0/editgui.c +++ b/client/gui-gtk-5.0/editgui.c @@ -43,7 +43,7 @@ #include "mapview_common.h" #include "tilespec.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "canvas.h" #include "editgui.h" #include "editprop.h" diff --git a/client/gui-gtk-5.0/editprop.c b/client/gui-gtk-5.0/editprop.c index 9f94e44067..993af72d52 100644 --- a/client/gui-gtk-5.0/editprop.c +++ b/client/gui-gtk-5.0/editprop.c @@ -44,7 +44,7 @@ #include "mapview_common.h" #include "tilespec.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "canvas.h" #include "gui_main.h" #include "gui_stuff.h" diff --git a/client/gui-gtk-5.0/finddlg.c b/client/gui-gtk-5.0/finddlg.c index 8bf6da15b5..9bd271317f 100644 --- a/client/gui-gtk-5.0/finddlg.c +++ b/client/gui-gtk-5.0/finddlg.c @@ -32,7 +32,7 @@ /* client */ #include "options.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "dialogs.h" #include "gui_main.h" #include "gui_stuff.h" diff --git a/client/gui-gtk-5.0/gamedlgs.c b/client/gui-gtk-5.0/gamedlgs.c index 340d548899..1c9c835111 100644 --- a/client/gui-gtk-5.0/gamedlgs.c +++ b/client/gui-gtk-5.0/gamedlgs.c @@ -38,7 +38,7 @@ #include "client_main.h" #include "options.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "chatline.h" #include "cityrep.h" #include "dialogs.h" diff --git a/client/gui-gtk-5.0/gotodlg.c b/client/gui-gtk-5.0/gotodlg.c index f9a790e825..4acc6ca758 100644 --- a/client/gui-gtk-5.0/gotodlg.c +++ b/client/gui-gtk-5.0/gotodlg.c @@ -43,7 +43,7 @@ #include "options.h" #include "text.h" -/* clien/gui-gtk-4.0 */ +/* clien/gui-gtk-5.0 */ #include "plrdlg.h" #include "dialogs.h" #include "gui_main.h" diff --git a/client/gui-gtk-5.0/graphics.c b/client/gui-gtk-5.0/graphics.c index 3858ec0387..32fb839b1c 100644 --- a/client/gui-gtk-5.0/graphics.c +++ b/client/gui-gtk-5.0/graphics.c @@ -40,7 +40,7 @@ #include "options.h" #include "tilespec.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "gui_main.h" #include "graphics.h" @@ -48,7 +48,7 @@ GdkCursor *fc_cursors[CURSOR_LAST][NUM_CURSOR_FRAMES]; /***********************************************************************//** - Returns TRUE to indicate that gtk4-client supports given view type + Returns TRUE to indicate that gtk4x-client supports given view type ***************************************************************************/ bool is_view_supported(enum ts_type type) { diff --git a/client/gui-gtk-5.0/graphics.h b/client/gui-gtk-5.0/graphics.h index 3e66311a6b..a3c0a03633 100644 --- a/client/gui-gtk-5.0/graphics.h +++ b/client/gui-gtk-5.0/graphics.h @@ -19,7 +19,7 @@ #include "graphics_g.h" #include "mapview_common.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "canvas.h" #include "sprite.h" diff --git a/client/gui-gtk-5.0/gui_main.c b/client/gui-gtk-5.0/gui_main.c index b5c0553056..7713c809b4 100644 --- a/client/gui-gtk-5.0/gui_main.c +++ b/client/gui-gtk-5.0/gui_main.c @@ -74,7 +74,7 @@ #include "tilespec.h" #include "zoom.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "chatline.h" #include "citizensinfo.h" #include "connectdlg.h" @@ -270,7 +270,7 @@ static void print_usage(void) { /* Add client-specific usage information here */ fc_fprintf(stderr, - _("gtk4-client gui-specific options are:\n")); + _("gtk4x-client gui-specific options are:\n")); fc_fprintf(stderr, _("-r, --resolution WIDTHxHEIGHT\tAssume given resolution " @@ -1854,10 +1854,10 @@ static void migrate_options_from_gtk3_22(void) { log_normal(_("Migrating options from gtk3.22 to gtk4 client")); -#define MIGRATE_OPTION(opt) GUI_GTK_OPTION(opt) = gui_options.gui_gtk3_22_##opt; +#define MIGRATE_OPTION(opt) gui_options.gui_gtk4_##opt = gui_options.gui_gtk3_22_##opt; #define MIGRATE_STR_OPTION(opt) \ strncpy(GUI_GTK_OPTION(opt), gui_options.gui_gtk3_22_##opt, \ - sizeof(GUI_GTK_OPTION(opt))); + sizeof(gui_options.gui_gtk4_##opt)); /* Default theme name is never migrated */ MIGRATE_OPTION(fullscreen); @@ -1895,7 +1895,7 @@ static void migrate_options_from_gtk3_22(void) #undef MIGRATE_OPTION #undef MIGRATE_STR_OPTION - GUI_GTK_OPTION(migrated_from_gtk3_22) = TRUE; + gui_options.gui_gtk4_migrated_from_gtk3_22 = TRUE; } /**********************************************************************//** @@ -1983,12 +1983,12 @@ static void activate_gui(GtkApplication *app, gpointer data) adjust_default_options(); /* We're using fresh defaults for this version of this client, * so prevent any future migrations from other clients / versions */ - GUI_GTK_OPTION(migrated_from_gtk3_22) = TRUE; + gui_options.gui_gtk4_migrated_from_gtk3_22 = TRUE; /* Avoid also marking previous Gtk clients as migrated, so that * they can have their own run of their adjust_default_options() if * they are ever run (as a side effect of Gtk2->Gtk3 migration). */ } else { - if (!GUI_GTK_OPTION(migrated_from_gtk3_22)) { + if (!gui_options.gui_gtk4_migrated_from_gtk3_22) { if (!gui_options.gui_gtk3_22_migrated_from_gtk3) { if (!gui_options.gui_gtk3_migrated_from_gtk2) { migrate_options_from_gtk2(); @@ -2101,7 +2101,7 @@ void ui_exit(void) **************************************************************************/ enum gui_type get_gui_type(void) { - return GUI_GTK4; + return GUI_GTK5; } /**********************************************************************//** @@ -2491,7 +2491,7 @@ static void apply_reqtree_text_font(struct option *poption) /**********************************************************************//** Extra initializers for client options. Here we make set the callback - for the specific gui-gtk-4.0 options. + for the specific gui-gtk-5.0 options. **************************************************************************/ void options_extra_init(void) { diff --git a/client/gui-gtk-5.0/gui_main.h b/client/gui-gtk-5.0/gui_main.h index bd13c2e11b..ce934dd692 100644 --- a/client/gui-gtk-5.0/gui_main.h +++ b/client/gui-gtk-5.0/gui_main.h @@ -19,12 +19,12 @@ #include "gui_main_g.h" #include "options.h" -#define GUI_NAME_FULL "gui-gtk-4.0" -#define GUI_NAME_SHORT "gtk4" +#define GUI_NAME_FULL "gui-gtk-4.x" +#define GUI_NAME_SHORT "gtk4x" -#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 +#define GUI_GTK_OPTION(optname) gui_options.gui_gtk5_##optname +#define GUI_GTK_OPTION_STR(optname) "gui_gtk5_" #optname +#define GUI_GTK_DEFAULT_THEME_NAME FC_GTK5_DEFAULT_THEME_NAME void main_message_area_resize(void *data); diff --git a/client/gui-gtk-5.0/gui_stuff.c b/client/gui-gtk-5.0/gui_stuff.c index c5d28369ef..250d9cf4e3 100644 --- a/client/gui-gtk-5.0/gui_stuff.c +++ b/client/gui-gtk-5.0/gui_stuff.c @@ -32,7 +32,7 @@ /* client */ #include "options.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "colors.h" #include "gui_main.h" diff --git a/client/gui-gtk-5.0/happiness.c b/client/gui-gtk-5.0/happiness.c index ae0a3c6dd0..d0bb940b48 100644 --- a/client/gui-gtk-5.0/happiness.c +++ b/client/gui-gtk-5.0/happiness.c @@ -32,7 +32,7 @@ #include "text.h" #include "tilespec.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "graphics.h" #include "gui_main.h" #include "gui_stuff.h" diff --git a/client/gui-gtk-5.0/happiness.h b/client/gui-gtk-5.0/happiness.h index f54aec214c..4757fcbe27 100644 --- a/client/gui-gtk-5.0/happiness.h +++ b/client/gui-gtk-5.0/happiness.h @@ -15,7 +15,7 @@ #include -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "citydlg.h" void happiness_dialog_init(void); diff --git a/client/gui-gtk-5.0/helpdlg.c b/client/gui-gtk-5.0/helpdlg.c index d0b9646758..3f0e12f416 100644 --- a/client/gui-gtk-5.0/helpdlg.c +++ b/client/gui-gtk-5.0/helpdlg.c @@ -48,7 +48,7 @@ #include "options.h" #include "tilespec.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "colors.h" #include "graphics.h" #include "gui_main.h" diff --git a/client/gui-gtk-5.0/infradlg.c b/client/gui-gtk-5.0/infradlg.c index bffcb756e7..2f29f93a17 100644 --- a/client/gui-gtk-5.0/infradlg.c +++ b/client/gui-gtk-5.0/infradlg.c @@ -29,7 +29,7 @@ #include "dialogs_g.h" #include "mapview_common.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "gui_main.h" #include "gui_stuff.h" diff --git a/client/gui-gtk-5.0/inputdlg.c b/client/gui-gtk-5.0/inputdlg.c index d8f7f2df32..c1e833ec4b 100644 --- a/client/gui-gtk-5.0/inputdlg.c +++ b/client/gui-gtk-5.0/inputdlg.c @@ -24,7 +24,7 @@ #include "log.h" #include "mem.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "gui_main.h" #include "gui_stuff.h" diff --git a/client/gui-gtk-5.0/inteldlg.c b/client/gui-gtk-5.0/inteldlg.c index 60d1a5f2e3..2bb5257779 100644 --- a/client/gui-gtk-5.0/inteldlg.c +++ b/client/gui-gtk-5.0/inteldlg.c @@ -37,7 +37,7 @@ #include "client_main.h" #include "options.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "gui_main.h" #include "gui_stuff.h" #include "mapview.h" diff --git a/client/gui-gtk-5.0/luaconsole.c b/client/gui-gtk-5.0/luaconsole.c index e4267caab5..8ae3974bb8 100644 --- a/client/gui-gtk-5.0/luaconsole.c +++ b/client/gui-gtk-5.0/luaconsole.c @@ -29,7 +29,7 @@ /* client */ #include "options.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "chatline.h" #include "gui_main.h" #include "gui_stuff.h" diff --git a/client/gui-gtk-5.0/mapctrl.c b/client/gui-gtk-5.0/mapctrl.c index 99692739b2..cccd05fec3 100644 --- a/client/gui-gtk-5.0/mapctrl.c +++ b/client/gui-gtk-5.0/mapctrl.c @@ -43,7 +43,7 @@ /* client/agents */ #include "cma_core.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "chatline.h" #include "citydlg.h" #include "colors.h" diff --git a/client/gui-gtk-5.0/mapview.c b/client/gui-gtk-5.0/mapview.c index 6f9b06d188..55b30dc586 100644 --- a/client/gui-gtk-5.0/mapview.c +++ b/client/gui-gtk-5.0/mapview.c @@ -51,7 +51,7 @@ #include "text.h" #include "zoom.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "citydlg.h" /* For reset_city_dialogs() */ #include "editgui.h" #include "graphics.h" diff --git a/client/gui-gtk-5.0/mapview.h b/client/gui-gtk-5.0/mapview.h index 543009aff6..87bbf8d45f 100644 --- a/client/gui-gtk-5.0/mapview.h +++ b/client/gui-gtk-5.0/mapview.h @@ -23,7 +23,7 @@ #include "mapview_g.h" #include "mapview_common.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "canvas.h" #include "graphics.h" diff --git a/client/gui-gtk-5.0/menu.c b/client/gui-gtk-5.0/menu.c index 2b6e39ab8e..b25cecf4a4 100644 --- a/client/gui-gtk-5.0/menu.c +++ b/client/gui-gtk-5.0/menu.c @@ -40,7 +40,7 @@ #include "options.h" #include "tilespec.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "chatline.h" #include "cityrep.h" #include "dialogs.h" diff --git a/client/gui-gtk-5.0/messagedlg.c b/client/gui-gtk-5.0/messagedlg.c index ecc2a1a3e9..30a8abad36 100644 --- a/client/gui-gtk-5.0/messagedlg.c +++ b/client/gui-gtk-5.0/messagedlg.c @@ -26,7 +26,7 @@ /* client */ #include "options.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "colors.h" #include "gui_main.h" #include "gui_stuff.h" diff --git a/client/gui-gtk-5.0/messagewin.c b/client/gui-gtk-5.0/messagewin.c index e11bcc35bc..a1f04bacdf 100644 --- a/client/gui-gtk-5.0/messagewin.c +++ b/client/gui-gtk-5.0/messagewin.c @@ -34,7 +34,7 @@ /* client */ #include "options.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "chatline.h" #include "citydlg.h" #include "gui_main.h" diff --git a/client/gui-gtk-5.0/optiondlg.c b/client/gui-gtk-5.0/optiondlg.c index 546d51f4e9..f369eedc73 100644 --- a/client/gui-gtk-5.0/optiondlg.c +++ b/client/gui-gtk-5.0/optiondlg.c @@ -27,7 +27,7 @@ /* client */ #include "options.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "colors.h" #include "dialogs.h" #include "gui_main.h" diff --git a/client/gui-gtk-5.0/pages.c b/client/gui-gtk-5.0/pages.c index c1b8fc0f33..02976c29b4 100644 --- a/client/gui-gtk-5.0/pages.c +++ b/client/gui-gtk-5.0/pages.c @@ -45,7 +45,7 @@ #include "servers.h" #include "update_queue.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "chatline.h" #include "connectdlg.h" #include "dialogs.h" diff --git a/client/gui-gtk-5.0/plrdlg.c b/client/gui-gtk-5.0/plrdlg.c index 43ecb0831f..dc8e3afdd0 100644 --- a/client/gui-gtk-5.0/plrdlg.c +++ b/client/gui-gtk-5.0/plrdlg.c @@ -43,7 +43,7 @@ #include "options.h" #include "text.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "chatline.h" #include "dialogs.h" #include "gui_main.h" diff --git a/client/gui-gtk-5.0/rallypointdlg.c b/client/gui-gtk-5.0/rallypointdlg.c index 4ee7a5b219..c2f41bc29a 100644 --- a/client/gui-gtk-5.0/rallypointdlg.c +++ b/client/gui-gtk-5.0/rallypointdlg.c @@ -29,7 +29,7 @@ #include "client_main.h" #include "goto.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "gui_main.h" #include "gui_stuff.h" diff --git a/client/gui-gtk-5.0/repodlgs.c b/client/gui-gtk-5.0/repodlgs.c index 499025e84d..5b47e6942c 100644 --- a/client/gui-gtk-5.0/repodlgs.c +++ b/client/gui-gtk-5.0/repodlgs.c @@ -50,7 +50,7 @@ #include "reqtree.h" #include "text.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "canvas.h" #include "cityrep.h" #include "dialogs.h" diff --git a/client/gui-gtk-5.0/soundset_dlg.c b/client/gui-gtk-5.0/soundset_dlg.c index 7bc8c0ec44..75fc8c6923 100644 --- a/client/gui-gtk-5.0/soundset_dlg.c +++ b/client/gui-gtk-5.0/soundset_dlg.c @@ -27,7 +27,7 @@ #include "audio.h" #include "client_main.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "gui_main.h" #include "gui_stuff.h" diff --git a/client/gui-gtk-5.0/spaceshipdlg.c b/client/gui-gtk-5.0/spaceshipdlg.c index 1da03a4161..830f20ecc5 100644 --- a/client/gui-gtk-5.0/spaceshipdlg.c +++ b/client/gui-gtk-5.0/spaceshipdlg.c @@ -43,7 +43,7 @@ #include "text.h" #include "tilespec.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "dialogs.h" #include "graphics.h" #include "gui_main.h" diff --git a/client/gui-gtk-5.0/sprite.c b/client/gui-gtk-5.0/sprite.c index f1cfb5517b..d1f2da8b6d 100644 --- a/client/gui-gtk-5.0/sprite.c +++ b/client/gui-gtk-5.0/sprite.c @@ -20,7 +20,7 @@ #include "mem.h" #include "shared.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "colors.h" #include "mapview.h" diff --git a/client/gui-gtk-5.0/theme_dlg.c b/client/gui-gtk-5.0/theme_dlg.c index ee9318658a..59c8c6b6e9 100644 --- a/client/gui-gtk-5.0/theme_dlg.c +++ b/client/gui-gtk-5.0/theme_dlg.c @@ -24,7 +24,7 @@ #include "dialogs_g.h" #include "options.h" -/* gui-gtk-4.0 */ +/* gui-gtk-5.0 */ #include "gui_main.h" #include "gui_stuff.h" @@ -52,7 +52,7 @@ bool popup_theme_suggestion_dialog(const char *theme_name) /* gui option default_theme_name is not yet set. * This can happen when we load tileset requested at command line and * user has not saved theme information to .freeciv-client-rc.A.B. */ - current_name = FC_GTK4_DEFAULT_THEME_NAME; + current_name = FC_GTK5_DEFAULT_THEME_NAME; } dialog = gtk_dialog_new_with_buttons(_("Theme suggested"), diff --git a/client/gui-gtk-5.0/themes.c b/client/gui-gtk-5.0/themes.c index e63cf8d740..4d4308c926 100644 --- a/client/gui-gtk-5.0/themes.c +++ b/client/gui-gtk-5.0/themes.c @@ -32,7 +32,7 @@ /* client */ #include "themes_common.h" -/* gui-gtk-4.0 */ +/* gui-gtk-5.0 */ #include "gui_main.h" #include "themes_g.h" @@ -90,7 +90,7 @@ void gui_clear_theme(void) /*************************************************************************//** Each gui has its own themes directories. - For gtk4 these are: + For gtk4x these are: - /usr/share/themes - ~/.themes Returns an array containing these strings and sets array size in count. @@ -106,7 +106,7 @@ char **get_gui_specific_themes_directories(int *count) *count = 0; - /* Freeciv-specific GTK4 themes directories */ + /* Freeciv-specific GTK4x themes directories */ strvec_iterate(data_dirs, dir_name) { char buf[strlen(dir_name) + strlen("/themes/gtk4") + 1]; @@ -115,7 +115,7 @@ char **get_gui_specific_themes_directories(int *count) directories[(*count)++] = fc_strdup(buf); } strvec_iterate_end; - /* standard GTK themes directory */ + /* Standard GTK themes directory */ #ifdef CROSSER standard_dir = "../share/themes"; #else /* CROSSER */ @@ -123,7 +123,7 @@ char **get_gui_specific_themes_directories(int *count) #endif /* CROSSER */ directories[(*count)++] = fc_strdup(standard_dir); - /* user GTK themes directory (~/.themes) */ + /* User GTK themes directory (~/.themes) */ home_dir = user_home_dir(); if (home_dir) { char buf[strlen(home_dir) + 16]; diff --git a/client/gui-gtk-5.0/tileset_dlg.c b/client/gui-gtk-5.0/tileset_dlg.c index d2c17c014e..da6545e949 100644 --- a/client/gui-gtk-5.0/tileset_dlg.c +++ b/client/gui-gtk-5.0/tileset_dlg.c @@ -27,7 +27,7 @@ /* client */ #include "tilespec.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "gui_main.h" #include "gui_stuff.h" diff --git a/client/gui-gtk-5.0/transportdlg.c b/client/gui-gtk-5.0/transportdlg.c index ec81a32449..3d60e2bfa6 100644 --- a/client/gui-gtk-5.0/transportdlg.c +++ b/client/gui-gtk-5.0/transportdlg.c @@ -29,7 +29,7 @@ #include "control.h" #include "tilespec.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "gui_main.h" #include "gui_stuff.h" #include "sprite.h" diff --git a/client/gui-gtk-5.0/unitselect.c b/client/gui-gtk-5.0/unitselect.c index 8853e5b810..f6b401843d 100644 --- a/client/gui-gtk-5.0/unitselect.c +++ b/client/gui-gtk-5.0/unitselect.c @@ -35,7 +35,7 @@ #include "tilespec.h" #include "unitselect_common.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "graphics.h" #include "gui_stuff.h" #include "gui_main.h" diff --git a/client/gui-gtk-5.0/unitselextradlg.c b/client/gui-gtk-5.0/unitselextradlg.c index cfa3ab2b5e..59118c4dbe 100644 --- a/client/gui-gtk-5.0/unitselextradlg.c +++ b/client/gui-gtk-5.0/unitselextradlg.c @@ -31,7 +31,7 @@ #include "control.h" #include "tilespec.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "gui_main.h" #include "gui_stuff.h" #include "sprite.h" diff --git a/client/gui-gtk-5.0/unitselunitdlg.c b/client/gui-gtk-5.0/unitselunitdlg.c index 703a497afd..04bb457509 100644 --- a/client/gui-gtk-5.0/unitselunitdlg.c +++ b/client/gui-gtk-5.0/unitselunitdlg.c @@ -29,7 +29,7 @@ #include "control.h" #include "tilespec.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "gui_main.h" #include "gui_stuff.h" #include "sprite.h" diff --git a/client/gui-gtk-5.0/voteinfo_bar.c b/client/gui-gtk-5.0/voteinfo_bar.c index 87b6d7fdc1..fb016ceb2b 100644 --- a/client/gui-gtk-5.0/voteinfo_bar.c +++ b/client/gui-gtk-5.0/voteinfo_bar.c @@ -27,7 +27,7 @@ #include "voteinfo.h" #include "update_queue.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "chatline.h" #include "voteinfo_bar.h" diff --git a/client/gui-gtk-5.0/wldlg.c b/client/gui-gtk-5.0/wldlg.c index 9c8acbb39d..08d097f8be 100644 --- a/client/gui-gtk-5.0/wldlg.c +++ b/client/gui-gtk-5.0/wldlg.c @@ -41,7 +41,7 @@ #include "text.h" #include "tilespec.h" -/* client/gui-gtk-4.0 */ +/* client/gui-gtk-5.0 */ #include "canvas.h" #include "citydlg.h" #include "graphics.h" -- 2.42.0