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

Revert "Temporarily mark dual pane train purchase window as experimental"

Browse Source 
This reverts commit f9bb004b05.
This commit is contained in:
Jonathan G Rennison
2021-08-04 17:34:50 +01:00
parent d2dc9fe3d4
commit e76c5dfda7
5 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/build_vehicle_gui.cpp
View File

@@ -92,7 +92,7 @@ static const NWidgetPart _nested_build_vehicle_widgets[] = {
static const NWidgetPart _nested_build_vehicle_widgets_train_advanced[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_GREY, WID_BV_CAPTION), SetDataTip(STR_BUY_VEHICLE_ADV_WINDOW_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
NWidget(WWT_CAPTION, COLOUR_GREY, WID_BV_CAPTION), SetDataTip(STR_WHITE_STRING, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
NWidget(WWT_SHADEBOX, COLOUR_GREY),
NWidget(WWT_DEFSIZEBOX, COLOUR_GREY),
NWidget(WWT_STICKYBOX, COLOUR_GREY),
@@ -2743,7 +2743,7 @@ void ShowBuildVehicleWindow(const TileIndex tile, const VehicleType type)
DeleteWindowById(WC_BUILD_VEHICLE, num);
if (type == VEH_TRAIN && _settings_client.gui.experimental_dual_pane_train_purchase_window) {
if (type == VEH_TRAIN && _settings_client.gui.dual_pane_train_purchase_window) {
new BuildVehicleWindowTrainAdvanced(&_build_vehicle_desc_train_advanced, tile, nullptr);
} else {
new BuildVehicleWindow(&_build_vehicle_desc, tile, type, nullptr);
@@ -2756,7 +2756,7 @@ void ShowTemplateTrainBuildVehicleWindow(Train **virtual_train)
DeleteWindowById(WC_BUILD_VIRTUAL_TRAIN, 0);
if (_settings_client.gui.experimental_dual_pane_train_purchase_window) {
if (_settings_client.gui.dual_pane_train_purchase_window) {
new BuildVehicleWindowTrainAdvanced(&_build_template_vehicle_desc_advanced, INVALID_TILE, virtual_train);
} else {
new BuildVehicleWindow(&_build_template_vehicle_desc, INVALID_TILE, VEH_TRAIN, virtual_train);

4
src/lang/english.txt
View File

@@ -1480,7 +1480,7 @@ 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 :Experimental - Separate locomotives and wagons in train purchase window: {STRING2}
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}
@@ -4678,8 +4678,6 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK}Toggle h
STR_BUY_VEHICLE_SHIP_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK}Toggle hiding/displaying of the ship type
STR_BUY_VEHICLE_AIRCRAFT_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK}Toggle hiding/displaying of the aircraft type
STR_BUY_VEHICLE_ADV_WINDOW_CAPTION :{WHITE}{STRING} (Experimental)
STR_QUERY_RENAME_TRAIN_TYPE_CAPTION :{WHITE}Rename train vehicle type
STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION :{WHITE}Rename road vehicle type
STR_QUERY_RENAME_SHIP_TYPE_CAPTION :{WHITE}Rename ship type

2
src/settings_gui.cpp
View File

@@ -1842,7 +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.experimental_dual_pane_train_purchase_window"));
interface->Add(new SettingEntry("gui.dual_pane_train_purchase_window"));
}
SettingsPage *advisors = main->Add(new SettingsPage(STR_CONFIG_SETTING_ADVISORS));

2
src/settings_type.h
View File

@@ -223,7 +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 experimental_dual_pane_train_purchase_window; ///< Dual pane train purchase window
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.

5
src/table/settings.ini
View File

@@ -5551,12 +5551,11 @@ strval = STR_CONFIG_SETTING_DEMOLISH_CONFIRM_MODE_OFF
cat = SC_BASIC
[SDTC_BOOL]
var = gui.experimental_dual_pane_train_purchase_window
var = gui.dual_pane_train_purchase_window
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = false
def = true
str = STR_CONFIG_SETTING_DUAL_PANE_TRAIN_PURCHASE_WINDOW
strhelp = STR_CONFIG_SETTING_DUAL_PANE_TRAIN_PURCHASE_WINDOW_HELPTEXT
cat = SC_EXPERT
; For the dedicated build we'll enable dates in logs by default.
[SDTC_BOOL]