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

Remove some unnecessary colour strings

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-06-01 00:14:37 +01:00
parent 40a9f19c20
commit 326d0c329c
11 changed files with 15 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lang/extra/czech.txt
View File

@@ -579,7 +579,7 @@ STR_PROGSIG_COND_NEVER :nikdy
STR_PROGSIG_COND_COMPARE :{STRING} {STRING} {NUM}
STR_PROGSIG_COND_SIGNAL_STATE :stav návěstidla
STR_PROGSIG_CONDVAR_SIGNAL_STATE_SPECIFIED :návěstidlo na {NUM} x {NUM} je zelený
STR_PROGSIG_CONDVAR_SIGNAL_STATE_UNSPECIFIED :{RED}nespecifikované návěstidlo{STRING} je zelený
STR_PROGSIG_CONDVAR_SIGNAL_STATE_UNSPECIFIED :{PUSH_COLOUR}{RED}nespecifikované návěstidlo{POP_COLOUR} je zelený
STR_PROGSIG_CONDVAR_NUM_RED :červených návěstidel
STR_PROGSIG_CONDVAR_NUM_GREEN :zelených návěstidel

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

@@ -1119,7 +1119,7 @@ STR_PROGSIG_COND_SLOT :slot occupancy
STR_PROGSIG_COND_SLOT_REMAINING :slot occupancy remaining
STR_PROGSIG_COND_COUNTER :counter value
STR_PROGSIG_CONDVAR_SIGNAL_STATE_SPECIFIED :signal at {NUM} x {NUM} is green
STR_PROGSIG_CONDVAR_SIGNAL_STATE_UNSPECIFIED :{RED}unspecified signal{STRING} is green
STR_PROGSIG_CONDVAR_SIGNAL_STATE_UNSPECIFIED :{PUSH_COLOUR}{RED}unspecified signal{POP_COLOUR} is green
STR_PROGSIG_CONDVAR_NUM_RED :red signals
STR_PROGSIG_CONDVAR_NUM_GREEN :green signals
@@ -1825,15 +1825,8 @@ STR_JUST_VELOCITY :{VELOCITY}
STR_JUST_TT_TICKS :{TT_TICKS}
STR_JUST_TT_TICKS_LONG :{TT_TICKS_LONG}
STR_BLACK_DECIMAL :{BLACK}{DECIMAL}
STR_WHITE_DATE_WALLCLOCK_LONG :{WHITE}{DATE_WALLCLOCK_LONG}
STR_WHITE_DATE_WALLCLOCK_SHORT :{WHITE}{DATE_WALLCLOCK_SHORT}
STR_BLACK_TIME_HHMM :{BLACK}{TIME_HHMM}
STR_RED_INT :{RED}{NUM}
STR_BLACK_STRING1 :{BLACK}{STRING1}
STR_BLACK_PLUS :{BLACK}+
STR_WHITE :{WHITE}
STR_BLACK :{BLACK}
STR_DECIMAL1_WITH_SCALE :{DECIMAL1} ({DECIMAL}x)

9
src/lang/extra/galician.txt
View File

@@ -1084,7 +1084,7 @@ STR_PROGSIG_COND_SLOT :Ocupación do s
STR_PROGSIG_COND_SLOT_REMAINING :Ocupación do slot restante
STR_PROGSIG_COND_COUNTER :Valor do contador
STR_PROGSIG_CONDVAR_SIGNAL_STATE_SPECIFIED :o sinal en {NUM} x {NUM} está en verde
STR_PROGSIG_CONDVAR_SIGNAL_STATE_UNSPECIFIED :{RED}sinal non especificado{STRING} está en verde
STR_PROGSIG_CONDVAR_SIGNAL_STATE_UNSPECIFIED :{PUSH_COLOUR}{RED}sinal non especificado{POP_COLOUR} está en verde
STR_PROGSIG_CONDVAR_NUM_RED :sinais vermellos
STR_PROGSIG_CONDVAR_NUM_GREEN :sinais verdes
@@ -1786,15 +1786,8 @@ STR_JUST_VELOCITY :{VELOCITY}
STR_JUST_TT_TICKS :{TT_TICKS}
STR_JUST_TT_TICKS_LONG :{TT_TICKS_LONG}
STR_BLACK_DECIMAL :{BLACK}{DECIMAL}
STR_WHITE_DATE_WALLCLOCK_LONG :{WHITE}{DATE_WALLCLOCK_LONG}
STR_WHITE_DATE_WALLCLOCK_SHORT :{WHITE}{DATE_WALLCLOCK_SHORT}
STR_BLACK_TIME_HHMM :{BLACK}{TIME_HHMM}
STR_RED_INT :{RED}{NUM}
STR_BLACK_STRING1 :{BLACK}{STRING}
STR_BLACK_PLUS :{BLACK}+
STR_WHITE :{WHITE}
STR_BLACK :{BLACK}
STR_DECIMAL1_WITH_SCALE :{DECIMAL1} ({DECIMAL}x)

