From 098470fc845c13081a8fcf974571346795ad0d96 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 10 Jun 2023 07:48:43 +0300 Subject: [PATCH 49/49] sdl2 theme: Rename order_auto_settler as order_auto_worker See osdn #48177 Signed-off-by: Marko Lindqvist --- client/gui-sdl2/gui_tilespec.c | 2 +- client/gui-sdl2/gui_tilespec.h | 2 +- client/gui-sdl2/menu.c | 6 +++--- client/gui-sdl2/themespec.c | 4 ++-- data/themes/gui-sdl2/human/city.tspec | 2 +- data/themes/gui-sdl2/human/city_fist.tspec | 2 +- data/themes/gui-sdl2/human/dip_icons.tspec | 2 +- data/themes/gui-sdl2/human/icons.tspec | 2 +- data/themes/gui-sdl2/human/small_theme_buttons.tspec | 2 +- data/themes/gui-sdl2/human/tech_tree.tspec | 2 +- data/themes/gui-sdl2/human/theme_boxs.tspec | 2 +- data/themes/gui-sdl2/human/theme_buttons.tspec | 2 +- data/themes/gui-sdl2/human/theme_orders_buttons.tspec | 6 +++--- data/themes/gui-sdl2/human/theme_scrolls.tspec | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/client/gui-sdl2/gui_tilespec.c b/client/gui-sdl2/gui_tilespec.c index aef77d83ef..f1acc6ba99 100644 --- a/client/gui-sdl2/gui_tilespec.c +++ b/client/gui-sdl2/gui_tilespec.c @@ -323,7 +323,7 @@ void tilespec_setup_theme(void) load_order_theme_surface(buf, order_icon, "theme.order_empty"); load_order_theme_surface(buf, o_autoconnect_icon, "theme.order_auto_connect"); load_order_theme_surface(buf, o_autoexp_icon, "theme.order_auto_explorer"); - load_order_theme_surface(buf, o_autosett_icon, "theme.order_auto_settler"); + load_order_theme_surface(buf, o_autowork_icon, "theme.order_auto_worker"); load_order_theme_surface(buf, o_build_city_icon, "theme.order_build_city"); load_order_theme_surface(buf, OCutDownForest_Icon, "theme.order_cutdown_forest"); load_order_theme_surface(buf, OPlantForest_Icon, "theme.order_plant_forest"); diff --git a/client/gui-sdl2/gui_tilespec.h b/client/gui-sdl2/gui_tilespec.h index 7a80bd5e8e..9e22d74fc9 100644 --- a/client/gui-sdl2/gui_tilespec.h +++ b/client/gui-sdl2/gui_tilespec.h @@ -110,7 +110,7 @@ struct theme_icons { SDL_Surface *o_wait_icon; SDL_Surface *o_done_icon; SDL_Surface *o_autoexp_icon; - SDL_Surface *o_autosett_icon; + SDL_Surface *o_autowork_icon; SDL_Surface *o_autoconnect_icon; SDL_Surface *o_unload_icon; SDL_Surface *o_build_city_icon; diff --git a/client/gui-sdl2/menu.c b/client/gui-sdl2/menu.c index 50f7f92ef0..97681cd99e 100644 --- a/client/gui-sdl2/menu.c +++ b/client/gui-sdl2/menu.c @@ -611,7 +611,7 @@ void create_units_order_widgets(void) } /* --------- */ - /* Auto-Explore */ + /* Auto Explore */ fc_snprintf(cbuf, sizeof(cbuf), "%s (%s)", _("Auto Explore"), "X"); buf = create_themeicon(current_theme->o_autoexp_icon, main_data.gui, WF_HIDDEN | WF_RESTORE_BACKGROUND @@ -623,10 +623,10 @@ void create_units_order_widgets(void) add_to_gui_list(ID_UNIT_ORDER_AUTO_EXPLORE, buf); /* --------- */ - /* Auto-Settler */ + /* Auto Worker */ fc_snprintf(cbuf, sizeof(cbuf), "%s (%s)", _("Auto Settler"), "A"); - buf = create_themeicon(current_theme->o_autosett_icon, main_data.gui, + buf = create_themeicon(current_theme->o_autowork_icon, main_data.gui, WF_HIDDEN | WF_RESTORE_BACKGROUND | WF_WIDGET_HAS_INFO_LABEL); set_wstate(buf, FC_WS_NORMAL); diff --git a/client/gui-sdl2/themespec.c b/client/gui-sdl2/themespec.c index 26472fcb9a..a30fd911d9 100644 --- a/client/gui-sdl2/themespec.c +++ b/client/gui-sdl2/themespec.c @@ -59,11 +59,11 @@ * have duplicates should specify "+duplicates_ok") */ -#define SPEC_SDL2_CAPSTR "+Freeciv-sdl2-spec-Devel-2022-Dec-05" +#define SPEC_SDL2_CAPSTR "+Freeciv-sdl2-3.3-spec-Devel-2023-Jun-10" /* * Individual spec file capabilities acceptable to this program: * - * +Freeciv-3.2-sdl2-spec - basic format for Freeciv versions 3.2.x; required + * +Freeciv-3.3-sdl2-spec - basic format for Freeciv versions 3.3.x; required */ #define THEMESPEC_SUFFIX ".themespec" diff --git a/data/themes/gui-sdl2/human/city.tspec b/data/themes/gui-sdl2/human/city.tspec index b0c452db6f..e654abf176 100644 --- a/data/themes/gui-sdl2/human/city.tspec +++ b/data/themes/gui-sdl2/human/city.tspec @@ -2,7 +2,7 @@ [spec] ; Format and options of this spec file: -options = "+Freeciv-sdl2-spec-Devel-2022-Dec-05" +options = "+Freeciv-sdl2-3.3-spec-Devel-2023-Jun-10" [info] diff --git a/data/themes/gui-sdl2/human/city_fist.tspec b/data/themes/gui-sdl2/human/city_fist.tspec index 1af0732714..f6c00bc0d7 100644 --- a/data/themes/gui-sdl2/human/city_fist.tspec +++ b/data/themes/gui-sdl2/human/city_fist.tspec @@ -1,7 +1,7 @@ [spec] ; Format and options of this spec file: -options = "+Freeciv-sdl2-spec-Devel-2022-Dec-05" +options = "+Freeciv-sdl2-3.3-spec-Devel-2023-Jun-10" [info] diff --git a/data/themes/gui-sdl2/human/dip_icons.tspec b/data/themes/gui-sdl2/human/dip_icons.tspec index 6bdef3d308..20ca968a24 100644 --- a/data/themes/gui-sdl2/human/dip_icons.tspec +++ b/data/themes/gui-sdl2/human/dip_icons.tspec @@ -1,7 +1,7 @@ [spec] ; Format and options of this spec file: -options = "+Freeciv-sdl2-spec-Devel-2022-Dec-05" +options = "+Freeciv-sdl2-3.3-spec-Devel-2023-Jun-10" [info] diff --git a/data/themes/gui-sdl2/human/icons.tspec b/data/themes/gui-sdl2/human/icons.tspec index accfdc4614..cb0c6f85bb 100644 --- a/data/themes/gui-sdl2/human/icons.tspec +++ b/data/themes/gui-sdl2/human/icons.tspec @@ -1,7 +1,7 @@ [spec] ; Format and options of this spec file: -options = "+Freeciv-sdl2-spec-Devel-2022-Dec-05" +options = "+Freeciv-sdl2-3.3-spec-Devel-2023-Jun-10" [info] diff --git a/data/themes/gui-sdl2/human/small_theme_buttons.tspec b/data/themes/gui-sdl2/human/small_theme_buttons.tspec index 56522b30ff..1e61535e37 100644 --- a/data/themes/gui-sdl2/human/small_theme_buttons.tspec +++ b/data/themes/gui-sdl2/human/small_theme_buttons.tspec @@ -2,7 +2,7 @@ [spec] ; Format and options of this spec file: -options = "+Freeciv-sdl2-spec-Devel-2022-Dec-05" +options = "+Freeciv-sdl2-3.3-spec-Devel-2023-Jun-10" [info] diff --git a/data/themes/gui-sdl2/human/tech_tree.tspec b/data/themes/gui-sdl2/human/tech_tree.tspec index a3530b250b..b784ce93b1 100644 --- a/data/themes/gui-sdl2/human/tech_tree.tspec +++ b/data/themes/gui-sdl2/human/tech_tree.tspec @@ -1,7 +1,7 @@ [spec] ; Format and options of this spec file: -options = "+Freeciv-sdl2-spec-Devel-2022-Dec-05" +options = "+Freeciv-sdl2-3.3-spec-Devel-2023-Jun-10" [info] diff --git a/data/themes/gui-sdl2/human/theme_boxs.tspec b/data/themes/gui-sdl2/human/theme_boxs.tspec index df703b1456..6cc2b3bb72 100644 --- a/data/themes/gui-sdl2/human/theme_boxs.tspec +++ b/data/themes/gui-sdl2/human/theme_boxs.tspec @@ -2,7 +2,7 @@ [spec] ; Format and options of this spec file: -options = "+Freeciv-sdl2-spec-Devel-2022-Dec-05" +options = "+Freeciv-sdl2-3.3-spec-Devel-2023-Jun-10" [info] diff --git a/data/themes/gui-sdl2/human/theme_buttons.tspec b/data/themes/gui-sdl2/human/theme_buttons.tspec index 88d80f8f66..fb001954a6 100644 --- a/data/themes/gui-sdl2/human/theme_buttons.tspec +++ b/data/themes/gui-sdl2/human/theme_buttons.tspec @@ -2,7 +2,7 @@ [spec] ; Format and options of this spec file: -options = "+Freeciv-sdl2-spec-Devel-2022-Dec-05" +options = "+Freeciv-sdl2-3.3-spec-Devel-2023-Jun-10" [info] diff --git a/data/themes/gui-sdl2/human/theme_orders_buttons.tspec b/data/themes/gui-sdl2/human/theme_orders_buttons.tspec index 133231300b..6c9d3fa210 100644 --- a/data/themes/gui-sdl2/human/theme_orders_buttons.tspec +++ b/data/themes/gui-sdl2/human/theme_orders_buttons.tspec @@ -2,7 +2,7 @@ [spec] ; Format and options of this spec file: -options = "+Freeciv-sdl2-spec-Devel-2022-Dec-05" +options = "+Freeciv-sdl2-3.3-spec-Devel-2023-Jun-10" [info] @@ -28,10 +28,10 @@ pixel_border = 1 tiles = { "row", "column", "tag" -; terrain +; Terrain 1, 0, "theme.order_auto_connect" 2, 0, "theme.order_auto_explorer" - 3, 0, "theme.order_auto_settler" + 3, 0, "theme.order_auto_worker" 4, 0, "theme.order_build_city" 5, 0, "theme.order_cutdown_forest" 6, 0, "theme.order_plant_forest" diff --git a/data/themes/gui-sdl2/human/theme_scrolls.tspec b/data/themes/gui-sdl2/human/theme_scrolls.tspec index d8a721ba15..47594922ab 100644 --- a/data/themes/gui-sdl2/human/theme_scrolls.tspec +++ b/data/themes/gui-sdl2/human/theme_scrolls.tspec @@ -2,7 +2,7 @@ [spec] ; Format and options of this spec file: -options = "+Freeciv-sdl2-spec-Devel-2022-Dec-05" +options = "+Freeciv-sdl2-3.3-spec-Devel-2023-Jun-10" [info] -- 2.39.2