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

Merge branch 'departure-boards' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-04-17 16:35:29 +01:00
parent 4955996b35 d2ca8914ac
commit 8e903b0a85
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/departures_gui.cpp
View File

@@ -204,18 +204,32 @@ public:
case WID_DB_SHOW_TRAINS: // Show trains to this station
case WID_DB_SHOW_ROADVEHS: // Show road vehicles to this station
case WID_DB_SHOW_SHIPS: // Show ships to this station
case WID_DB_SHOW_PLANES: // Show aircraft to this station
this->show_types[widget - WID_DB_SHOW_TRAINS] = !this->show_types[widget - WID_DB_SHOW_TRAINS];
if (this->show_types[widget - WID_DB_SHOW_TRAINS]) {
this->LowerWidget(widget);
case WID_DB_SHOW_PLANES: { // Show aircraft to this station
if (_ctrl_pressed) {
for (int w = WID_DB_SHOW_TRAINS; w <= WID_DB_SHOW_PLANES; w++) {
if (w == widget) {
this->show_types[w - WID_DB_SHOW_TRAINS] = true;
this->LowerWidget(w);
} else {
this->show_types[w - WID_DB_SHOW_TRAINS] = false;
this->RaiseWidget(w);
}
}
} else {
this->RaiseWidget(widget);
this->show_types[widget - WID_DB_SHOW_TRAINS] = !this->show_types[widget - WID_DB_SHOW_TRAINS];
if (this->show_types[widget - WID_DB_SHOW_TRAINS]) {
this->LowerWidget(widget);
}
else {
this->RaiseWidget(widget);
}
}
/* We need to recompute the departures list. */
this->calc_tick_countdown = 0;
/* We need to redraw the button that was pressed. */
this->SetWidgetDirty(widget);
break;
}
case WID_DB_SHOW_DEPS:
case WID_DB_SHOW_ARRS:

8
src/lang/english.txt
View File

@@ -3629,10 +3629,10 @@ STR_CARGO_RATING_OUTSTANDING :Outstanding
STR_STATION_VIEW_CENTER_TOOLTIP :{BLACK}Centre main view on station location. Ctrl+Click opens a new viewport on station location
STR_STATION_VIEW_RENAME_TOOLTIP :{BLACK}Change name of station
STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP :{BLACK}Show all trains which have this station on their schedule
STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP :{BLACK}Show all road vehicles which have this station on their schedule
STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP :{BLACK}Show all aircraft which have this station on their schedule
STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP :{BLACK}Show all ships which have this station on their schedule
STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP :{BLACK}Show all trains which have this station on their schedule. Ctrl+Click to show exclusively.
STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP :{BLACK}Show all road vehicles which have this station on their schedule. Ctrl+Click to show exclusively.
STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP :{BLACK}Show all aircraft which have this station on their schedule. Ctrl+Click to show exclusively.
STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP :{BLACK}Show all ships which have this station on their schedule. Ctrl+Click to show exclusively.
STR_STATION_VIEW_RENAME_STATION_CAPTION :Rename station/loading area
STR_STATION_VIEW_CLOSE_AIRPORT :{BLACK}Close airport