Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #287 from VacuumBreather/advanced_train_purchase_window

Browse Source 
Advanced train purchase window
pull/295/head
Jonathan G Rennison 3 years ago committed by GitHub
parent dab1501b7c dd5866c2c2
commit 0773dde669
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 1287 additions and 75 deletions
Show Stats Download Patch File Download Diff File

1282
src/build_vehicle_gui.cpp
View File

File diff suppressed because it is too large Load Diff

20
src/lang/english.txt
Unescape Escape View File

@ -1476,6 +1476,9 @@ STR_CONFIG_SETTING_DEMOLISH_CONFIRM_MODE_OFF :Off
STR_CONFIG_SETTING_DEMOLISH_CONFIRM_MODE_INDUSTRY :Industries
STR_CONFIG_SETTING_DEMOLISH_CONFIRM_MODE_ALL :Industries and rail stations
STR_CONFIG_SETTING_DUAL_PANE_TRAIN_PURCHASE_WINDOW :Separate locomotives and wagons in train purchase window: {STRING2}
STR_CONFIG_SETTING_DUAL_PANE_TRAIN_PURCHASE_WINDOW_HELPTEXT :When enabled, the train purchase window shows locomotives and wagons in separate side-by-side lists.
STR_CONFIG_SETTING_ADV_SIG_BRIDGE_TUN_MODES :Enable signals on bridges/tunnels advanced modes: {STRING2}
STR_CONFIG_SETTING_ADV_SIG_BRIDGE_TUN_MODES_HELPTEXT :Enables use of advanced modes of signal simulation on bridges and tunnels. When disabled, bridges/tunnels which are not already in an advanced mode cannot be changed to an advanced mode, however other players may choose to enable this setting and use an advanced mode.
@ -4569,6 +4572,9 @@ STR_BUY_VEHICLE_SHIP_CAPTION :New Ships
STR_BUY_VEHICLE_AIRCRAFT_CAPTION :New Aircraft
############ range for vehicle availability ends
STR_BUY_VEHICLE_TRAIN_LOCOMOTIVES :Locomotives and Power Cars
STR_BUY_VEHICLE_TRAIN_WAGONS :Wagons
STR_PURCHASE_INFO_COST_WEIGHT :{BLACK}Cost: {GOLD}{CURRENCY_LONG}{BLACK} Weight: {GOLD}{WEIGHT_SHORT}
STR_PURCHASE_INFO_COST_REFIT_WEIGHT :{BLACK}Cost: {GOLD}{CURRENCY_LONG}{BLACK} (Refit Cost: {GOLD}{CURRENCY_LONG}{BLACK}) Weight: {GOLD}{WEIGHT_SHORT}
STR_PURCHASE_INFO_SPEED_POWER :{BLACK}Speed: {GOLD}{VELOCITY}{BLACK} Power: {GOLD}{POWER}
@ -4610,31 +4616,43 @@ STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON :{BLACK}Buy Vehi
STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON :{BLACK}Buy Vehicle
STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON :{BLACK}Buy Ship
STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON :{BLACK}Buy Aircraft
STR_BUY_VEHICLE_TRAIN_BUY_LOCOMOTIVE_BUTTON :{BLACK}Buy Locomotive
STR_BUY_VEHICLE_TRAIN_BUY_WAGON_BUTTON :{BLACK}Buy Wagon
STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Buy and Refit Vehicle
STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Buy and Refit Vehicle
STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Buy and Refit Ship
STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Buy and Refit Aircraft
STR_BUY_VEHICLE_TRAIN_BUY_REFIT_LOCOMOTIVE_BUTTON :{BLACK}Buy and Refit Locomotive
STR_BUY_VEHICLE_TRAIN_BUY_REFIT_WAGON_BUTTON :{BLACK}Buy and Refit Wagon
STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP :{BLACK}Buy the highlighted train vehicle. Shift+Click shows estimated cost without purchase
STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP :{BLACK}Buy the highlighted road vehicle. Shift+Click shows estimated cost without purchase
STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP :{BLACK}Buy the highlighted ship. Shift+Click shows estimated cost without purchase
STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP :{BLACK}Buy the highlighted aircraft. Shift+Click shows estimated cost without purchase
STR_BUY_VEHICLE_TRAIN_BUY_LOCOMOTIVE_TOOLTIP :{BLACK}Buy the highlighted locomotive or power car. Shift+Click shows estimated cost without purchase
STR_BUY_VEHICLE_TRAIN_BUY_WAGON_TOOLTIP :{BLACK}Buy the highlighted wagon. Shift+Click shows estimated cost without purchase
STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Buy and refit the highlighted train vehicle. Shift+Click shows estimated cost without purchase
STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Buy and refit the highlighted road vehicle. Shift+Click shows estimated cost without purchase
STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Buy and refit the highlighted ship. Shift+Click shows estimated cost without purchase
STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Buy and refit the highlighted aircraft. Shift+Click shows estimated cost without purchase
STR_BUY_VEHICLE_TRAIN_BUY_REFIT_LOCOMOTIVE_TOOLTIP :{BLACK}Buy and refit the highlighted locomotive or power car. Shift+Click shows estimated cost without purchase
STR_BUY_VEHICLE_TRAIN_BUY_REFIT_WAGON_TOOLTIP :{BLACK}Buy and refit the highlighted wagon. Shift+Click shows estimated cost without purchase
STR_BUY_VEHICLE_TRAIN_RENAME_BUTTON :{BLACK}Rename
STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON :{BLACK}Rename
STR_BUY_VEHICLE_SHIP_RENAME_BUTTON :{BLACK}Rename
STR_BUY_VEHICLE_AIRCRAFT_RENAME_BUTTON :{BLACK}Rename
STR_BUY_VEHICLE_TRAIN_RENAME_LOCOMOTIVE_BUTTON :{BLACK}Rename Locomotive
STR_BUY_VEHICLE_TRAIN_RENAME_WAGON_BUTTON :{BLACK}Rename Wagon
STR_BUY_VEHICLE_TRAIN_RENAME_TOOLTIP :{BLACK}Rename train vehicle type
STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP :{BLACK}Rename road vehicle type
STR_BUY_VEHICLE_SHIP_RENAME_TOOLTIP :{BLACK}Rename ship type
STR_BUY_VEHICLE_AIRCRAFT_RENAME_TOOLTIP :{BLACK}Rename aircraft type
STR_BUY_VEHICLE_TRAIN_RENAME_LOCOMOTIVE_TOOLTIP :{BLACK}Rename locomotive or power car
STR_BUY_VEHICLE_TRAIN_RENAME_WAGON_TOOLTIP :{BLACK}Rename wagon
STR_BUY_VEHICLE_TRAIN_HIDE_TOGGLE_BUTTON :{BLACK}Hide
STR_BUY_VEHICLE_ROAD_VEHICLE_HIDE_TOGGLE_BUTTON :{BLACK}Hide
@ -4655,6 +4673,8 @@ STR_QUERY_RENAME_TRAIN_TYPE_CAPTION :{WHITE}Rename t
STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION :{WHITE}Rename road vehicle type
STR_QUERY_RENAME_SHIP_TYPE_CAPTION :{WHITE}Rename ship type
STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION :{WHITE}Rename aircraft type
STR_QUERY_RENAME_TRAIN_TYPE_LOCOMOTIVE_CAPTION :{WHITE}Rename locomotive type
STR_QUERY_RENAME_TRAIN_TYPE_WAGON_CAPTION :{WHITE}Rename wagon type
# Depot window
STR_DEPOT_CAPTION :{WHITE}{DEPOT}

