gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-11 00:34:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r25365) -Feature: show cargo by next hops and final destinations in the station GUI

Browse Source
This commit is contained in:
fonsinchen 2013-06-09 13:08:52 +00:00
parent b4ab43be5f
commit 0fc198cb00
6 changed files with 1068 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lang/english.txt
View File

@ -221,6 +221,7 @@ STR_LIST_FILTER_TITLE :{BLACK}Filter s
STR_LIST_FILTER_OSKTITLE :{BLACK}Enter filter string
STR_LIST_FILTER_TOOLTIP :{BLACK}Enter a keyword to filter the list for
STR_TOOLTIP_GROUP_ORDER :{BLACK}Select grouping order
STR_TOOLTIP_SORT_ORDER :{BLACK}Select sorting order (descending/ascending)
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Select sorting criteria
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Select filtering criteria
@ -3013,6 +3014,29 @@ STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Show sta
STR_STATION_VIEW_SUPPLY_RATINGS_TITLE :{BLACK}Monthly supply and local rating:
STR_STATION_VIEW_CARGO_SUPPLY_RATING :{WHITE}{STRING}: {YELLOW}{COMMA} / {STRING} ({COMMA}%)
STR_STATION_VIEW_GROUP :{BLACK}Group by
STR_STATION_VIEW_WAITING_STATION :Station: Waiting
STR_STATION_VIEW_WAITING_AMOUNT :Amount: Waiting
STR_STATION_VIEW_PLANNED_STATION :Station: Planned
STR_STATION_VIEW_PLANNED_AMOUNT :Amount: Planned
STR_STATION_VIEW_FROM :{YELLOW}{CARGO_SHORT} from {STATION}
STR_STATION_VIEW_VIA :{YELLOW}{CARGO_SHORT} via {STATION}
STR_STATION_VIEW_TO :{YELLOW}{CARGO_SHORT} to {STATION}
STR_STATION_VIEW_FROM_ANY :{RED}{CARGO_SHORT} from unknown station
STR_STATION_VIEW_TO_ANY :{RED}{CARGO_SHORT} to any station
STR_STATION_VIEW_VIA_ANY :{RED}{CARGO_SHORT} via any station
STR_STATION_VIEW_FROM_HERE :{GREEN}{CARGO_SHORT} from this station
STR_STATION_VIEW_VIA_HERE :{GREEN}{CARGO_SHORT} stopping at this station
STR_STATION_VIEW_TO_HERE :{GREEN}{CARGO_SHORT} to this station
STR_STATION_VIEW_NONSTOP :{YELLOW}{CARGO_SHORT} non-stop
STR_STATION_VIEW_GROUP_S_V_D :Source-Via-Destination
STR_STATION_VIEW_GROUP_S_D_V :Source-Destination-Via
STR_STATION_VIEW_GROUP_V_S_D :Via-Source-Destination
STR_STATION_VIEW_GROUP_V_D_S :Via-Destination-Source
STR_STATION_VIEW_GROUP_D_S_V :Destination-Source-Via
STR_STATION_VIEW_GROUP_D_V_S :Destination-Via-Source
############ range for rating starts
STR_CARGO_RATING_APPALLING :Appalling
STR_CARGO_RATING_VERY_POOR :Very Poor

4
src/settings_type.h
View File

@ -139,6 +139,10 @@ struct GUISettings {
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.
uint8 station_gui_group_order; ///< the order of grouping cargo entries in the station gui
uint8 station_gui_sort_by; ///< sort cargo entries in the station gui by station name or amount
uint8 station_gui_sort_order; ///< the sort order of entries in the station gui - ascending or descending
#ifdef ENABLE_NETWORK
uint16 network_chat_box_width; ///< width of the chat box in pixels
uint8 network_chat_box_height; ///< height of the chat box in lines

4
src/station_cmd.cpp
View File

@ -2285,7 +2285,7 @@ CommandCost CmdBuildAirport(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
st->RecomputeIndustriesNear();
InvalidateWindowData(WC_SELECT_STATION, 0, 0);
InvalidateWindowData(WC_STATION_LIST, st->owner, 0);
InvalidateWindowData(WC_STATION_VIEW, st->index);
InvalidateWindowData(WC_STATION_VIEW, st->index, -1);
if (_settings_game.economy.station_noise_level) {
SetWindowDirty(WC_TOWN_VIEW, st->town->index);
@ -2361,7 +2361,7 @@ static CommandCost RemoveAirport(TileIndex tile, DoCommandFlag flags)
st->airport.Clear();
st->facilities &= ~FACIL_AIRPORT;
InvalidateWindowData(WC_STATION_VIEW, st->index);
InvalidateWindowData(WC_STATION_VIEW, st->index, -1);
if (_settings_game.economy.station_noise_level) {
SetWindowDirty(WC_TOWN_VIEW, st->town->index);

1139
src/station_gui.cpp
View File

File diff suppressed because it is too large Load Diff

27
src/table/settings.ini
View File

@ -2944,6 +2944,33 @@ str = STR_CONFIG_SETTING_EXPENSES_LAYOUT
strhelp = STR_CONFIG_SETTING_EXPENSES_LAYOUT_HELPTEXT
proc = RedrawScreen
[SDTC_VAR]
var = gui.station_gui_group_order
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = 0
min = 0
max = 5
interval = 1
[SDTC_VAR]
var = gui.station_gui_sort_by
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = 0
min = 0
max = 3
interval = 1
[SDTC_VAR]
var = gui.station_gui_sort_order
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = 0
min = 0
max = 1
interval = 1
[SDTC_VAR]
var = gui.missing_strings_threshold
type = SLE_UINT8

4
src/widgets/station_widget.h
View File

@ -15,6 +15,10 @@
/** Widgets of the #StationViewWindow class. */
enum StationViewWidgets {
WID_SV_CAPTION, ///< Caption of the window.
WID_SV_SORT_ORDER, ///< 'Sort order' button
WID_SV_SORT_BY, ///< 'Sort by' button
WID_SV_GROUP, ///< label for "group by"
WID_SV_GROUP_BY, ///< 'Group by' button
WID_SV_WAITING, ///< List of waiting cargo.
WID_SV_SCROLLBAR, ///< Scrollbar.
WID_SV_ACCEPT_RATING_LIST, ///< List of accepted cargoes / rating of cargoes.