8
src/lang/extra/german.txt
View File

@@ -1008,7 +1008,7 @@ STR_PROGSIG_COND_SLOT :Slotauslastung
STR_PROGSIG_COND_SLOT_REMAINING :Verfügbare Slotkapazität
STR_PROGSIG_COND_COUNTER :Zählerwert
STR_PROGSIG_CONDVAR_SIGNAL_STATE_SPECIFIED :Signal auf {NUM} x {NUM} ist Grün
STR_PROGSIG_CONDVAR_SIGNAL_STATE_UNSPECIFIED :{RED}undefiniertes Signal{STRING} ist Grün
STR_PROGSIG_CONDVAR_SIGNAL_STATE_UNSPECIFIED :{PUSH_COLOUR}{RED}undefiniertes Signal{POP_COLOUR} ist Grün
STR_PROGSIG_CONDVAR_NUM_RED :rote Signale
STR_PROGSIG_CONDVAR_NUM_GREEN :grüne Signale
@@ -1645,14 +1645,8 @@ STR_JUST_TIME_HHMM :{TIME_HHMM}
STR_JUST_STRING1 :{STRING}
STR_JUST_STRING2 :{STRING}
STR_BLACK_DECIMAL :{BLACK}{DECIMAL}
STR_WHITE_DATE_WALLCLOCK_LONG :{WHITE}{DATE_WALLCLOCK_LONG}
STR_WHITE_DATE_WALLCLOCK_SHORT :{WHITE}{DATE_WALLCLOCK_SHORT}
STR_BLACK_TIME_HHMM :{BLACK}{TIME_HHMM}
STR_RED_INT :{RED}{NUM}
STR_BLACK_PLUS :{BLACK}+
STR_WHITE :{WHITE}
STR_BLACK :{BLACK}
STR_ZONING_TOOLBAR :{WHITE}Bereiche anzeigen
STR_ZONING_OUTER :{BLACK}Außenkante der Kachel:

9
src/lang/extra/korean.txt
View File

@@ -1084,7 +1084,7 @@ STR_PROGSIG_COND_SLOT :슬롯 사용
STR_PROGSIG_COND_SLOT_REMAINING :남은 슬롯 사용량
STR_PROGSIG_COND_COUNTER :카운터 값
STR_PROGSIG_CONDVAR_SIGNAL_STATE_SPECIFIED :{NUM} x {NUM} 에 위치한 신호기가 초록색
STR_PROGSIG_CONDVAR_SIGNAL_STATE_UNSPECIFIED :{RED}정해지지 않은 신호기{STRING} 가 초록색
STR_PROGSIG_CONDVAR_SIGNAL_STATE_UNSPECIFIED :{PUSH_COLOUR}{RED}정해지지 않은 신호기{POP_COLOUR} 가 초록색
STR_PROGSIG_CONDVAR_NUM_RED :빨간 신호
STR_PROGSIG_CONDVAR_NUM_GREEN :초록 신호
@@ -1787,15 +1787,8 @@ STR_JUST_VELOCITY :{VELOCITY}
STR_JUST_TT_TICKS :{TT_TICKS}
STR_JUST_TT_TICKS_LONG :{TT_TICKS_LONG}
STR_BLACK_DECIMAL :{BLACK}{DECIMAL}
STR_WHITE_DATE_WALLCLOCK_LONG :{WHITE}{DATE_WALLCLOCK_LONG}
STR_WHITE_DATE_WALLCLOCK_SHORT :{WHITE}{DATE_WALLCLOCK_SHORT}
STR_BLACK_TIME_HHMM :{BLACK}{TIME_HHMM}
STR_RED_INT :{RED}{NUM}
STR_BLACK_STRING1 :{BLACK}{STRING}
STR_BLACK_PLUS :{BLACK}+
STR_WHITE :{WHITE}
STR_BLACK :{BLACK}
STR_DECIMAL1_WITH_SCALE :{DECIMAL1} (x{DECIMAL})

9
src/lang/extra/simplified_chinese.txt
View File

