dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust string names for label orders

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-04-09 17:10:00 +01:00
parent 339a8b14c5
commit 17e289015e
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lang/extra/english.txt
View File

@@ -906,8 +906,6 @@ STR_TRACE_RESTRICT_COUNTER_SET :Set
STR_TRACE_RESTRICT_COUNTER_INCREASE_ITEM :Increase counter: {STRING1} by {COMMA} STR_TRACE_RESTRICT_COUNTER_INCREASE_ITEM :Increase counter: {STRING1} by {COMMA}
STR_TRACE_RESTRICT_COUNTER_DECREASE_ITEM :Decrease counter: {STRING1} by {COMMA} STR_TRACE_RESTRICT_COUNTER_DECREASE_ITEM :Decrease counter: {STRING1} by {COMMA}
STR_TRACE_RESTRICT_COUNTER_SET_ITEM :Set counter: {STRING1} to {COMMA} STR_TRACE_RESTRICT_COUNTER_SET_ITEM :Set counter: {STRING1} to {COMMA}
STR_TRACE_RESTRICT_LABEL_TEXT :Label: {RAW_STRING}
STR_TRACE_RESTRICT_LABEL_DEPARTURES_VIA :Departure board: Show as via: {STRING1}
STR_TRACE_RESTRICT_TRAIN_STATUS_EMPTY :empty STR_TRACE_RESTRICT_TRAIN_STATUS_EMPTY :empty
STR_TRACE_RESTRICT_TRAIN_STATUS_FULL :full STR_TRACE_RESTRICT_TRAIN_STATUS_FULL :full
STR_TRACE_RESTRICT_TRAIN_STATUS_BROKEN_DOWN :broken down STR_TRACE_RESTRICT_TRAIN_STATUS_BROKEN_DOWN :broken down
@@ -1558,10 +1556,12 @@ STR_ORDER_RELEASE_SLOT_TOOLTIP :{BLACK}The trai
STR_ORDER_CHANGE_COUNTER_TOOLTIP :{BLACK}The counter to change STR_ORDER_CHANGE_COUNTER_TOOLTIP :{BLACK}The counter to change
STR_ORDER_TEXT_LABEL_CAPTION :{WHITE}Label STR_ORDER_LABEL_TEXT :Label: {RAW_STRING}
STR_ORDER_TEXT_LABEL_BUTTON :Label STR_ORDER_LABEL_TEXT_CAPTION :{WHITE}Label
STR_ORDER_DEPARTURES_VIA_LABEL_BUTTON :Departure board via STR_ORDER_LABEL_TEXT_BUTTON :Label
STR_ORDER_TEXT_LABEL_BUTTON_TOOLTIP :{BLACK}Change label text STR_ORDER_LABEL_TEXT_BUTTON_TOOLTIP :{BLACK}Change label text
STR_ORDER_LABEL_DEPARTURES_VIA_BUTTON :Departure board via
STR_ORDER_LABEL_DEPARTURES_VIA :Departure board: Show as via: {STRING1}
STR_ORDERS_OCCUPANCY_BUTTON :{BLACK}{STRING2}% STR_ORDERS_OCCUPANCY_BUTTON :{BLACK}{STRING2}%
STR_ORDERS_OCCUPANCY_BUTTON_TOOLTIP :{BLACK}Show occupancy running averages{}The percentage shown is the overall average of the order occupancies STR_ORDERS_OCCUPANCY_BUTTON_TOOLTIP :{BLACK}Show occupancy running averages{}The percentage shown is the overall average of the order occupancies

18
src/order_gui.cpp
View File

