From d5fb9e7dc6a9a990e5174a1ab746a09f7e69fd9a Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Tue, 25 Apr 2023 09:57:55 +0100 Subject: [PATCH] Codechange: Remove various DATE_LONG strings. --- src/genworld_gui.cpp | 10 +++++----- src/lang/english.txt | 3 --- src/news_gui.cpp | 4 ++-- src/statusbar_gui.cpp | 4 ++-- src/toolbar_gui.cpp | 4 ++-- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp index b7fd49b48e..46a10f10f9 100644 --- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -157,7 +157,7 @@ static const NWidgetPart _nested_generate_landscape_widgets[] = { /* Starting date. */ NWidget(NWID_HORIZONTAL), NWidget(WWT_IMGBTN, COLOUR_ORANGE, WID_GL_START_DATE_DOWN), SetDataTip(SPR_ARROW_DOWN, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD), SetFill(0, 1), - NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_GL_START_DATE_TEXT), SetDataTip(STR_BLACK_DATE_LONG, STR_NULL), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_GL_START_DATE_TEXT), SetDataTip(STR_JUST_DATE_LONG, STR_NULL), SetFill(1, 0), NWidget(WWT_IMGBTN, COLOUR_ORANGE, WID_GL_START_DATE_UP), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD), SetFill(0, 1), EndContainer(), NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_TOWNNAME_DROPDOWN), SetDataTip(STR_BLACK_STRING, STR_MAPGEN_TOWN_NAME_DROPDOWN_TOOLTIP), SetFill(1, 0), @@ -301,7 +301,7 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = { /* Starting date. */ NWidget(NWID_HORIZONTAL), NWidget(WWT_IMGBTN, COLOUR_ORANGE, WID_GL_START_DATE_DOWN), SetDataTip(SPR_ARROW_DOWN, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD), SetFill(0, 1), - NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_GL_START_DATE_TEXT), SetDataTip(STR_BLACK_DATE_LONG, STR_NULL), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_GL_START_DATE_TEXT), SetDataTip(STR_JUST_DATE_LONG, STR_NULL), SetFill(1, 0), NWidget(WWT_IMGBTN, COLOUR_ORANGE, WID_GL_START_DATE_UP), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD), SetFill(0, 1), EndContainer(), NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_TOWNNAME_DROPDOWN), SetDataTip(STR_BLACK_STRING, STR_MAPGEN_TOWN_NAME_DROPDOWN_TOOLTIP), SetFill(1, 0), @@ -601,7 +601,7 @@ struct GenerateLandscapeWindow : public Window { case WID_GL_START_DATE_TEXT: SetDParam(0, TimerGameCalendar::ConvertYMDToDate(MAX_YEAR, 0, 1)); - d = GetStringBoundingBox(STR_BLACK_DATE_LONG); + d = GetStringBoundingBox(STR_JUST_DATE_LONG); break; case WID_GL_MAPSIZE_X_PULLDOWN: @@ -1145,7 +1145,7 @@ struct CreateScenarioWindow : public Window switch (widget) { case WID_CS_START_DATE_TEXT: SetDParam(0, TimerGameCalendar::ConvertYMDToDate(MAX_YEAR, 0, 1)); - str = STR_BLACK_DATE_LONG; + str = STR_JUST_DATE_LONG; break; case WID_CS_MAPSIZE_X_PULLDOWN: @@ -1308,7 +1308,7 @@ static const NWidgetPart _nested_create_scenario_widgets[] = { NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_DATE, STR_NULL), SetPadding(1, 0, 0, 0), NWidget(NWID_SPACER), SetMinimalSize(6, 0), SetFill(1, 0), NWidget(WWT_IMGBTN, COLOUR_ORANGE, WID_CS_START_DATE_DOWN), SetFill(0, 1), SetDataTip(SPR_ARROW_DOWN, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD), - NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_CS_START_DATE_TEXT), SetDataTip(STR_BLACK_DATE_LONG, STR_NULL), + NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_CS_START_DATE_TEXT), SetDataTip(STR_JUST_DATE_LONG, STR_NULL), NWidget(WWT_IMGBTN, COLOUR_ORANGE, WID_CS_START_DATE_UP), SetFill(0, 1), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD), EndContainer(), /* Flat map height. */ diff --git a/src/lang/english.txt b/src/lang/english.txt index d846381bed..15aa04ef67 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -5607,10 +5607,7 @@ STR_JUST_RAW_STRING :{RAW_STRING} STR_JUST_BIG_RAW_STRING :{BIG_FONT}{RAW_STRING} # Slightly 'raw' stringcodes with colour or size -STR_BLACK_DATE_LONG :{BLACK}{DATE_LONG} -STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG} STR_SHORT_DATE :{WHITE}{DATE_TINY} -STR_DATE_LONG_SMALL :{TINY_FONT}{BLACK}{DATE_LONG} STR_TINY_GROUP :{TINY_FONT}{GROUP} STR_BLACK_INT :{BLACK}{NUM} STR_ORANGE_INT :{ORANGE}{NUM} diff --git a/src/news_gui.cpp b/src/news_gui.cpp index c48f6794bd..bfd8e67914 100644 --- a/src/news_gui.cpp +++ b/src/news_gui.cpp @@ -88,7 +88,7 @@ static const NWidgetPart _nested_normal_news_widgets[] = { NWidget(WWT_CLOSEBOX, COLOUR_WHITE, WID_N_CLOSEBOX), SetPadding(0, 0, 0, 1), NWidget(NWID_SPACER), SetFill(1, 0), NWidget(NWID_VERTICAL), - NWidget(WWT_LABEL, COLOUR_WHITE, WID_N_DATE), SetDataTip(STR_DATE_LONG_SMALL, STR_NULL), + NWidget(WWT_LABEL, COLOUR_WHITE, WID_N_DATE), SetDataTip(STR_JUST_DATE_LONG, STR_NULL), SetTextStyle(TC_BLACK, FS_SMALL), NWidget(NWID_SPACER), SetFill(0, 1), EndContainer(), EndContainer(), @@ -165,7 +165,7 @@ static const NWidgetPart _nested_thin_news_widgets[] = { NWidget(WWT_CLOSEBOX, COLOUR_WHITE, WID_N_CLOSEBOX), SetPadding(0, 0, 0, 1), NWidget(NWID_SPACER), SetFill(1, 0), NWidget(NWID_VERTICAL), - NWidget(WWT_LABEL, COLOUR_WHITE, WID_N_DATE), SetDataTip(STR_DATE_LONG_SMALL, STR_NULL), + NWidget(WWT_LABEL, COLOUR_WHITE, WID_N_DATE), SetDataTip(STR_JUST_DATE_LONG, STR_NULL), SetTextStyle(TC_BLACK, FS_SMALL), NWidget(NWID_SPACER), SetFill(0, 1), EndContainer(), EndContainer(), diff --git a/src/statusbar_gui.cpp b/src/statusbar_gui.cpp index b7d906c3fa..303fb0050c 100644 --- a/src/statusbar_gui.cpp +++ b/src/statusbar_gui.cpp @@ -111,7 +111,7 @@ struct StatusBarWindow : Window { switch (widget) { case WID_S_LEFT: SetDParamMaxValue(0, MAX_YEAR * DAYS_IN_YEAR); - d = GetStringBoundingBox(STR_WHITE_DATE_LONG); + d = GetStringBoundingBox(STR_JUST_DATE_LONG); break; case WID_S_RIGHT: { @@ -139,7 +139,7 @@ struct StatusBarWindow : Window { case WID_S_LEFT: /* Draw the date */ SetDParam(0, TimerGameCalendar::date); - DrawString(tr, STR_WHITE_DATE_LONG, TC_FROMSTRING, SA_HOR_CENTER); + DrawString(tr, STR_JUST_DATE_LONG, TC_WHITE, SA_HOR_CENTER); break; case WID_S_RIGHT: { diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index cc07a69748..7079266f46 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -2406,7 +2406,7 @@ struct ScenarioEditorToolbarWindow : Window { case WID_TE_DATE: SetDParam(0, TimerGameCalendar::ConvertYMDToDate(MAX_YEAR, 0, 1)); - *size = GetStringBoundingBox(STR_WHITE_DATE_LONG); + *size = GetStringBoundingBox(STR_JUST_DATE_LONG); break; } } @@ -2568,7 +2568,7 @@ static const NWidgetPart _nested_toolb_scen_inner_widgets[] = { NWidget(WWT_PANEL, COLOUR_GREY, WID_TE_DATE_PANEL), NWidget(NWID_HORIZONTAL), SetPIP(2, 2, 2), SetPadding(1), NWidget(WWT_IMGBTN, COLOUR_GREY, WID_TE_DATE_BACKWARD), SetDataTip(SPR_ARROW_DOWN, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD), SetFill(0, 1), - NWidget(WWT_TEXT, COLOUR_GREY, WID_TE_DATE), SetDataTip(STR_WHITE_DATE_LONG, STR_SCENEDIT_TOOLBAR_TOOLTIP_SET_DATE), SetAlignment(SA_CENTER), SetFill(0, 1), + NWidget(WWT_TEXT, COLOUR_GREY, WID_TE_DATE), SetDataTip(STR_JUST_DATE_LONG, STR_SCENEDIT_TOOLBAR_TOOLTIP_SET_DATE), SetTextStyle(TC_WHITE), SetAlignment(SA_CENTER), SetFill(0, 1), NWidget(WWT_IMGBTN, COLOUR_GREY, WID_TE_DATE_FORWARD), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD), SetFill(0, 1), EndContainer(), EndContainer(),