25
src/lang/german.txt
Unescape Escape View File

@ -613,6 +613,11 @@ STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}Zeige ke
STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Diagrammschalter für Frachttyp ein/aus
STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING}
STR_GRAPH_CARGO_DAYS_MODE :{TINY_FONT}{BLACK}Tage unterwegs
STR_GRAPH_CARGO_SPEED_MODE :{TINY_FONT}{BLACK}Durchschnittsgeschwindigkeit
STR_GRAPH_CARGO_TOOLTIP_DAYS_MODE :{BLACK}Lieferzeit auf X-Achse des Diagramms anzeigen
STR_GRAPH_CARGO_TOOLTIP_SPEED_MODE :{BLACK}Durchschnittsgeschwindigkeit auf X-Achse des Diagramms anzeigen
STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}Zeige detailierte Leistungsaufschlüsselung
# Graph key window
@ -884,6 +889,7 @@ STR_NEWS_TRAIN_IS_STUCK :{WHITE}{VEHICLE
STR_NEWS_VEHICLE_IS_LOST :{WHITE}{VEHICLE} hat sich verirrt
STR_NEWS_VEHICLE_IS_UNPROFITABLE :{WHITE}Der Ertrag von {VEHICLE} lag im letzten Jahr bei{}{CURRENCY_LONG}
STR_NEWS_AIRCRAFT_DEST_TOO_FAR :{WHITE}{VEHICLE} kann sein Ziel nicht erreichen, da es außer Reichweite liegt
STR_NEWS_TRAIN_OVERSHOT_STATION :{WHITE}{VEHICLE} konnte wegen zu hoher Geschwindigkeit nicht bei {STRING} anhalten
STR_NEWS_ORDER_REFIT_FAILED :{WHITE}Umrüstung fehlgeschlagen bei {VEHICLE}
STR_NEWS_VEHICLE_AUTORENEW_FAILED :{WHITE}Automatisches Ersetzen für {VEHICLE} fehlgeschlagen{}{STRING}
@ -4426,6 +4432,9 @@ STR_BUY_VEHICLE_SHIP_CAPTION :Neue Schiffe
STR_BUY_VEHICLE_AIRCRAFT_CAPTION :Neue Flugzeuge
############ range for vehicle availability ends
STR_BUY_VEHICLE_TRAIN_LOCOMOTIVES :Lokomotiven und Triebköpfe
STR_BUY_VEHICLE_TRAIN_WAGONS :Waggons
STR_PURCHASE_INFO_COST_WEIGHT :{BLACK}Kosten: {GOLD}{CURRENCY_LONG}{BLACK} Gewicht: {GOLD}{WEIGHT_SHORT}
STR_PURCHASE_INFO_COST_REFIT_WEIGHT :{BLACK}Kosten: {GOLD}{CURRENCY_LONG}{BLACK} (Umrüstkosten: {GOLD}{CURRENCY_LONG}{BLACK}) Gewicht: {GOLD}{WEIGHT_SHORT}
STR_PURCHASE_INFO_SPEED_POWER :{BLACK}Geschw.: {GOLD}{VELOCITY}{BLACK} Leistung: {GOLD}{POWER}
@ -4468,30 +4477,40 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON :{BLACK}Fahrzeug
STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON :{BLACK}Schiff kaufen
STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON :{BLACK}Flugzeug kaufen
STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_BUTTON :Fahrzeug kaufen und umrüsten
STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Fahrzeug kaufen und umrüsten
STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Fahrzeug kaufen und umrüsten
STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Schiff kaufen und umrüsten
STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_BUTTON :Flugzeug kaufen und umrüsten
STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Flugzeug kaufen und umrüsten
STR_BUY_VEHICLE_TRAIN_BUY_REFIT_LOCOMOTIVE_BUTTON :{BLACK}Lokomotive kaufen und umrüsten
STR_BUY_VEHICLE_TRAIN_BUY_REFIT_WAGON_BUTTON :{BLACK}Waggon kaufen und umrüsten
STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP :{BLACK}Ausgewähltes Fahrzeug kaufen. Shift+Klick zeigt einen Kostenvoranschlag
STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP :{BLACK}Ausgewähltes Fahrzeug kaufen. Umschalt+Klick zeigt einen Kostenvoranschlag
STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP :{BLACK}Ausgewähltes Schiff kaufen. Umschalt+Klick zeigt einen Kostenvoranschlag
STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP :{BLACK}Augewähltes Flugzeug kaufen. Shift+Klick zeigt einen Kostenvoranschlag
STR_BUY_VEHICLE_TRAIN_BUY_LOCOMOTIVE_TOOLTIP :{BLACK}Augewählte Lokomotive oder Triebkopf kaufen. Shift+Klick zeigt einen Kostenvoranschlag
STR_BUY_VEHICLE_TRAIN_BUY_WAGON_TOOLTIP :{BLACK}Augewählten Waggon kaufen. Shift+Klick zeigt einen Kostenvoranschlag
STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Ausgewähltes Fahrzeug kaufen und umrüsten. Umschalt+Klick zeigt einen Kostenvoranschlag
STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Ausgewähltes Straßenfahrzeug kaufen und umrüsten. Umschalt+Klick zeigt einen Kostenvoranschlag
STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Ausgewähltes Schiff kaufen und umrüsten. Umschalt+Klick zeigt einen Kostenvoranschlag
STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Ausgewähltes Flugzeug kaufen und umrüsten. Umschalt+Klick zeigt einen Kostenvoranschlag
STR_BUY_VEHICLE_TRAIN_BUY_REFIT_LOCOMOTIVE_TOOLTIP :{BLACK}Augewählte Lokomotive oder Triebkopf kaufen und umrüsten. Umschalt+Klick zeigt einen Kostenvoranschlag
STR_BUY_VEHICLE_TRAIN_BUY_REFIT_WAGON_TOOLTIP :{BLACK}Augewählten Waggon kaufen und umrüsten. Umschalt+Klick zeigt einen Kostenvoranschlag
STR_BUY_VEHICLE_TRAIN_RENAME_BUTTON :{BLACK}Umbenennen
STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON :{BLACK}Umbenennen
STR_BUY_VEHICLE_SHIP_RENAME_BUTTON :{BLACK}Umbenennen
STR_BUY_VEHICLE_AIRCRAFT_RENAME_BUTTON :{BLACK}Umbenennen
STR_BUY_VEHICLE_TRAIN_RENAME_LOCOMOTIVE_BUTTON :{BLACK}Lokomotive umbenennen
STR_BUY_VEHICLE_TRAIN_RENAME_WAGON_BUTTON :{BLACK}Waggon umbenennen
STR_BUY_VEHICLE_TRAIN_RENAME_TOOLTIP :{BLACK}Umbenennen der Waggontypen
STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP :{BLACK}Fahrzeug umbenennen
STR_BUY_VEHICLE_SHIP_RENAME_TOOLTIP :{BLACK}Schiff umbenennen
STR_BUY_VEHICLE_AIRCRAFT_RENAME_TOOLTIP :{BLACK}Flugzeug umbenennen
STR_BUY_VEHICLE_TRAIN_RENAME_LOCOMOTIVE_TOOLTIP :{BLACK}Lokomotive oder Triebkopf umbenennen
STR_BUY_VEHICLE_TRAIN_RENAME_WAGON_TOOLTIP :{BLACK}Waggon umbenennen
STR_BUY_VEHICLE_TRAIN_HIDE_TOGGLE_BUTTON :{BLACK}Ausblenden
STR_BUY_VEHICLE_ROAD_VEHICLE_HIDE_TOGGLE_BUTTON :{BLACK}Ausblenden
@ -4512,6 +4531,8 @@ STR_QUERY_RENAME_TRAIN_TYPE_CAPTION :{WHITE}Zugtyp u
STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION :{WHITE}Fahrzeug umbenennen
STR_QUERY_RENAME_SHIP_TYPE_CAPTION :{WHITE}Schiff umbenennen
STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION :{WHITE}Flugzeug umbenennen
STR_QUERY_RENAME_TRAIN_TYPE_LOCOMOTIVE_CAPTION :{WHITE}Lokomotive umbenennen
STR_QUERY_RENAME_TRAIN_TYPE_WAGON_CAPTION :{WHITE}Waggon umbenennen
# Depot window
STR_DEPOT_CAPTION :{WHITE}{DEPOT}

1
src/settings_gui.cpp
Unescape Escape View File

@ -1842,6 +1842,7 @@ static SettingsContainer &GetSettingsTree()
interface->Add(new SettingEntry("gui.open_vehicle_gui_clone_share"));
interface->Add(new SettingEntry("gui.vehicle_names"));
interface->Add(new SettingEntry("gui.station_rating_tooltip_mode"));
interface->Add(new SettingEntry("gui.dual_pane_train_purchase_window"));
}
SettingsPage *advisors = main->Add(new SettingsPage(STR_CONFIG_SETTING_ADVISORS));

