diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index a4f4818edb..ee2f3fab45 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -333,8 +333,8 @@ static constexpr NWidgetPart _nested_about_widgets[] = { NWidget(WWT_FRAME, COLOUR_GREY), SetPadding(0, 5, 1, 5), NWidget(WWT_EMPTY, INVALID_COLOUR, WID_A_SCROLLING_TEXT), EndContainer(), - NWidget(WWT_LABEL, INVALID_COLOUR, WID_A_WEBSITE), SetStringTip(STR_JUST_RAW_STRING), - NWidget(WWT_LABEL, INVALID_COLOUR, WID_A_COPYRIGHT), SetStringTip(STR_ABOUT_COPYRIGHT_OPENTTD), + NWidget(WWT_LABEL, INVALID_COLOUR, WID_A_WEBSITE), + NWidget(WWT_LABEL, INVALID_COLOUR, WID_A_COPYRIGHT), EndContainer(), }; @@ -424,10 +424,11 @@ struct AboutWindow : public Window { this->text_position = this->GetWidget(WID_A_SCROLLING_TEXT)->pos_y + this->GetWidget(WID_A_SCROLLING_TEXT)->current_y; } - void SetStringParameters(WidgetID widget) const override + std::string GetWidgetString(WidgetID widget, StringID stringid) const override { - if (widget == WID_A_WEBSITE) SetDParamStr(0, "Website: https://www.openttd.org"); - if (widget == WID_A_COPYRIGHT) SetDParamStr(0, _openttd_revision_year); + if (widget == WID_A_WEBSITE) return "Website: https://www.openttd.org"; + if (widget == WID_A_COPYRIGHT) return GetString(STR_ABOUT_COPYRIGHT_OPENTTD, _openttd_revision_year); + return this->Window::GetWidgetString(widget, stringid); } void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override @@ -931,9 +932,11 @@ struct QueryStringWindow : public Window } } - void SetStringParameters(WidgetID widget) const override + std::string GetWidgetString(WidgetID widget, StringID stringid) const override { - if (widget == WID_QS_CAPTION) SetDParam(0, this->editbox.caption); + if (widget == WID_QS_CAPTION) return GetString(this->editbox.caption); + + return this->Window::GetWidgetString(widget, stringid); } void OnOk() @@ -977,7 +980,7 @@ struct QueryStringWindow : public Window static constexpr NWidgetPart _nested_query_string_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_GREY), - NWidget(WWT_CAPTION, COLOUR_GREY, WID_QS_CAPTION), SetStringTip(STR_JUST_STRING), SetTextStyle(TC_WHITE), + NWidget(WWT_CAPTION, COLOUR_GREY, WID_QS_CAPTION), SetTextStyle(TC_WHITE), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY), NWidget(WWT_EDITBOX, COLOUR_GREY, WID_QS_TEXT), SetMinimalSize(256, 0), SetFill(1, 0), SetPadding(2, 2, 2, 2), @@ -1044,12 +1047,14 @@ struct QueryWindow : public Window { this->SetDirty(); } - void SetStringParameters(WidgetID widget) const override + std::string GetWidgetString(WidgetID widget, StringID stringid) const override { switch (widget) { case WID_Q_CAPTION: - SetDParamStr(0, this->caption.GetDecodedString()); - break; + return this->caption.GetDecodedString(); + + default: + return this->Window::GetWidgetString(widget, stringid); } } @@ -1113,7 +1118,7 @@ struct QueryWindow : public Window { static constexpr NWidgetPart _nested_query_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_RED), - NWidget(WWT_CAPTION, COLOUR_RED, WID_Q_CAPTION), SetStringTip(STR_JUST_RAW_STRING, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), + NWidget(WWT_CAPTION, COLOUR_RED, WID_Q_CAPTION), EndContainer(), NWidget(WWT_PANEL, COLOUR_RED), NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0), SetPadding(WidgetDimensions::unscaled.modalpopup),