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

Merge branch 'departure-boards-sx' into jgrpp

Browse Source 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2015-08-02 18:23:25 +01:00
parent 6596ba216c 6c81f8f35b
commit 6452b0fe02
34 changed files with 2471 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/settings_gui.cpp
View File

@@ -1536,6 +1536,35 @@ static SettingsContainer &GetSettingsTree()
construction->Add(new SettingEntry("gui.disable_unsuitable_building"));
}
SettingsPage *departureboards = interface->Add(new SettingsPage(STR_CONFIG_SETTING_INTERFACE_DEPARTUREBOARDS));
{
departureboards->Add(new SettingEntry("gui.max_departures"));
departureboards->Add(new SettingEntry("gui.max_departure_time"));
departureboards->Add(new SettingEntry("gui.departure_calc_frequency"));
departureboards->Add(new SettingEntry("gui.departure_show_vehicle"));
departureboards->Add(new SettingEntry("gui.departure_show_group"));
departureboards->Add(new SettingEntry("gui.departure_show_company"));
departureboards->Add(new SettingEntry("gui.departure_show_vehicle_type"));
departureboards->Add(new SettingEntry("gui.departure_show_vehicle_color"));
departureboards->Add(new SettingEntry("gui.departure_larger_font"));
departureboards->Add(new SettingEntry("gui.departure_destination_type"));
departureboards->Add(new SettingEntry("gui.departure_show_both"));
departureboards->Add(new SettingEntry("gui.departure_only_passengers"));
departureboards->Add(new SettingEntry("gui.departure_smart_terminus"));
departureboards->Add(new SettingEntry("gui.departure_conditionals"));
departureboards->Add(new SettingEntry("gui.departure_show_all_stops"));
departureboards->Add(new SettingEntry("gui.departure_merge_identical"));
}
SettingsPage *wallclock = interface->Add(new SettingsPage(STR_CONFIG_SETTING_INTERFACE_WALLCLOCK));
{
wallclock->Add(new SettingEntry("gui.time_in_minutes"));
wallclock->Add(new SettingEntry("gui.timetable_start_text_entry"));
wallclock->Add(new SettingEntry("gui.ticks_per_minute"));
wallclock->Add(new SettingEntry("gui.date_with_time"));
wallclock->Add(new SettingEntry("gui.clock_offset"));
}
interface->Add(new SettingEntry("gui.autosave"));
interface->Add(new SettingEntry("gui.toolbar_pos"));
interface->Add(new SettingEntry("gui.statusbar_pos"));