@@ -626,8 +626,8 @@ static const StringID _order_goto_dropdown[] = {
STR_ORDER_SHARE, STR_ORDER_SHARE,
STR_ORDER_RELEASE_SLOT_BUTTON, STR_ORDER_RELEASE_SLOT_BUTTON,
STR_ORDER_CHANGE_COUNTER_BUTTON, STR_ORDER_CHANGE_COUNTER_BUTTON,
STR_ORDER_TEXT_LABEL_BUTTON, STR_ORDER_LABEL_TEXT_BUTTON,
STR_ORDER_DEPARTURES_VIA_LABEL_BUTTON, STR_ORDER_LABEL_DEPARTURES_VIA_BUTTON,
INVALID_STRING_ID INVALID_STRING_ID
}; };
@@ -638,8 +638,8 @@ static const StringID _order_goto_dropdown_aircraft[] = {
STR_ORDER_SHARE, STR_ORDER_SHARE,
STR_ORDER_RELEASE_SLOT_BUTTON, STR_ORDER_RELEASE_SLOT_BUTTON,
STR_ORDER_CHANGE_COUNTER_BUTTON, STR_ORDER_CHANGE_COUNTER_BUTTON,
STR_ORDER_TEXT_LABEL_BUTTON, STR_ORDER_LABEL_TEXT_BUTTON,
STR_ORDER_DEPARTURES_VIA_LABEL_BUTTON, STR_ORDER_LABEL_DEPARTURES_VIA_BUTTON,
INVALID_STRING_ID INVALID_STRING_ID
}; };
@@ -1167,14 +1167,14 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int
case OT_LABEL: case OT_LABEL:
switch (order->GetLabelSubType()) { switch (order->GetLabelSubType()) {
case OLST_TEXT: { case OLST_TEXT: {
SetDParam(0, STR_TRACE_RESTRICT_LABEL_TEXT); SetDParam(0, STR_ORDER_LABEL_TEXT);
const char *text = order->GetLabelText(); const char *text = order->GetLabelText();
SetDParamStr(1, StrEmpty(text) ? "" : text); SetDParamStr(1, StrEmpty(text) ? "" : text);
break; break;
} }
case OLST_DEPARTURES_VIA: case OLST_DEPARTURES_VIA:
SetDParam(0, STR_TRACE_RESTRICT_LABEL_DEPARTURES_VIA); SetDParam(0, STR_ORDER_LABEL_DEPARTURES_VIA);
if (Waypoint::IsValidID(order->GetDestination())) { if (Waypoint::IsValidID(order->GetDestination())) {
SetDParam(1, STR_WAYPOINT_NAME); SetDParam(1, STR_WAYPOINT_NAME);
} else { } else {
@@ -2999,7 +2999,7 @@ public:
const Order *order = this->vehicle->GetOrder(this->OrderGetSel()); const Order *order = this->vehicle->GetOrder(this->OrderGetSel());
this->query_text_widget = widget; this->query_text_widget = widget;
SetDParamStr(0, order->GetLabelText()); SetDParamStr(0, order->GetLabelText());
ShowQueryString(STR_JUST_RAW_STRING, STR_ORDER_TEXT_LABEL_CAPTION, NUM_CARGO - 1, this, CS_ALPHANUMERAL, QSF_NONE); ShowQueryString(STR_JUST_RAW_STRING, STR_ORDER_LABEL_TEXT_CAPTION, NUM_CARGO - 1, this, CS_ALPHANUMERAL, QSF_NONE);
break; break;
} }
@@ -3543,7 +3543,7 @@ static const NWidgetPart _nested_orders_train_widgets[] = {
NWidget(WWT_PANEL, COLOUR_GREY), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY), EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY), EndContainer(),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_O_TEXT_LABEL), SetMinimalSize(124, 12), SetFill(1, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_O_TEXT_LABEL), SetMinimalSize(124, 12), SetFill(1, 0),
SetDataTip(STR_ORDER_TEXT_LABEL_BUTTON, STR_ORDER_TEXT_LABEL_BUTTON_TOOLTIP), SetResize(1, 0), SetDataTip(STR_ORDER_LABEL_TEXT_BUTTON, STR_ORDER_LABEL_TEXT_BUTTON_TOOLTIP), SetResize(1, 0),
EndContainer(), EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY), SetFill(1, 0), SetResize(1, 0), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY), SetFill(1, 0), SetResize(1, 0), EndContainer(),
EndContainer(), EndContainer(),
@@ -3687,7 +3687,7 @@ static const NWidgetPart _nested_orders_widgets[] = {
NWidget(WWT_PANEL, COLOUR_GREY), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY), EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY), EndContainer(),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_O_TEXT_LABEL), SetMinimalSize(124, 12), SetFill(1, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_O_TEXT_LABEL), SetMinimalSize(124, 12), SetFill(1, 0),
SetDataTip(STR_ORDER_TEXT_LABEL_BUTTON, STR_ORDER_TEXT_LABEL_BUTTON_TOOLTIP), SetResize(1, 0), SetDataTip(STR_ORDER_LABEL_TEXT_BUTTON, STR_ORDER_LABEL_TEXT_BUTTON_TOOLTIP), SetResize(1, 0),
EndContainer(), EndContainer(),
/* No buttons */ /* No buttons */