From d4f39ea6c25987f5a04f27b7e97531f8ccd8ada0 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Tue, 14 Nov 2023 00:18:47 +0000 Subject: [PATCH] Remove "Show order management button" setting Now always enabled --- src/lang/extra/czech.txt | 5 --- src/lang/extra/english.txt | 5 --- src/lang/extra/galician.txt | 5 --- src/lang/extra/korean.txt | 5 --- src/lang/extra/simplified_chinese.txt | 5 --- src/order_gui.cpp | 51 +++------------------------ src/settings_gui.cpp | 1 - src/settings_type.h | 1 - src/table/settings/settings.ini | 10 ------ src/widgets/order_widget.h | 3 -- 10 files changed, 5 insertions(+), 86 deletions(-) diff --git a/src/lang/extra/czech.txt b/src/lang/extra/czech.txt index b74882b5fb..103f25b2c1 100644 --- a/src/lang/extra/czech.txt +++ b/src/lang/extra/czech.txt @@ -265,9 +265,6 @@ STR_CONFIG_SETTING_DISABLE_WATER_ANIMATION_32X :při zoomu 32x STR_CONFIG_SETTING_SHOW_ORDER_OCCUPANCY_BY_DEFAULT :Zobrazovat obsazenost dle příkazů: {STRING} STR_CONFIG_SETTING_SHOW_ORDER_OCCUPANCY_BY_DEFAULT_HELPTEXT :Po otevření seznamu příkazů vozidla bude zobrazovat, jak je toto vozidlo vytížené během plnění jednotlivých příkazů -STR_CONFIG_SETTING_SHOW_ORDER_MANAGEMENT_BY_DEFAULT :Zobrazit tlačítko správy příkazu: {STRING} -STR_CONFIG_SETTING_SHOW_ORDER_MANAGEMENT_BY_DEFAULT_HELPTEXT :Zobrazí tlačítko "Spravovat příkaz" v okně s příkazy pro vozidlo - STR_CONFIG_SETTING_SHOW_GROUP_HIERARCHY_NAME :Ukazovat v názvu skupin jejich hierarchii: {STRING} STR_CONFIG_SETTING_SHOW_GROUP_HIERARCHY_NAME_HELPTEXT :Je-li zapnuto, názvy skupin budou obsahovat úplnou posloupnost názvů svých nadřazených skupin @@ -1481,8 +1478,6 @@ STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE_AND_SPEED :{LTBLUE}{ENGINE STR_VEHICLE_DETAILS_TRAIN_TOTAL_WEIGHT :{BLACK}Hmotnost: {LTBLUE}{WEIGHT_SHORT} {BLACK}(provozní) - {LTBLUE}{WEIGHT_SHORT} {BLACK}(celková) STR_VEHICLE_DETAILS_TRAIN_MAX_SPEED :{BLACK}Max. rychlost: {LTBLUE}{VELOCITY} {BLACK}(prázdný) - {LTBLUE}{VELOCITY} {BLACK}(plně obsazený) -STR_ORDERS_TOGGLE_MANAGEMENT_BUTTON_TOOLTIP :{BLACK}Přepnout zobrazení tlačítka pro správu příkazů - STR_ORDER_DROP_CARGO_TYPE_LOAD :Naložit podle druhu STR_ORDER_DROP_CARGO_TYPE_UNLOAD :Vyložit podle druhu diff --git a/src/lang/extra/english.txt b/src/lang/extra/english.txt index c565189be6..5e6f5bdd09 100644 --- a/src/lang/extra/english.txt +++ b/src/lang/extra/english.txt @@ -313,9 +313,6 @@ STR_CONFIG_SETTING_DISABLE_WATER_ANIMATION_32X :32x zoom and ab STR_CONFIG_SETTING_SHOW_ORDER_OCCUPANCY_BY_DEFAULT :Show order occupancy by default: {STRING2} STR_CONFIG_SETTING_SHOW_ORDER_OCCUPANCY_BY_DEFAULT_HELPTEXT :Show detailed per-order occupancy by default when opening a vehicle's orders window -STR_CONFIG_SETTING_SHOW_ORDER_MANAGEMENT_BY_DEFAULT :Show order management button: {STRING2} -STR_CONFIG_SETTING_SHOW_ORDER_MANAGEMENT_BY_DEFAULT_HELPTEXT :Show a button for order management in the vehicle order window - STR_CONFIG_SETTING_SHOW_GROUP_HIERARCHY_NAME :Show group hierarchy in name: {STRING2} STR_CONFIG_SETTING_SHOW_GROUP_HIERARCHY_NAME_HELPTEXT :When enabled, group names include the full hierarchy of their parent group names @@ -1553,8 +1550,6 @@ STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE_AND_SPEED :{LTBLUE}{ENGINE STR_VEHICLE_DETAILS_TRAIN_TOTAL_WEIGHT :{BLACK}Total weight: {LTBLUE}{WEIGHT_SHORT} {BLACK}(empty) - {LTBLUE}{WEIGHT_SHORT} {BLACK}(loaded) STR_VEHICLE_DETAILS_TRAIN_MAX_SPEED :{BLACK}Max. speed: {LTBLUE}{VELOCITY} {BLACK}(empty) - {LTBLUE}{VELOCITY} {BLACK}(loaded) -STR_ORDERS_TOGGLE_MANAGEMENT_BUTTON_TOOLTIP :{BLACK}Toggle showing order management button - STR_ORDER_DROP_CARGO_TYPE_LOAD :Load by cargo type STR_ORDER_DROP_CARGO_TYPE_UNLOAD :Unload by cargo type diff --git a/src/lang/extra/galician.txt b/src/lang/extra/galician.txt index 8e622ad005..4bd50a806c 100644 --- a/src/lang/extra/galician.txt +++ b/src/lang/extra/galician.txt @@ -270,9 +270,6 @@ STR_CONFIG_SETTING_DISABLE_WATER_ANIMATION_32X :32x zoom e supe STR_CONFIG_SETTING_SHOW_ORDER_OCCUPANCY_BY_DEFAULT :Amosar a orde de ocupación por defecto: {STRING} STR_CONFIG_SETTING_SHOW_ORDER_OCCUPANCY_BY_DEFAULT_HELPTEXT :Amosar a ocupación detallada por defecto cando se abre a fiestra de ordes do vehículo. -STR_CONFIG_SETTING_SHOW_ORDER_MANAGEMENT_BY_DEFAULT :Amosar o botón de xestión de ordes: {STRING} -STR_CONFIG_SETTING_SHOW_ORDER_MANAGEMENT_BY_DEFAULT_HELPTEXT :Amosa un botón para a xestión de ordes na ventá de ordes do vehículo - STR_CONFIG_SETTING_SHOW_GROUP_HIERARCHY_NAME :Amosar a xerarquía de grupo no nome: {STRING} STR_CONFIG_SETTING_SHOW_GROUP_HIERARCHY_NAME_HELPTEXT :Cando se habilita, os nomes dos grupos incluen a xerarquía completa de grupos superiores. @@ -1496,8 +1493,6 @@ STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE_AND_SPEED :{LTBLUE}{ENGINE STR_VEHICLE_DETAILS_TRAIN_TOTAL_WEIGHT :{BLACK}Peso total: {LTBLUE}{WEIGHT_SHORT} {BLACK}(baleiro) - {LTBLUE}{WEIGHT_SHORT} {BLACK}(cargado) STR_VEHICLE_DETAILS_TRAIN_MAX_SPEED :{BLACK}Velocidade máxima: {LTBLUE}{VELOCITY} {BLACK}(baleiro) - {LTBLUE}{VELOCITY} {BLACK}(cargado) -STR_ORDERS_TOGGLE_MANAGEMENT_BUTTON_TOOLTIP :{BLACK}Alternar amosar o botón de xestión de ordes - STR_ORDER_DROP_CARGO_TYPE_LOAD :Cargar por tipo de cargamento STR_ORDER_DROP_CARGO_TYPE_UNLOAD :Descargar por tipo de cargamento diff --git a/src/lang/extra/korean.txt b/src/lang/extra/korean.txt index e8ee8d5ba3..f51659f519 100644 --- a/src/lang/extra/korean.txt +++ b/src/lang/extra/korean.txt @@ -273,9 +273,6 @@ STR_CONFIG_SETTING_DISABLE_WATER_ANIMATION_32X :32배 확대 STR_CONFIG_SETTING_SHOW_ORDER_OCCUPANCY_BY_DEFAULT :경로 점유율을 기본적으로 표시: {STRING} STR_CONFIG_SETTING_SHOW_ORDER_OCCUPANCY_BY_DEFAULT_HELPTEXT :차량의 경로 창을 열 때 기본적으로 경로 당 상세 점유율을 보여줍니다 -STR_CONFIG_SETTING_SHOW_ORDER_MANAGEMENT_BY_DEFAULT :경로 관리 버튼 표시: {STRING} -STR_CONFIG_SETTING_SHOW_ORDER_MANAGEMENT_BY_DEFAULT_HELPTEXT :차량 경로 창에 경로 관리 버튼을 표시합니다 - STR_CONFIG_SETTING_SHOW_GROUP_HIERARCHY_NAME :이름에 그룹 순서를 모두 표시: {STRING} STR_CONFIG_SETTING_SHOW_GROUP_HIERARCHY_NAME_HELPTEXT :이 설정을 켜면, 그룹 이름에 그 부모 그룹의 이름을 모두 포함시켜서 표시합니다 @@ -1503,8 +1500,6 @@ STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE_AND_SPEED :{LTBLUE}{ENGINE STR_VEHICLE_DETAILS_TRAIN_TOTAL_WEIGHT :{BLACK}총 무게: {LTBLUE}{WEIGHT_SHORT} {BLACK}(빈차) - {LTBLUE}{WEIGHT_SHORT} {BLACK}(가득) STR_VEHICLE_DETAILS_TRAIN_MAX_SPEED :{BLACK}최대 속력: {LTBLUE}{VELOCITY} {BLACK}(빈차) - {LTBLUE}{VELOCITY} {BLACK}(가득) -STR_ORDERS_TOGGLE_MANAGEMENT_BUTTON_TOOLTIP :{BLACK}경로 관리 버튼 보기 전환 - STR_ORDER_DROP_CARGO_TYPE_LOAD :화물 종류에 따라 싣기 STR_ORDER_DROP_CARGO_TYPE_UNLOAD :화물 종류에 따라 하차 diff --git a/src/lang/extra/simplified_chinese.txt b/src/lang/extra/simplified_chinese.txt index 66e4a17d8e..0e35f1ea19 100644 --- a/src/lang/extra/simplified_chinese.txt +++ b/src/lang/extra/simplified_chinese.txt @@ -273,9 +273,6 @@ STR_CONFIG_SETTING_DISABLE_WATER_ANIMATION_32X :32 倍缩放及 STR_CONFIG_SETTING_SHOW_ORDER_OCCUPANCY_BY_DEFAULT :显示调度占用情况作为默认: {STRING} STR_CONFIG_SETTING_SHOW_ORDER_OCCUPANCY_BY_DEFAULT_HELPTEXT :在打开载具的调度窗口时显示详细的每个调度的占用情况作为默认设置。 -STR_CONFIG_SETTING_SHOW_ORDER_MANAGEMENT_BY_DEFAULT :显示调度管理按钮: {STRING} -STR_CONFIG_SETTING_SHOW_ORDER_MANAGEMENT_BY_DEFAULT_HELPTEXT :在载具调度窗口显示用于调度管理的按钮 - STR_CONFIG_SETTING_SHOW_GROUP_HIERARCHY_NAME :在名称中显示分组层级: {STRING} STR_CONFIG_SETTING_SHOW_GROUP_HIERARCHY_NAME_HELPTEXT :当被启用时，组别名称将包括所有父组名 @@ -1502,8 +1499,6 @@ STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE_AND_SPEED :{LTBLUE}{ENGINE STR_VEHICLE_DETAILS_TRAIN_TOTAL_WEIGHT :{BLACK}总重: {LTBLUE}{WEIGHT_SHORT} {BLACK}(空(- {LTBLUE}{WEIGHT_SHORT} {BLACK}(已装载) STR_VEHICLE_DETAILS_TRAIN_MAX_SPEED :{BLACK}最高速度: {LTBLUE}{VELOCITY} {BLACK}(空(- {LTBLUE}{VELOCITY} {BLACK}(已装载) -STR_ORDERS_TOGGLE_MANAGEMENT_BUTTON_TOOLTIP :{BLACK}切换显示调度管理按钮 - STR_ORDER_DROP_CARGO_TYPE_LOAD :以货物类型装载 STR_ORDER_DROP_CARGO_TYPE_UNLOAD :以货物类型卸载 diff --git a/src/order_gui.cpp b/src/order_gui.cpp index d09f5af3cb..7b74abf805 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -1489,10 +1489,6 @@ private: /* WID_O_SEL_COND_AUX3 */ DP_COND_AUX3_STATION = 0, ///< Display station button - /* WID_O_SEL_BOTTOM_LEFT */ - DP_BOTTOM_LEFT_SKIP = 0, ///< Display 'skip' in the left button of the bottom row of the vehicle order window. - DP_BOTTOM_LEFT_MANAGE_LIST = 1, ///< Display 'manage list' in the left button of the bottom row of the vehicle order window. - /* WID_O_SEL_BOTTOM_MIDDLE */ DP_BOTTOM_MIDDLE_DELETE = 0, ///< Display 'delete' in the middle button of the bottom row of the vehicle order window. DP_BOTTOM_MIDDLE_STOP_SHARING = 1, ///< Display 'stop sharing' in the middle button of the bottom row of the vehicle order window. @@ -1850,11 +1846,7 @@ private: int GetOrderManagementPlane() const { - if (_settings_client.gui.show_order_management_button) { - return this->selected_order == this->vehicle->GetNumOrders() ? DP_MGMT_LIST_BTN : DP_MGMT_BTN; - } else { - return SZSP_NONE; - } + return this->selected_order == this->vehicle->GetNumOrders() ? DP_MGMT_LIST_BTN : DP_MGMT_BTN; } public: @@ -2097,13 +2089,6 @@ public: } } - /* skip / extra menu */ - NWidgetStacked *skip_sel = this->GetWidget(WID_O_SEL_BOTTOM_LEFT); - NWidgetLeaf *manage_list_dropdown = this->GetWidget(WID_O_MANAGE_LIST); - skip_sel->SetDisplayedPlane((manage_list_dropdown->IsLowered() || - (!_settings_client.gui.show_order_management_button && _ctrl_pressed && this->selected_order == this->vehicle->GetNumOrders())) - ? DP_BOTTOM_LEFT_MANAGE_LIST : DP_BOTTOM_LEFT_SKIP); - /* First row. */ this->RaiseWidget(WID_O_FULL_LOAD); this->RaiseWidget(WID_O_UNLOAD); @@ -2780,7 +2765,6 @@ public: this->OrderClick_Skip(); break; - case WID_O_MANAGE_LIST: case WID_O_MGMT_LIST_BTN: { uint disabled_mask = (this->vehicle->GetNumOrders() < 2 ? 1 : 0) | (this->vehicle->GetNumOrders() < 3 ? 2 : 0); uint order_count = this->vehicle->GetNumOrders(); @@ -3173,12 +3157,6 @@ public: ShowDropDownList(this, std::move(list), selected, WID_O_DEPARTURE_VIA_TYPE, 0); break; } - - case WID_O_TOGGLE_SIZE: { - _settings_client.gui.show_order_management_button = !_settings_client.gui.show_order_management_button; - InvalidateWindowClassesData(WC_VEHICLE_ORDERS); - break; - } } } @@ -3340,7 +3318,6 @@ public: this->ModifyOrder(this->OrderGetSel(), MOF_DEPARTURES_SUBTYPE | index << 8); break; - case WID_O_MANAGE_LIST: case WID_O_MGMT_LIST_BTN: switch (index) { case 0: this->OrderClick_ReverseOrderList(0); break; @@ -3587,14 +3564,6 @@ public: } } - void OnDropdownClose(Point pt, int widget, int index, bool instant_close) override - { - Window::OnDropdownClose(pt, widget, index, instant_close); - if (this->GetWidget(WID_O_SEL_BOTTOM_LEFT)->shown_plane == DP_BOTTOM_LEFT_MANAGE_LIST) { - this->UpdateButtonState(); - } - } - bool OnTooltip(Point pt, int widget, TooltipCloseCondition close_cond) override { switch (widget) { @@ -3642,7 +3611,6 @@ static const NWidgetPart _nested_orders_train_widgets[] = { NWidget(WWT_CLOSEBOX, COLOUR_GREY), NWidget(WWT_CAPTION, COLOUR_GREY, WID_O_CAPTION), SetDataTip(STR_ORDERS_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), NWidget(WWT_PUSHBTN, COLOUR_GREY, WID_O_TIMETABLE_VIEW), SetMinimalSize(61, 14), SetDataTip(0x0, STR_ORDERS_TIMETABLE_VIEW_TOOLTIP), - NWidget(WWT_IMGBTN, COLOUR_GREY, WID_O_TOGGLE_SIZE), SetDataTip(SPR_LARGE_SMALL_WINDOW, STR_ORDERS_TOGGLE_MANAGEMENT_BUTTON_TOOLTIP), NWidget(WWT_SHADEBOX, COLOUR_GREY), NWidget(WWT_DEFSIZEBOX, COLOUR_GREY), NWidget(WWT_STICKYBOX, COLOUR_GREY), @@ -3763,12 +3731,8 @@ static const NWidgetPart _nested_orders_train_widgets[] = { NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_O_MGMT_LIST_BTN), SetMinimalSize(100, 12), SetFill(1, 0), SetDataTip(STR_ORDERS_MANAGE_LIST, STR_ORDERS_MANAGE_LIST_TOOLTIP), SetResize(1, 0), EndContainer(), - NWidget(NWID_SELECTION, INVALID_COLOUR, WID_O_SEL_BOTTOM_LEFT), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_O_SKIP), SetMinimalSize(100, 12), SetFill(1, 0), - SetDataTip(STR_ORDERS_SKIP_BUTTON, STR_ORDERS_SKIP_TOOLTIP), SetResize(1, 0), - NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_O_MANAGE_LIST), SetMinimalSize(100, 12), SetFill(1, 0), - SetDataTip(STR_ORDERS_MANAGE_LIST, STR_ORDERS_MANAGE_LIST_TOOLTIP), SetResize(1, 0), - EndContainer(), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_O_SKIP), SetMinimalSize(100, 12), SetFill(1, 0), + SetDataTip(STR_ORDERS_SKIP_BUTTON, STR_ORDERS_SKIP_TOOLTIP), SetResize(1, 0), NWidget(NWID_SELECTION, INVALID_COLOUR, WID_O_SEL_BOTTOM_MIDDLE), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_O_DELETE), SetMinimalSize(100, 12), SetFill(1, 0), SetDataTip(STR_ORDERS_DELETE_BUTTON, STR_ORDERS_DELETE_TOOLTIP), SetResize(1, 0), @@ -3796,7 +3760,6 @@ static const NWidgetPart _nested_orders_widgets[] = { NWidget(WWT_CLOSEBOX, COLOUR_GREY), NWidget(WWT_CAPTION, COLOUR_GREY, WID_O_CAPTION), SetDataTip(STR_ORDERS_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), NWidget(WWT_PUSHBTN, COLOUR_GREY, WID_O_TIMETABLE_VIEW), SetMinimalSize(61, 14), SetDataTip(0x0, STR_ORDERS_TIMETABLE_VIEW_TOOLTIP), - NWidget(WWT_IMGBTN, COLOUR_GREY, WID_O_TOGGLE_SIZE), SetDataTip(SPR_LARGE_SMALL_WINDOW, STR_ORDERS_TOGGLE_MANAGEMENT_BUTTON_TOOLTIP), NWidget(WWT_SHADEBOX, COLOUR_GREY), NWidget(WWT_DEFSIZEBOX, COLOUR_GREY), NWidget(WWT_STICKYBOX, COLOUR_GREY), @@ -3921,12 +3884,8 @@ static const NWidgetPart _nested_orders_widgets[] = { NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_O_MGMT_LIST_BTN), SetMinimalSize(100, 12), SetFill(1, 0), SetDataTip(STR_ORDERS_MANAGE_LIST, STR_ORDERS_MANAGE_LIST_TOOLTIP), SetResize(1, 0), EndContainer(), - NWidget(NWID_SELECTION, INVALID_COLOUR, WID_O_SEL_BOTTOM_LEFT), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_O_SKIP), SetMinimalSize(100, 12), SetFill(1, 0), - SetDataTip(STR_ORDERS_SKIP_BUTTON, STR_ORDERS_SKIP_TOOLTIP), SetResize(1, 0), - NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_O_MANAGE_LIST), SetMinimalSize(100, 12), SetFill(1, 0), - SetDataTip(STR_ORDERS_MANAGE_LIST, STR_ORDERS_MANAGE_LIST_TOOLTIP), SetResize(1, 0), - EndContainer(), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_O_SKIP), SetMinimalSize(100, 12), SetFill(1, 0), + SetDataTip(STR_ORDERS_SKIP_BUTTON, STR_ORDERS_SKIP_TOOLTIP), SetResize(1, 0), NWidget(NWID_SELECTION, INVALID_COLOUR, WID_O_SEL_BOTTOM_MIDDLE), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_O_DELETE), SetMinimalSize(100, 12), SetFill(1, 0), SetDataTip(STR_ORDERS_DELETE_BUTTON, STR_ORDERS_DELETE_TOOLTIP), SetResize(1, 0), diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 792f22756e..95b1a824f6 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -2083,7 +2083,6 @@ static SettingsContainer &GetSettingsTree() vehicle_windows->Add(new SettingEntry("gui.dual_pane_train_purchase_window")); vehicle_windows->Add(new ConditionallyHiddenSettingEntry("gui.dual_pane_train_purchase_window_dual_buttons", []() -> bool { return !_settings_client.gui.dual_pane_train_purchase_window; })); vehicle_windows->Add(new SettingEntry("gui.show_order_occupancy_by_default")); - vehicle_windows->Add(new SettingEntry("gui.show_order_management_button")); vehicle_windows->Add(new SettingEntry("gui.show_group_hierarchy_name")); vehicle_windows->Add(new ConditionallyHiddenSettingEntry("gui.show_vehicle_group_hierarchy_name", []() -> bool { return !_settings_client.gui.show_group_hierarchy_name; })); vehicle_windows->Add(new SettingEntry("gui.enable_single_veh_shared_order_gui")); diff --git a/src/settings_type.h b/src/settings_type.h index 83f5d77824..f760d0b7a0 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -282,7 +282,6 @@ struct GUISettings : public TimeSettings { bool allow_hiding_waypoint_labels; ///< Allow hiding waypoint viewport labels uint8 disable_water_animation; ///< Disable water animation depending on zoom level bool show_order_occupancy_by_default; ///< Show order occupancy by default in vehicle order window - bool show_order_management_button; ///< Show order management button in vehicle order window bool show_group_hierarchy_name; ///< Show the full hierarchy in group names bool show_vehicle_group_hierarchy_name;///< Show the full group hierarchy in vehicle names bool show_order_number_vehicle_view; ///< Show order number in vehicle view window diff --git a/src/table/settings/settings.ini b/src/table/settings/settings.ini index 11be797a13..cf46f93a85 100644 --- a/src/table/settings/settings.ini +++ b/src/table/settings/settings.ini @@ -6117,16 +6117,6 @@ strhelp = STR_CONFIG_SETTING_SHOW_ORDER_OCCUPANCY_BY_DEFAULT_HELPTEXT cat = SC_BASIC patchcat = SC_PATCH -[SDTC_BOOL] -var = gui.show_order_management_button -flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC -def = false -str = STR_CONFIG_SETTING_SHOW_ORDER_MANAGEMENT_BY_DEFAULT -strhelp = STR_CONFIG_SETTING_SHOW_ORDER_MANAGEMENT_BY_DEFAULT_HELPTEXT -post_cb = [](auto) { InvalidateWindowClassesData(WC_VEHICLE_ORDERS); } -cat = SC_BASIC -patchcat = SC_PATCH - [SDTC_BOOL] var = gui.show_group_hierarchy_name flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC diff --git a/src/widgets/order_widget.h b/src/widgets/order_widget.h index 03886e440c..bdaace516c 100644 --- a/src/widgets/order_widget.h +++ b/src/widgets/order_widget.h @@ -19,7 +19,6 @@ enum OrderWidgets { WID_O_ORDER_LIST, ///< Order list panel. WID_O_SCROLLBAR, ///< Order list scrollbar. WID_O_SKIP, ///< Skip current order. - WID_O_MANAGE_LIST, ///< Manage order list. WID_O_MGMT_BTN, ///< Management button. WID_O_MGMT_LIST_BTN, ///< Management list button. WID_O_DELETE, ///< Delete selected order. @@ -62,7 +61,6 @@ enum OrderWidgets { WID_O_SEL_TOP_RIGHT, ///< #NWID_SELECTION widget for right part of the top row of the 'your train' order window. WID_O_SEL_TOP_ROW_GROUNDVEHICLE, ///< #NWID_SELECTION widget for the top row of the 'your train' order window. WID_O_SEL_TOP_ROW, ///< #NWID_SELECTION widget for the top row of the 'your non-trains' order window. - WID_O_SEL_BOTTOM_LEFT, ///< #NWID_SELECTION widget for the left part of the bottom row of the 'your train' order window. WID_O_SEL_BOTTOM_MIDDLE, ///< #NWID_SELECTION widget for the middle part of the bottom row of the 'your train' order window. WID_O_SEL_SHARED, ///< #NWID_SELECTION widget for WID_O_SHARED_ORDER_LIST and WID_O_ADD_VEH_GROUP WID_O_SHARED_ORDER_LIST, ///< Open list of shared vehicles. @@ -70,7 +68,6 @@ enum OrderWidgets { WID_O_SEL_OCCUPANCY, ///< #NWID_SELECTION widget for the occupancy list panel. WID_O_OCCUPANCY_LIST, ///< Occupancy list panel. WID_O_OCCUPANCY_TOGGLE, ///< Toggle display of occupancy measures. - WID_O_TOGGLE_SIZE, ///< Toggle show order management button. }; /** Widgets of the #CargoTypeOrdersWindow class. */