Merge branch 'tracerestrict-sx' into jgrpp

# Conflicts:
#	src/command.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/vehiclelist.cpp
#	src/window_type.h

src/vehicle_gui_base.h

@@ -35,6 +35,7 @@ struct BaseVehicleListWindow : public Window {
 		ADI_REMOVE_ALL,
 		ADI_CHANGE_ORDER,
 		ADI_CREATE_GROUP,
+		ADI_TRACERESTRICT_SLOT_MGMT,
 	};
 
 	static const StringID vehicle_depot_name[];
@@ -53,6 +54,7 @@ struct BaseVehicleListWindow : public Window {
 	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 ShouldShowActionDropdownList() const;
 };
 
 uint GetVehicleListHeight(VehicleType type, uint divisor = 1);