1
src/settings_type.h
Unescape Escape View File

@ -223,6 +223,7 @@ struct GUISettings : public TimeSettings {
bool shade_trees_on_slopes; ///< Shade trees on slopes
uint8 station_rating_tooltip_mode; ///< Station rating tooltip mode
uint8 demolish_confirm_mode; ///< Demolition confirmation mode
bool dual_pane_train_purchase_window; ///< Dual pane train purchase window
uint16 console_backlog_timeout; ///< the minimum amount of time items should be in the console backlog before they will be removed in ~3 seconds granularity.
uint16 console_backlog_length; ///< the minimum amount of items in the console backlog before items will be removed.

7
src/table/settings.ini
Unescape Escape View File

@ -5539,6 +5539,13 @@ strhelp = STR_CONFIG_SETTING_DEMOLISH_CONFIRM_MODE_HELPTEXT
strval = STR_CONFIG_SETTING_DEMOLISH_CONFIRM_MODE_OFF
cat = SC_BASIC
[SDTC_BOOL]
var = gui.dual_pane_train_purchase_window
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = true
str = STR_CONFIG_SETTING_DUAL_PANE_TRAIN_PURCHASE_WINDOW
strhelp = STR_CONFIG_SETTING_DUAL_PANE_TRAIN_PURCHASE_WINDOW_HELPTEXT
; For the dedicated build we'll enable dates in logs by default.
[SDTC_BOOL]
ifdef = DEDICATED

26
src/widgets/build_vehicle_widget.h
Unescape Escape View File

@ -24,6 +24,32 @@ enum BuildVehicleWidgets {
WID_BV_SHOW_HIDE, ///< Button to hide or show the selected engine.
WID_BV_BUILD_SEL, ///< Build button.
WID_BV_RENAME, ///< Rename button.
WID_BV_CAPTION_LOCO, ///< Caption of locomotive half of the window.
WID_BV_SORT_ASSENDING_DESCENDING_LOCO, ///< Sort direction.
WID_BV_SORT_DROPDOWN_LOCO, ///< Criteria of sorting dropdown.
WID_BV_CARGO_FILTER_DROPDOWN_LOCO, ///< Cargo filter dropdown.
WID_BV_SHOW_HIDDEN_LOCOS, ///< Toggle whether to display the hidden locomotives.
WID_BV_LIST_LOCO, ///< List of vehicles.
WID_BV_SCROLLBAR_LOCO, ///< Scrollbar of list.
WID_BV_PANEL_LOCO, ///< Button panel.
WID_BV_SHOW_HIDE_LOCO, ///< Button to hide or show the selected locomotives.
WID_BV_BUILD_LOCO, ///< Build panel.
WID_BV_BUILD_SEL_LOCO, ///< Build button.
WID_BV_RENAME_LOCO, ///< Rename button.
WID_BV_CAPTION_WAGON, ///< Caption of wagon half of the window.
WID_BV_SORT_ASSENDING_DESCENDING_WAGON, ///< Sort direction.
WID_BV_SORT_DROPDOWN_WAGON, ///< Criteria of sorting dropdown.
WID_BV_CARGO_FILTER_DROPDOWN_WAGON, ///< Cargo filter dropdown.
WID_BV_SHOW_HIDDEN_WAGONS, ///< Toggle whether to display the hidden wagons.
WID_BV_LIST_WAGON, ///< List of vehicles.
WID_BV_SCROLLBAR_WAGON, ///< Scrollbar of list.
WID_BV_PANEL_WAGON, ///< Button panel.
WID_BV_SHOW_HIDE_WAGON, ///< Button to hide or show the selected wagons.
WID_BV_BUILD_WAGON, ///< Build panel.
WID_BV_BUILD_SEL_WAGON, ///< Build button.
WID_BV_RENAME_WAGON, ///< Rename button.
};
#endif /* WIDGETS_BUILD_VEHICLE_WIDGET_H */

Write Preview
Loading…
Cancel
Save