mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r8420) -Codechange (r7418): Rename the 'New <vehtype>' button of the global vehicle lists to 'Available <vehtype>' as it is a view-only list, not one from which you can purchase (rolling) stock.

release/0.6
Darkvater 2007-01-26 19:24:02 +00:00
parent 6fd747adbb
commit 1b47b17450
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lang/english.txt
View File

@ -394,6 +394,10 @@ STR_ENGINE_SORT_CARGO_CAPACITY :Cargo Capacity
STR_NO_WAITING_CARGO :{BLACK}No cargo of any type is waiting STR_NO_WAITING_CARGO :{BLACK}No cargo of any type is waiting
STR_SELECT_ALL_FACILITIES :{BLACK}Select all facilities STR_SELECT_ALL_FACILITIES :{BLACK}Select all facilities
STR_SELECT_ALL_TYPES :{BLACK}Select all cargo types (including no waiting cargo) STR_SELECT_ALL_TYPES :{BLACK}Select all cargo types (including no waiting cargo)
STR_AVAILABLE_TRAINS :{BLACK}Available Trains
STR_AVAILABLE_VEHICLES :{BLACK}Available Vehicles
STR_AVAILABLE_SHIPS :{BLACK}Available Ships
STR_AVAILABLE_AIRCRAFT :{BLACK}Available Aircraft
STR_AVAILABLE_ENGINES_TIP :{BLACK}See a list of available engine designs for this vehicle type. STR_AVAILABLE_ENGINES_TIP :{BLACK}See a list of available engine designs for this vehicle type.
STR_MANAGE_LIST :{BLACK}Manage list STR_MANAGE_LIST :{BLACK}Manage list
STR_MANAGE_LIST_TIP :{BLACK}Send instructions to all vehicles in this list STR_MANAGE_LIST_TIP :{BLACK}Send instructions to all vehicles in this list

16
src/vehicle_gui.cpp
View File

@ -767,7 +767,7 @@ enum VehicleListWindowWidgets {
VLW_WIDGET_LIST, VLW_WIDGET_LIST,
VLW_WIDGET_SCROLLBAR, VLW_WIDGET_SCROLLBAR,
VLW_WIDGET_OTHER_PLAYER_FILLER, VLW_WIDGET_OTHER_PLAYER_FILLER,
VLW_WIDGET_NEW_VEHICLES, VLW_WIDGET_AVAILABLE_VEHICLES,
VLW_WIDGET_MANAGE_VEHICLES, VLW_WIDGET_MANAGE_VEHICLES,
VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN, VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN,
VLW_WIDGET_STOP_ALL, VLW_WIDGET_STOP_ALL,
@ -815,10 +815,10 @@ static void CreateVehicleListWindow(Window *w)
* Some windows contains actions only fit for the owner */ * Some windows contains actions only fit for the owner */
if (player == _local_player) { if (player == _local_player) {
HideWindowWidget(w, VLW_WIDGET_OTHER_PLAYER_FILLER); HideWindowWidget(w, VLW_WIDGET_OTHER_PLAYER_FILLER);
SetWindowWidgetDisabledState(w, VLW_WIDGET_NEW_VEHICLES, window_type != VLW_STANDARD); SetWindowWidgetDisabledState(w, VLW_WIDGET_AVAILABLE_VEHICLES, window_type != VLW_STANDARD);
} else { } else {
SetWindowWidgetsHiddenState(w, true, SetWindowWidgetsHiddenState(w, true,
VLW_WIDGET_NEW_VEHICLES, VLW_WIDGET_AVAILABLE_VEHICLES,
VLW_WIDGET_MANAGE_VEHICLES, VLW_WIDGET_MANAGE_VEHICLES,
VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN, VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN,
VLW_WIDGET_STOP_ALL, VLW_WIDGET_STOP_ALL,
@ -831,22 +831,22 @@ static void CreateVehicleListWindow(Window *w)
switch (vl->vehicle_type) { switch (vl->vehicle_type) {
case VEH_Train: case VEH_Train:
w->widget[VLW_WIDGET_LIST].tooltips = STR_883D_TRAINS_CLICK_ON_TRAIN_FOR; w->widget[VLW_WIDGET_LIST].tooltips = STR_883D_TRAINS_CLICK_ON_TRAIN_FOR;
w->widget[VLW_WIDGET_NEW_VEHICLES].data = STR_8815_NEW_VEHICLES; w->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_TRAINS;
break; break;
case VEH_Road: case VEH_Road:
w->widget[VLW_WIDGET_LIST].tooltips = STR_901A_ROAD_VEHICLES_CLICK_ON; w->widget[VLW_WIDGET_LIST].tooltips = STR_901A_ROAD_VEHICLES_CLICK_ON;
w->widget[VLW_WIDGET_NEW_VEHICLES].data = STR_9004_NEW_VEHICLES; w->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_VEHICLES;
break; break;
case VEH_Ship: case VEH_Ship:
w->widget[VLW_WIDGET_LIST].tooltips = STR_9823_SHIPS_CLICK_ON_SHIP_FOR; w->widget[VLW_WIDGET_LIST].tooltips = STR_9823_SHIPS_CLICK_ON_SHIP_FOR;
w->widget[VLW_WIDGET_NEW_VEHICLES].data = STR_9804_NEW_SHIPS; w->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_SHIPS;
break; break;
case VEH_Aircraft: case VEH_Aircraft:
w->widget[VLW_WIDGET_LIST].tooltips = STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT; w->widget[VLW_WIDGET_LIST].tooltips = STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT;
w->widget[VLW_WIDGET_NEW_VEHICLES].data = STR_A003_NEW_AIRCRAFT; w->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_AIRCRAFT;
break; break;
default: NOT_REACHED(); default: NOT_REACHED();
@ -1107,7 +1107,7 @@ void PlayerVehWndProc(Window *w, WindowEvent *e)
} }
} break; } break;
case VLW_WIDGET_NEW_VEHICLES: case VLW_WIDGET_AVAILABLE_VEHICLES:
ShowBuildVehicleWindow(0, vl->vehicle_type); ShowBuildVehicleWindow(0, vl->vehicle_type);
break; break;