From 8f01ae675e2f536ac42ac32ab8f21fd9b4fbb9ec Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Tue, 24 Jun 2025 19:18:08 +0100 Subject: [PATCH] Revert 0853c1979b: Button to toggle showing advanced signal types (#9617) (#14219) --- src/lang/english.txt | 1 - src/rail_gui.cpp | 7 ------- src/widgets/rail_widget.h | 1 - 3 files changed, 9 deletions(-) diff --git a/src/lang/english.txt b/src/lang/english.txt index 30c6848c6c..2fd8d027b9 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -2861,7 +2861,6 @@ STR_STATION_CLASS_WAYP_WAYPOINT :Default waypoin # Signal window STR_BUILD_SIGNAL_CAPTION :{WHITE}Signal Selection -STR_BUILD_SIGNAL_TOGGLE_ADVANCED_SIGNAL_TOOLTIP :{BLACK}Toggle showing advanced signal types STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP :{BLACK}Block Signal (semaphore){}This is the most basic type of signal, allowing only one train to be in the same block at the same time STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP :{BLACK}Entry Signal (semaphore){}Green as long as there is one or more green exit-signal from the following section of track. Otherwise it shows red STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP :{BLACK}Exit Signal (semaphore){}Behaves in the same way as a block signal but is necessary to trigger the correct colour on entry & combo pre-signals diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index 6d859033c1..291039204a 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -1600,12 +1600,6 @@ public: } break; - case WID_BS_TOGGLE_SIZE: - _settings_client.gui.signal_gui_mode = (_settings_client.gui.signal_gui_mode == SIGNAL_GUI_ALL) ? SIGNAL_GUI_PATH : SIGNAL_GUI_ALL; - this->SetSignalUIMode(); - this->ReInit(); - break; - default: break; } @@ -1635,7 +1629,6 @@ static constexpr NWidgetPart _nested_signal_builder_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_DARK_GREEN), NWidget(WWT_CAPTION, COLOUR_DARK_GREEN, WID_BS_CAPTION), SetStringTip(STR_BUILD_SIGNAL_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_BS_TOGGLE_SIZE), SetSpriteTip(SPR_LARGE_SMALL_WINDOW, STR_BUILD_SIGNAL_TOGGLE_ADVANCED_SIGNAL_TOOLTIP), SetAspect(WidgetDimensions::ASPECT_TOGGLE_SIZE), EndContainer(), /* Container for both signal groups, spacers, and convert/autofill buttons. */ diff --git a/src/widgets/rail_widget.h b/src/widgets/rail_widget.h index f90280c52b..f290d80162 100644 --- a/src/widgets/rail_widget.h +++ b/src/widgets/rail_widget.h @@ -67,7 +67,6 @@ enum BuildRailStationWidgets : WidgetID { /** Widgets of the #BuildSignalWindow class. */ enum BuildSignalWidgets : WidgetID { WID_BS_CAPTION, ///< Caption for the Signal Selection window. - WID_BS_TOGGLE_SIZE, ///< Toggle showing advanced signal types. WID_BS_SEMAPHORE_NORM, ///< Build a semaphore normal block signal. WID_BS_SEMAPHORE_ENTRY, ///< Build a semaphore entry block signal. WID_BS_SEMAPHORE_EXIT, ///< Build a semaphore exit block signal.