@@ -1057,7 +1057,7 @@ STR_PROGSIG_COND_SLOT :条目占用
STR_PROGSIG_COND_SLOT_REMAINING :条目占用剩余
STR_PROGSIG_COND_COUNTER :计数器值
STR_PROGSIG_CONDVAR_SIGNAL_STATE_SPECIFIED :在{NUM} x {NUM}的信号是绿灯
STR_PROGSIG_CONDVAR_SIGNAL_STATE_UNSPECIFIED :{RED}未特别指定的信号{STRING}是绿灯
STR_PROGSIG_CONDVAR_SIGNAL_STATE_UNSPECIFIED :{PUSH_COLOUR}{RED}未特别指定的信号{POP_COLOUR}是绿灯
STR_PROGSIG_CONDVAR_NUM_RED :红灯
STR_PROGSIG_CONDVAR_NUM_GREEN :绿灯
@@ -1730,15 +1730,8 @@ STR_JUST_TIME_HHMM :{TIME_HHMM}
STR_JUST_STRING1 :{STRING}
STR_JUST_STRING2 :{STRING}
STR_BLACK_DECIMAL :{BLACK}{DECIMAL}
STR_WHITE_DATE_WALLCLOCK_LONG :{WHITE}{DATE_WALLCLOCK_LONG}
STR_WHITE_DATE_WALLCLOCK_SHORT :{WHITE}{DATE_WALLCLOCK_SHORT}
STR_BLACK_TIME_HHMM :{BLACK}{TIME_HHMM}
STR_RED_INT :{RED}{NUM}
STR_BLACK_STRING1 :{BLACK}{STRING}
STR_BLACK_PLUS :{BLACK}+
STR_WHITE :{WHITE}
STR_BLACK :{BLACK}
STR_DECIMAL1_WITH_SCALE :{DECIMAL1}（{DECIMAL}x）

4
src/order_gui.cpp
View File

