From 2267badd280b3cdfbaeb7cc5c2266711430675a0 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 17 Dec 2023 00:01:09 +0000 Subject: [PATCH] Remove "Show cargo type filter in vehicle lists" setting --- src/group_gui.cpp | 4 ---- src/lang/extra/czech.txt | 3 --- src/lang/extra/english.txt | 3 --- src/lang/extra/galician.txt | 3 --- src/lang/extra/german.txt | 3 --- src/lang/extra/korean.txt | 3 --- src/lang/extra/simplified_chinese.txt | 3 --- src/settings.cpp | 9 --------- src/settings_gui.cpp | 1 - src/settings_type.h | 1 - src/table/settings/gui_settings.ini | 9 --------- src/tracerestrict_gui.cpp | 4 ---- src/vehicle_gui.cpp | 14 +------------- src/vehicle_gui_base.h | 1 - 14 files changed, 1 insertion(+), 60 deletions(-) diff --git a/src/group_gui.cpp b/src/group_gui.cpp index c195195dc2..124b76bed8 100644 --- a/src/group_gui.cpp +++ b/src/group_gui.cpp @@ -414,8 +414,6 @@ public: { this->CreateNestedTree(); - this->CheckCargoFilterEnableState(WID_GL_FILTER_BY_CARGO_SEL, false); - this->vscroll = this->GetScrollbar(WID_GL_LIST_VEHICLE_SCROLLBAR); this->group_sb = this->GetScrollbar(WID_GL_LIST_GROUP_SCROLLBAR); @@ -532,8 +530,6 @@ public: HideDropDownMenu(this); } - this->CheckCargoFilterEnableState(WID_GL_FILTER_BY_CARGO_SEL, true); - this->SetDirty(); } diff --git a/src/lang/extra/czech.txt b/src/lang/extra/czech.txt index c7be750606..bf661fa6a4 100644 --- a/src/lang/extra/czech.txt +++ b/src/lang/extra/czech.txt @@ -210,9 +210,6 @@ STR_CONFIG_SETTING_SHOW_PROGSIG_FEATURES_HELPTEXT :Zobrazovat prog STR_CONFIG_SETTING_SHOW_NOENTRYSIG_FEATURES :Návěstidlo zakazující jízdu: {STRING} STR_CONFIG_SETTING_SHOW_NOENTRYSIG_FEATURES_HELPTEXT :Zobrazovat neproměnné návěstidlo zakazující jízdu. Pokud je vypnuto, nejsou tato návěstidla zobrazena, ale ostatním hráčům jsou stále dostupná. -STR_CONFIG_SETTING_SHOW_VEH_LIST_CARGO_FILTER :Zobrazovat filtr typu nákladu v seznamech vozidel: {STRING} -STR_CONFIG_SETTING_SHOW_VEH_LIST_CARGO_FILTER_HELPTEXT :Zobrazovat filtr typu nákladu v seznamech vozidel. Pokud je zapnuto, okna seznamů vozidel obsahují další filtr. - STR_CONFIG_SETTING_SHOW_ADV_LOADING_MODE_FEATURES :Zpřístupnit pokročilé možnosti nakládky: {STRING} STR_CONFIG_SETTING_SHOW_ADV_LOADING_MODE_FEATURES_HELPTEXT :Zpřístupní pokročilé možnosti příkazů k nakládce (postupná nakládka/vykládka nákladních vlaků, směr jízdy silničního vozidla). Pokud je vypnuto, některé možnosti nejsou v rozhraní zobrazeny, ale stále jsou dostupné ostatním hráčům. diff --git a/src/lang/extra/english.txt b/src/lang/extra/english.txt index 6890ebd0a9..4fce724507 100644 --- a/src/lang/extra/english.txt +++ b/src/lang/extra/english.txt @@ -261,9 +261,6 @@ STR_CONFIG_SETTING_SHOW_PROGSIG_FEATURES_HELPTEXT :Show programmab STR_CONFIG_SETTING_SHOW_NOENTRYSIG_FEATURES :Show no-entry signal feature: {STRING2} STR_CONFIG_SETTING_SHOW_NOENTRYSIG_FEATURES_HELPTEXT :Show no-entry signal feature. When disabled, the buttons to build and configure no-entry signals are not shown in the UI, but are still available to all players. -STR_CONFIG_SETTING_SHOW_VEH_LIST_CARGO_FILTER :Show cargo type filter in vehicle lists: {STRING2} -STR_CONFIG_SETTING_SHOW_VEH_LIST_CARGO_FILTER_HELPTEXT :Show cargo type filter in vehicle lists. When enabled vehicle list windows include an additional filter dropdown. - STR_CONFIG_SETTING_SHOW_ADV_LOADING_MODE_FEATURES :Show advanced loading mode features: {STRING2} STR_CONFIG_SETTING_SHOW_ADV_LOADING_MODE_FEATURES_HELPTEXT :Show advanced loading mode features (through load/unload, road vehicle direction). When disabled, some advanced loading mode features are not shown in the UI, but are still available to all players. diff --git a/src/lang/extra/galician.txt b/src/lang/extra/galician.txt index d809a617ae..678595f059 100644 --- a/src/lang/extra/galician.txt +++ b/src/lang/extra/galician.txt @@ -218,9 +218,6 @@ STR_CONFIG_SETTING_SHOW_PROGSIG_FEATURES_HELPTEXT :Amosar a caract STR_CONFIG_SETTING_SHOW_NOENTRYSIG_FEATURES :Amosar a característica de sinais de non-entrada: {STRING} STR_CONFIG_SETTING_SHOW_NOENTRYSIG_FEATURES_HELPTEXT :Amosar a característica de sinais de non-entrada. Cando se desactiva, os botóns de construír e configurar sinais de non-entrada non se amosan na UI, pero seguen dispoñibles para todos os xogadores. -STR_CONFIG_SETTING_SHOW_VEH_LIST_CARGO_FILTER :Amosar o filtro de tipo de carga na lista de vehículos: {STRING} -STR_CONFIG_SETTING_SHOW_VEH_LIST_CARGO_FILTER_HELPTEXT :Amosar o filtro de tipo de carga na lista de vehículos. Cando se activa, a fiestra de lista de vehículos inclúe un filtro adicional desplegable. - STR_CONFIG_SETTING_SHOW_ADV_LOADING_MODE_FEATURES :Amosar características avanzadas de modo de carga: {STRING} STR_CONFIG_SETTING_SHOW_ADV_LOADING_MODE_FEATURES_HELPTEXT :Amosar características avanzadas de modo de carga (a tráves de carga/descarga). Cando se deshabiltia, algunhas características avanzadas de carga non se amosan na UI, pero seguen dispoñibles para todos os xogadores. diff --git a/src/lang/extra/german.txt b/src/lang/extra/german.txt index 8b9780e471..056f83e482 100644 --- a/src/lang/extra/german.txt +++ b/src/lang/extra/german.txt @@ -187,9 +187,6 @@ STR_CONFIG_SETTING_SHOW_ADV_TRACE_RESTRICT_FEATURES_HELPTEXT :Zeige die erwei STR_CONFIG_SETTING_SHOW_PROGSIG_FEATURES :Zeige programmierbares Einfahrtssignal-Feature: {STRING} STR_CONFIG_SETTING_SHOW_PROGSIG_FEATURES_HELPTEXT :Zeige das programmierbares Einfahrtssignal-Feature. Falls deaktiviert, werden die Bedienelemente zum Bau und zur Konfiguration von programmierbaren Einfahrtssignalen zwar nicht in der Oberfläche angezeigt, stehen aber dennoch allen Spielern zur Verfügung. -STR_CONFIG_SETTING_SHOW_VEH_LIST_CARGO_FILTER :Zeige Filterung nach Frachtart in Fahrzeuglisten: {STRING} -STR_CONFIG_SETTING_SHOW_VEH_LIST_CARGO_FILTER_HELPTEXT :Zeige die Filterung nach Frachtart in Fahrzeuglisten. Falls aktiviert, beinhalten die Fahrzeuglisten-Fenster eine weitere Filteroption. - STR_CONFIG_SETTING_SHOW_ADV_LOADING_MODE_FEATURES :Zeige erweiterter Lademodus-Features: {STRING} STR_CONFIG_SETTING_SHOW_ADV_LOADING_MODE_FEATURES_HELPTEXT :Zeige erweiterter Lademodus-Features (durchgehendes Laden/Entladen). Falls deaktiviert, werden einige erweiterte Lademodus-Features zwar nicht in der Oberfläche angezeigt, stehen aber dennoch allen Spielern zur Verfügung. diff --git a/src/lang/extra/korean.txt b/src/lang/extra/korean.txt index 3f66464d4e..ff0f1fea59 100644 --- a/src/lang/extra/korean.txt +++ b/src/lang/extra/korean.txt @@ -218,9 +218,6 @@ STR_CONFIG_SETTING_SHOW_PROGSIG_FEATURES_HELPTEXT :신호기 프 STR_CONFIG_SETTING_SHOW_NOENTRYSIG_FEATURES :진입 금지 신호기 기능 표시: {STRING} STR_CONFIG_SETTING_SHOW_NOENTRYSIG_FEATURES_HELPTEXT :진입 금지 신호기 기능을 표시합니다. 이 설정을 끄면, 진입 금지 신호기를 짓거나 설정하는 버튼이 표시되지 않습니다. 하지만 다른 플레이어까지 진입 금지 신호기를 사용할 수 없도록 하지는 않습니다. -STR_CONFIG_SETTING_SHOW_VEH_LIST_CARGO_FILTER :차량 목록에 화물 종류 필터 표시: {STRING} -STR_CONFIG_SETTING_SHOW_VEH_LIST_CARGO_FILTER_HELPTEXT :차량 목록에 화물 종류 필터를 표시합니다. 이 설정을 켜면, 차량 목록 창에 추가 필터 드롭다운이 표시됩니다. - STR_CONFIG_SETTING_SHOW_ADV_LOADING_MODE_FEATURES :고급 적재 모드 표시: {STRING} STR_CONFIG_SETTING_SHOW_ADV_LOADING_MODE_FEATURES_HELPTEXT :고급 적재 모드(차례로 나눠 싣기)를 표시합니다. 이 설정을 끄면, 일부 고급 적재 모드가 인터페이스에 표시되지 않습니다. 하지만 다른 플레이어까지 고급 적재 모드를 사용할 수 없도록 하지는 않습니다. diff --git a/src/lang/extra/simplified_chinese.txt b/src/lang/extra/simplified_chinese.txt index 3786f1b7ad..aac9fe932a 100644 --- a/src/lang/extra/simplified_chinese.txt +++ b/src/lang/extra/simplified_chinese.txt @@ -218,9 +218,6 @@ STR_CONFIG_SETTING_SHOW_PROGSIG_FEATURES_HELPTEXT :当被禁用时 STR_CONFIG_SETTING_SHOW_NOENTRYSIG_FEATURES :显示禁止进入信号灯功能: {STRING} STR_CONFIG_SETTING_SHOW_NOENTRYSIG_FEATURES_HELPTEXT :当被禁用时，UI不会显示建设和设置禁止进入信号灯的构建选项，但仍可用 -STR_CONFIG_SETTING_SHOW_VEH_LIST_CARGO_FILTER :在载具列表中显示车厢类型过滤器: {STRING} -STR_CONFIG_SETTING_SHOW_VEH_LIST_CARGO_FILTER_HELPTEXT :当被开启时，载具列表窗口将包括一个扩展过滤器下拉列表 - STR_CONFIG_SETTING_SHOW_ADV_LOADING_MODE_FEATURES :显示进阶装载模式功能: {STRING} STR_CONFIG_SETTING_SHOW_ADV_LOADING_MODE_FEATURES_HELPTEXT :展示进阶装载模式功能 (通过装载/卸载、道路车辆方向等) {}当禁用时，一些进阶装载模式功能将不会在用户界面中展示，但仍可用 diff --git a/src/settings.cpp b/src/settings.cpp index 5ae7bbbdd2..09eb79e25e 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1280,15 +1280,6 @@ static void ProgrammableSignalsShownChanged(int32 new_value) InvalidateWindowData(WC_BUILD_SIGNAL, 0); } -static void VehListCargoFilterShownChanged(int32 new_value) -{ - InvalidateWindowClassesData(WC_TRACE_RESTRICT_SLOTS, 0); - InvalidateWindowClassesData(WC_TRAINS_LIST, 0); - InvalidateWindowClassesData(WC_SHIPS_LIST, 0); - InvalidateWindowClassesData(WC_ROADVEH_LIST, 0); - InvalidateWindowClassesData(WC_AIRCRAFT_LIST, 0); -} - static void TownFoundingChanged(int32 new_value) { if (_game_mode != GM_EDITOR && _settings_game.economy.found_town == TF_FORBIDDEN) { diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index a1382e34c9..7ce3bf375c 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -2020,7 +2020,6 @@ static SettingsContainer &GetSettingsTree() vehicle_windows->Add(new SettingEntry("gui.show_train_weight_ratios_in_details")); vehicle_windows->Add(new SettingEntry("gui.show_vehicle_group_in_details")); vehicle_windows->Add(new SettingEntry("gui.show_vehicle_list_company_colour")); - vehicle_windows->Add(new SettingEntry("gui.show_veh_list_cargo_filter")); vehicle_windows->Add(new SettingEntry("gui.show_adv_load_mode_features")); vehicle_windows->Add(new SettingEntry("gui.disable_top_veh_list_mass_actions")); vehicle_windows->Add(new SettingEntry("gui.show_depot_sell_gui")); diff --git a/src/settings_type.h b/src/settings_type.h index 320987fd5e..c873beb30a 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -257,7 +257,6 @@ struct GUISettings : public TimeSettings { bool show_adv_tracerestrict_features; ///< Show advanced trace restrict features in UI bool show_progsig_ui; ///< Show programmable pre-signals feature in UI bool show_noentrysig_ui; ///< Show no-entry signals feature in UI - bool show_veh_list_cargo_filter; ///< Show cargo list filter in UI uint8 osk_activation; ///< Mouse gesture to trigger the OSK. byte starting_colour; ///< default color scheme for the company to start a new game with byte starting_colour_secondary; ///< default secondary color scheme for the company to start a new game with diff --git a/src/table/settings/gui_settings.ini b/src/table/settings/gui_settings.ini index 21302cef75..db533d67c4 100644 --- a/src/table/settings/gui_settings.ini +++ b/src/table/settings/gui_settings.ini @@ -22,7 +22,6 @@ static void ChangeTimetableInTicksMode(int32 new_value); static void InvalidateVehTimetableWindow(int32 new_value); static void ChangeTimeOverrideMode(int32 new_value); static void ProgrammableSignalsShownChanged(int32 new_value); -static void VehListCargoFilterShownChanged(int32 new_value); static void EnableSingleVehSharedOrderGuiChanged(int32 new_value); static void ChangeTrackTypeSortMode(int32 new_value); static void DeveloperModeChanged(int32 new_value); @@ -1394,14 +1393,6 @@ strhelp = STR_CONFIG_SETTING_SHOW_NOENTRYSIG_FEATURES_HELPTEXT post_cb = ProgrammableSignalsShownChanged cat = SC_ADVANCED -[SDTC_BOOL] -var = gui.show_veh_list_cargo_filter -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH -def = true -str = STR_CONFIG_SETTING_SHOW_VEH_LIST_CARGO_FILTER -strhelp = STR_CONFIG_SETTING_SHOW_VEH_LIST_CARGO_FILTER_HELPTEXT -post_cb = VehListCargoFilterShownChanged - [SDTC_BOOL] var = gui.enable_single_veh_shared_order_gui flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_PATCH diff --git a/src/tracerestrict_gui.cpp b/src/tracerestrict_gui.cpp index ace37a1679..d95024eace 100644 --- a/src/tracerestrict_gui.cpp +++ b/src/tracerestrict_gui.cpp @@ -3831,8 +3831,6 @@ public: { this->CreateNestedTree(); - this->CheckCargoFilterEnableState(WID_TRSL_FILTER_BY_CARGO_SEL, false); - this->vscroll = this->GetScrollbar(WID_TRSL_LIST_VEHICLE_SCROLLBAR); this->slot_sb = this->GetScrollbar(WID_TRSL_LIST_SLOTS_SCROLLBAR); this->sorting = &_sorting[GB_NONE].train; @@ -3939,8 +3937,6 @@ public: this->vli.index = ALL_TRAINS_TRACE_RESTRICT_SLOT_ID; } - if (gui_scope) this->CheckCargoFilterEnableState(WID_TRSL_FILTER_BY_CARGO_SEL, true); - this->SetDirty(); } diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 1a33d21b0c..50d992ccc5 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -321,16 +321,6 @@ void BaseVehicleListWindow::FilterVehicleList() } } -void BaseVehicleListWindow::CheckCargoFilterEnableState(int plane_widget, bool re_init, bool possible) -{ - NWidgetStacked *sel = this->GetWidget(plane_widget); - const int plane = (possible && _settings_client.gui.show_veh_list_cargo_filter) ? 0 : SZSP_NONE; - if (plane != sel->shown_plane) { - sel->SetDisplayedPlane(plane); - if (re_init) this->ReInit(); - } -} - /** * Compute the size for the Action dropdown. * @param show_autoreplace If true include the autoreplace item. @@ -2202,7 +2192,7 @@ public: { this->CreateNestedTree(); - this->CheckCargoFilterEnableState(WID_VL_FILTER_BY_CARGO_SEL, false, this->vli.type != VL_SHARED_ORDERS && this->vli.type != VL_SINGLE_VEH); + this->GetWidget(WID_VL_FILTER_BY_CARGO_SEL)->SetDisplayedPlane((this->vli.type == VL_SHARED_ORDERS || this->vli.type == VL_SINGLE_VEH) ? SZSP_NONE : 0); this->vscroll = this->GetScrollbar(WID_VL_SCROLLBAR); @@ -2639,8 +2629,6 @@ public: } else { this->vehgroups.ForceResort(); } - - this->CheckCargoFilterEnableState(WID_VL_FILTER_BY_CARGO_SEL, true, this->vli.type != VL_SHARED_ORDERS && this->vli.type != VL_SINGLE_VEH); } }; diff --git a/src/vehicle_gui_base.h b/src/vehicle_gui_base.h index 20f466f3cc..17e4758e90 100644 --- a/src/vehicle_gui_base.h +++ b/src/vehicle_gui_base.h @@ -135,7 +135,6 @@ public: void FilterVehicleList(); StringID GetCargoFilterLabel(CargoID cid) const; DropDownList BuildCargoDropDownList() const; - void CheckCargoFilterEnableState(int plane_widget, bool re_init, bool possible = true); Dimension GetActionDropdownSize(bool show_autoreplace, bool show_group, bool show_template_replace, StringID change_order_str = 0); DropDownList BuildActionDropdownList(bool show_autoreplace, bool show_group, bool show_template_replace, StringID change_order_str = 0, bool show_create_group = false, bool consider_top_level = false);