@@ -2222,7 +2222,7 @@ public:
this->GetWidget<NWidgetCore>(WID_O_COND_TIMETABLE)->widget_data = STR_TRACE_RESTRICT_TIMETABLE_LATENESS + order->GetConditionValue();
aux_sel->SetDisplayedPlane(DP_COND_TIMETABLE);
} else if (is_sched_dispatch) {
this->GetWidget<NWidgetCore>(WID_O_COND_SCHED_SELECT)->widget_data = STR_BLACK_STRING1;
this->GetWidget<NWidgetCore>(WID_O_COND_SCHED_SELECT)->widget_data = STR_JUST_STRING1;
aux_sel->SetDisplayedPlane(DP_COND_SCHED_SELECT);
} else {
aux_sel->SetDisplayedPlane(SZSP_NONE);
@@ -2240,7 +2240,7 @@ public:
/* Set the strings for the dropdown boxes. */
this->GetWidget<NWidgetCore>(WID_O_COND_VARIABLE)->widget_data = OrderStringForVariable(this->vehicle, ocv);
this->GetWidget<NWidgetCore>(WID_O_COND_COMPARATOR)->widget_data = GetComparatorStrings(this->vehicle, order)[order->GetConditionComparator()];
this->GetWidget<NWidgetCore>(WID_O_COND_VALUE)->widget_data = (ocv == OCV_TIME_DATE && order->GetConditionValue() == TRTDVF_HOUR_MINUTE) ? STR_BLACK_TIME_HHMM : STR_JUST_COMMA;
this->GetWidget<NWidgetCore>(WID_O_COND_VALUE)->widget_data = (ocv == OCV_TIME_DATE && order->GetConditionValue() == TRTDVF_HOUR_MINUTE) ? STR_JUST_TIME_HHMM : STR_JUST_COMMA;
this->SetWidgetDisabledState(WID_O_COND_COMPARATOR, ocv == OCV_UNCONDITIONALLY || ocv == OCV_PERCENT);
this->SetWidgetDisabledState(WID_O_COND_VALUE, ocv == OCV_REQUIRES_SERVICE || ocv == OCV_UNCONDITIONALLY);
break;

5
src/programmable_signals_gui.cpp
View File

@@ -139,7 +139,7 @@ static const StringID _program_sigstate[] = {
};
/** Get the string for a condition */
static char *GetConditionString(SignalCondition *cond, char *buf, char *buflast, bool selected)
static char *GetConditionString(SignalCondition *cond, char *buf, char *buflast)
{
StringID string = INVALID_STRING_ID;
if (cond->ConditionCode() == PSC_SLOT_OCC || cond->ConditionCode() == PSC_SLOT_OCC_REM) {
@@ -180,7 +180,6 @@ static char *GetConditionString(SignalCondition *cond, char *buf, char *buflast,
SetDParam(1, TileY(sig_cond->sig_tile));
} else {
string = STR_PROGSIG_CONDVAR_SIGNAL_STATE_UNSPECIFIED;
SetDParam(0, selected ? STR_WHITE : STR_BLACK);
}
}
}
@@ -213,7 +212,7 @@ static void DrawInstructionString(SignalInstruction *instruction, int y, bool se
case PSO_IF: {
SignalIf *if_ins = static_cast<SignalIf*>(instruction);
GetConditionString(if_ins->condition, condstr, lastof(condstr), selected);
GetConditionString(if_ins->condition, condstr, lastof(condstr));
SetDParamStr(0, condstr);
instruction_string = STR_PROGSIG_IF;
break;

4
src/statusbar_gui.cpp
View File

@@ -115,7 +115,7 @@ struct StatusBarWindow : Window {
switch (widget) {
case WID_S_LEFT:
SetDParam(0, DateToScaledDateTicks(MAX_YEAR * DAYS_IN_YEAR));
d = GetStringBoundingBox(STR_WHITE_DATE_WALLCLOCK_LONG);
d = GetStringBoundingBox(STR_JUST_DATE_WALLCLOCK_LONG);
break;
case WID_S_RIGHT: {
@@ -143,7 +143,7 @@ struct StatusBarWindow : Window {
case WID_S_LEFT:
/* Draw the date */
SetDParam(0, _scaled_date_ticks);
DrawString(tr, STR_JUST_DATE_LONG, TC_WHITE, SA_HOR_CENTER);
DrawString(tr, STR_JUST_DATE_WALLCLOCK_LONG, TC_WHITE, SA_HOR_CENTER);
break;
case WID_S_RIGHT: {

2
src/town_gui.cpp
View File

@@ -70,7 +70,7 @@ static const NWidgetPart _nested_town_authority_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(NWID_SELECTION, INVALID_COLOUR, WID_TA_BTN_SEL),
NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TA_EXECUTE), SetMinimalSize(317, 12), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_LOCAL_AUTHORITY_DO_IT_BUTTON, STR_LOCAL_AUTHORITY_DO_IT_TOOLTIP),
NWidget(WWT_DROPDOWN, COLOUR_BROWN, WID_TA_SETTING), SetMinimalSize(317, 12), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_BLACK_STRING1, STR_LOCAL_AUTHORITY_SETTING_OVERRIDE_TOOLTIP),
NWidget(WWT_DROPDOWN, COLOUR_BROWN, WID_TA_SETTING), SetMinimalSize(317, 12), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_JUST_STRING1, STR_LOCAL_AUTHORITY_SETTING_OVERRIDE_TOOLTIP),
EndContainer(),
NWidget(WWT_RESIZEBOX, COLOUR_BROWN),
EndContainer()

4
src/tracerestrict_gui.cpp
View File

@@ -2648,7 +2648,7 @@ public:
TraceRestrictItem item = this->GetSelected();
TraceRestrictValueType type = GetTraceRestrictTypeProperties(item).value_type;
if (type == TRVT_TIME_DATE_INT && GetTraceRestrictValue(item) == TRTDVF_HOUR_MINUTE) {
SetDParam(0, STR_BLACK_TIME_HHMM);
SetDParam(0, STR_JUST_TIME_HHMM);
}
SetDParam(1, 0);
if (IsIntegerValueType(type)) {
@@ -3550,7 +3550,7 @@ static const NWidgetPart _nested_program_widgets[] = {
NWidget(WWT_TEXTBTN, COLOUR_GREY, TR_WIDGET_VALUE_INT), SetMinimalSize(124, 12), SetFill(1, 0),
SetDataTip(STR_JUST_STRING1, STR_TRACE_RESTRICT_COND_VALUE_TOOLTIP), SetResize(1, 0),
NWidget(WWT_TEXTBTN, COLOUR_GREY, TR_WIDGET_VALUE_DECIMAL), SetMinimalSize(124, 12), SetFill(1, 0),
SetDataTip(STR_BLACK_DECIMAL, STR_TRACE_RESTRICT_COND_VALUE_TOOLTIP), SetResize(1, 0),
SetDataTip(STR_JUST_DECIMAL, STR_TRACE_RESTRICT_COND_VALUE_TOOLTIP), SetResize(1, 0),
NWidget(WWT_DROPDOWN, COLOUR_GREY, TR_WIDGET_VALUE_DROPDOWN), SetMinimalSize(124, 12), SetFill(1, 0),
SetDataTip(STR_NULL, STR_TRACE_RESTRICT_COND_VALUE_TOOLTIP), SetResize(1, 0),
NWidget(WWT_TEXTBTN, COLOUR_GREY, TR_WIDGET_VALUE_DEST), SetMinimalSize(124, 12), SetFill(1, 0),