mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As 

things won't fit now because of too many buttons, move 'send to depot' and 'autoreplace'
 to a dropdown box (and seperate 'send to depot' and 'send for servicing').
 The 'New Vehicles' button shows a list of all engines you have available for that vehicle
 type (in case of trains all railtypes). Button is only enabled for global list.
This commit is contained in:
Darkvater 2006-12-07 14:03:55 +00:00
parent 5dc75d233a
commit 6774527b3a
3 changed files with 97 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_vehicle_gui.c
View File

@ -479,7 +479,7 @@ void ShowBuildVehicleWindow(TileIndex tile, byte type)
switch (type) { switch (type) {
case VEH_Aircraft: { case VEH_Aircraft: {
byte acc_planes = GetAirport(GetStationByTile(tile)->airport_type)->acc_planes; byte acc_planes = (tile == 0) ? ALL : GetAirport(GetStationByTile(tile)->airport_type)->acc_planes;
bv->filter.acc_planes = acc_planes; bv->filter.acc_planes = acc_planes;
break; break;
} }

25
lang/english.txt
View File

@ -393,6 +393,15 @@ 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_ENGINES_TIP :{BLACK}See a list of available engine designs for this vehicle type.
STR_MANAGE_LIST :{BLACK}Manage list
STR_REPLACE_VEHICLES :Replace vehicles
STR_SEND_TRAIN_TO_DEPOT :Send to Depot
STR_SEND_ROAD_VEHICLE_TO_DEPOT :Send to Depot
STR_SEND_SHIP_TO_DEPOT :Send to Depot
STR_SEND_AIRCRAFT_TO_HANGAR :Send to Hangar
STR_SEND_TO_DEPOTS :Send to {SKIP}{SKIP}{SKIP}{STRING}
STR_SEND_FOR_SERVICING :Send for Servicing
############ range for months starts ############ range for months starts
STR_0162_JAN :Jan STR_0162_JAN :Jan
@ -2932,21 +2941,6 @@ STR_SCHEDULED_SHIPS_TIP :{BLACK}Show all
STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}Shared orders of {COMMA} Vehicle{P "" s} STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}Shared orders of {COMMA} Vehicle{P "" s}
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Show all vehicles that share this schedule STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Show all vehicles that share this schedule
### looks odd, but trainslators requested this as depots aren't the same for all vehicles in all translations
### we can use there whenever we want a depot mentioned in another string to avoid making 4 versions of all strings
STR_TRAIN_DEPOTS__DEPOT_ONLY :Depots
STR_ROAD_VEHICLE_DEPOTS__DEPOT_ONLY :Depots
STR_SHIP_DEPOTS__DEPOT_ONLY :Depots
STR_AIRCRAFT_HANGARS__DEPOT_ONLY :Hangars
STR_SEND_TO_DEPOTS :{BLACK}Send to {SKIP}{SKIP}{SKIP}{STRING}
STR_SEND_TO_DEPOTS_TRAIN_TIP :{BLACK}Send all trains in list to depots. CTRL+click will only service
STR_SEND_TO_DEPOTS_ROADVEH_TIP :{BLACK}Send all road vehicles in list to depots. CTRL+click will only service
STR_SEND_TO_DEPOTS_SHIP_TIP :{BLACK}Send all ships in list to depots. CTRL+click will only service
STR_SEND_TO_DEPOTS_AIRCRAFT_TIP :{BLACK}Send all aircraft in list to hangars. CTRL+click will only service
### depot strings ### depot strings
STR_SELL :{BLACK}Sell STR_SELL :{BLACK}Sell
@ -2983,7 +2977,6 @@ STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING1
STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING1} - {COMMA} Ship{P "" s} STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING1} - {COMMA} Ship{P "" s}
STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING1} - {COMMA} Aircraft STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING1} - {COMMA} Aircraft
STR_REPLACE_VEHICLES :{BLACK}Replace Vehicles
STR_REPLACE_VEHICLES_WHITE :{WHITE}Replace {STRING} STR_REPLACE_VEHICLES_WHITE :{WHITE}Replace {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Start Replacing Vehicles STR_REPLACE_VEHICLES_START :{BLACK}Start Replacing Vehicles
STR_REPLACE_VEHICLES_STOP :{BLACK}Stop Replacing Vehicles STR_REPLACE_VEHICLES_STOP :{BLACK}Stop Replacing Vehicles

132
vehicle_gui.c
View File

@ -1396,14 +1396,16 @@ enum VehicleListWindowWidgets {
VLW_WIDGET_SORT_ORDER, VLW_WIDGET_SORT_ORDER,
VLW_WIDGET_SORT_BY_TEXT, VLW_WIDGET_SORT_BY_TEXT,
VLW_WIDGET_SORT_BY_PULLDOWN, VLW_WIDGET_SORT_BY_PULLDOWN,
VLW_WIDGET_EMPTY_SPACE_TOP_RIGHT, VLW_WIDGET_EMPTY_TOP_RIGHT,
VLW_WIDGET_LIST, VLW_WIDGET_LIST,
VLW_WIDGET_SCROLLBAR, VLW_WIDGET_SCROLLBAR,
VLW_WIDGET_OTHER_PLAYER_FILLER, VLW_WIDGET_OTHER_PLAYER_FILLER,
VLW_WIDGET_SEND_TO_DEPOT, VLW_WIDGET_NEW_VEHICLES,
VLW_WIDGET_AUTOREPLACE, VLW_WIDGET_MANAGE_VEHICLES,
VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN,
VLW_WIDGET_STOP_ALL, VLW_WIDGET_STOP_ALL,
VLW_WIDGET_START_ALL, VLW_WIDGET_START_ALL,
VLW_WIDGET_EMPTY_BOTTOM_RIGHT,
VLW_WIDGET_RESIZE, VLW_WIDGET_RESIZE,
}; };
@ -1417,22 +1419,20 @@ static const Widget _vehicle_list_widgets[] = {
{ WWT_PANEL, RESIZE_RIGHT, 14, 248, 259, 14, 25, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_RIGHT, 14, 248, 259, 14, 25, 0x0, STR_NULL},
{ WWT_MATRIX, RESIZE_RB, 14, 0, 247, 26, 169, 0x0, STR_NULL}, { WWT_MATRIX, RESIZE_RB, 14, 0, 247, 26, 169, 0x0, STR_NULL},
{ WWT_SCROLLBAR, RESIZE_LRB, 14, 248, 259, 26, 169, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, { WWT_SCROLLBAR, RESIZE_LRB, 14, 248, 259, 26, 169, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
{ WWT_PANEL, RESIZE_RTB, 14, 0, 247, 170, 181, 0x0, STR_NULL}, /* Widget to be shown for other players hiding the following 6 widgets */
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 124, 170, 181, STR_SEND_TO_DEPOTS, STR_NULL}, { WWT_PANEL, RESIZE_RTB, 14, 0, 259, 170, 181, 0x0, STR_NULL},
{ WWT_PUSHTXTBTN, RESIZE_RTB, 14, 125, 223, 170, 181, STR_REPLACE_VEHICLES, STR_REPLACE_HELP},
{ WWT_PUSHIMGBTN, RESIZE_LRTB, 14, 224, 235, 170, 181, SPR_FLAG_VEH_STOPPED, STR_MASS_STOP_LIST_TIP}, { WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 105, 170, 181, 0x0, STR_AVAILABLE_ENGINES_TIP},
{ WWT_PUSHIMGBTN, RESIZE_LRTB, 14, 236, 247, 170, 181, SPR_FLAG_VEH_RUNNING, STR_MASS_START_LIST_TIP}, { WWT_TEXTBTN, RESIZE_TB, 14, 106, 211, 170, 181, STR_MANAGE_LIST, STR_SORT_CRITERIA_TIP},
{ WWT_TEXTBTN, RESIZE_TB, 14, 212, 223, 170, 181, STR_0225, STR_SORT_CRITERIA_TIP},
{ WWT_PUSHIMGBTN, RESIZE_TB, 14, 224, 235, 170, 181, SPR_FLAG_VEH_STOPPED, STR_MASS_STOP_LIST_TIP},
{ WWT_PUSHIMGBTN, RESIZE_TB, 14, 236, 247, 170, 181, SPR_FLAG_VEH_RUNNING, STR_MASS_START_LIST_TIP},
{ WWT_PANEL, RESIZE_RTB, 14, 248, 247, 170, 181, 0x0, STR_NULL},
{ WWT_RESIZEBOX, RESIZE_LRTB, 14, 248, 259, 170, 181, 0x0, STR_RESIZE_BUTTON}, { WWT_RESIZEBOX, RESIZE_LRTB, 14, 248, 259, 170, 181, 0x0, STR_RESIZE_BUTTON},
{ WIDGETS_END}, { WIDGETS_END},
}; };
/* Resize the bottom row of buttons to make them equal in size when resizing */
static void ResizeVehicleListWidgets(Window *w)
{
w->widget[VLW_WIDGET_SEND_TO_DEPOT].right = w->widget[VLW_WIDGET_AUTOREPLACE].right / 2;
w->widget[VLW_WIDGET_AUTOREPLACE].left = w->widget[VLW_WIDGET_SEND_TO_DEPOT].right + 1;
}
static void CreateVehicleListWindow(Window *w) static void CreateVehicleListWindow(Window *w)
{ {
vehiclelist_d *vl = &WP(w, vehiclelist_d); vehiclelist_d *vl = &WP(w, vehiclelist_d);
@ -1448,12 +1448,15 @@ 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);
} else { } else {
SetWindowWidgetsHiddenState(w, true, SetWindowWidgetsHiddenState(w, true,
VLW_WIDGET_SEND_TO_DEPOT, VLW_WIDGET_NEW_VEHICLES,
VLW_WIDGET_AUTOREPLACE, VLW_WIDGET_MANAGE_VEHICLES,
VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN,
VLW_WIDGET_STOP_ALL, VLW_WIDGET_STOP_ALL,
VLW_WIDGET_START_ALL, VLW_WIDGET_START_ALL,
VLW_WIDGET_EMPTY_BOTTOM_RIGHT,
WIDGET_LIST_END); WIDGET_LIST_END);
} }
@ -1461,26 +1464,26 @@ 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_SEND_TO_DEPOT].tooltips = STR_SEND_TO_DEPOTS_TRAIN_TIP; w->widget[VLW_WIDGET_NEW_VEHICLES].data = STR_8815_NEW_VEHICLES;
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_SEND_TO_DEPOT].tooltips = STR_SEND_TO_DEPOTS_ROADVEH_TIP; w->widget[VLW_WIDGET_NEW_VEHICLES].data = STR_9004_NEW_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_SEND_TO_DEPOT].tooltips = STR_SEND_TO_DEPOTS_SHIP_TIP; w->widget[VLW_WIDGET_NEW_VEHICLES].data = STR_9804_NEW_SHIPS;
break; break;
case VEH_Aircraft: case VEH_Aircraft:
w->widget[VLW_WIDGET_CAPTION].data = STR_A009_AIRCRAFT; w->widget[VLW_WIDGET_CAPTION].data = STR_A009_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_SEND_TO_DEPOT].tooltips = STR_SEND_TO_DEPOTS_AIRCRAFT_TIP; w->widget[VLW_WIDGET_NEW_VEHICLES].data = STR_A003_NEW_AIRCRAFT;
break; break;
default: NOT_REACHED(); break; default: NOT_REACHED();
} }
switch (window_type) { switch (window_type) {
@ -1635,17 +1638,9 @@ static void DrawVehicleListWindow(Window *w)
default: NOT_REACHED(); break; default: NOT_REACHED(); break;
} }
switch (vl->vehicle_type) {
case VEH_Train: SetDParam(3, STR_TRAIN_DEPOTS__DEPOT_ONLY); break;
case VEH_Road: SetDParam(3, STR_ROAD_VEHICLE_DEPOTS__DEPOT_ONLY); break;
case VEH_Ship: SetDParam(3, STR_SHIP_DEPOTS__DEPOT_ONLY); break;
case VEH_Aircraft: SetDParam(3, STR_AIRCRAFT_HANGARS__DEPOT_ONLY); break;
default: NOT_REACHED();
}
SetWindowWidgetsDisabledState(w, vl->l.list_length == 0, SetWindowWidgetsDisabledState(w, vl->l.list_length == 0,
VLW_WIDGET_SEND_TO_DEPOT, VLW_WIDGET_MANAGE_VEHICLES,
VLW_WIDGET_AUTOREPLACE, VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN,
VLW_WIDGET_STOP_ALL, VLW_WIDGET_STOP_ALL,
VLW_WIDGET_START_ALL, VLW_WIDGET_START_ALL,
WIDGET_LIST_END); WIDGET_LIST_END);
@ -1748,15 +1743,36 @@ void PlayerVehWndProc(Window *w, WindowEvent *e)
} }
} break; } break;
case VLW_WIDGET_SEND_TO_DEPOT: case VLW_WIDGET_NEW_VEHICLES:
assert(vl->l.list_length != 0); switch (vl->vehicle_type) {
DoCommandP(0, GB(w->window_number, 16, 16) /* StationID or OrderID (depending on VLW). Nomatter which one it is, it's needed here */, case VEH_Train: ShowBuildTrainWindow(0); break;
(w->window_number & VLW_MASK) | DEPOT_MASS_SEND | (_ctrl_pressed ? DEPOT_SERVICE : 0), NULL, CMD_SEND_TO_DEPOT(vl->vehicle_type)); case VEH_Road: ShowBuildRoadVehWindow(0); break;
case VEH_Ship: ShowBuildShipWindow(0); break;
case VEH_Aircraft: ShowBuildVehicleWindow(0, vl->vehicle_type); break;
}
break; break;
case VLW_WIDGET_AUTOREPLACE: case VLW_WIDGET_MANAGE_VEHICLES:
ShowReplaceVehicleWindow(vl->vehicle_type); case VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN: {
static StringID action_str[] = {
STR_REPLACE_VEHICLES,
STR_SEND_FOR_SERVICING,
STR_NULL,
INVALID_STRING_ID
};
static const StringID depot_name[] = {
STR_SEND_TRAIN_TO_DEPOT,
STR_SEND_ROAD_VEHICLE_TO_DEPOT,
STR_SEND_SHIP_TO_DEPOT,
STR_SEND_AIRCRAFT_TO_HANGAR
};
/* XXX - Substite string since the dropdown cannot handle dynamic strings */
action_str[2] = depot_name[vl->vehicle_type - VEH_Train];
ShowDropDownMenu(w, action_str, 0, VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN, 0, 0);
break; break;
}
case VLW_WIDGET_STOP_ALL: case VLW_WIDGET_STOP_ALL:
case VLW_WIDGET_START_ALL: case VLW_WIDGET_START_ALL:
@ -1766,11 +1782,39 @@ void PlayerVehWndProc(Window *w, WindowEvent *e)
} break; } break;
case WE_DROPDOWN_SELECT: /* we have selected a dropdown item in the list */ case WE_DROPDOWN_SELECT: /* we have selected a dropdown item in the list */
if (vl->l.sort_type != e->we.dropdown.index) { switch (e->we.dropdown.button) {
// value has changed -> resort case VLW_WIDGET_SORT_BY_PULLDOWN:
vl->l.flags |= VL_RESORT; if (vl->l.sort_type != e->we.dropdown.index) {
vl->l.sort_type = e->we.dropdown.index; // value has changed -> resort
vl->_sorting->criteria = vl->l.sort_type; vl->l.flags |= VL_RESORT;
vl->l.sort_type = e->we.dropdown.index;
vl->_sorting->criteria = vl->l.sort_type;
}
break;
case VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN:
assert(vl->l.list_length != 0);
switch (e->we.dropdown.index) {
case 0: /* Replace window */
ShowReplaceVehicleWindow(vl->vehicle_type);
break;
case 1: /* Send for servicing */
DoCommandP(0, GB(w->window_number, 16, 16) /* StationID or OrderID (depending on VLW) */,
(w->window_number & VLW_MASK) | DEPOT_MASS_SEND | DEPOT_SERVICE,
NULL,
CMD_SEND_TO_DEPOT(vl->vehicle_type));
break;
case 2: /* Send to Depots */
DoCommandP(0, GB(w->window_number, 16, 16) /* StationID or OrderID (depending on VLW) */,
(w->window_number & VLW_MASK) | DEPOT_MASS_SEND,
NULL,
CMD_SEND_TO_DEPOT(vl->vehicle_type));
break;
default: NOT_REACHED();
}
break;
default: NOT_REACHED();
} }
SetWindowDirty(w); SetWindowDirty(w);
break; break;
@ -1794,7 +1838,6 @@ void PlayerVehWndProc(Window *w, WindowEvent *e)
case WE_RESIZE: /* Update the scroll + matrix */ case WE_RESIZE: /* Update the scroll + matrix */
w->vscroll.cap += e->we.sizing.diff.y / (int)w->resize.step_height; w->vscroll.cap += e->we.sizing.diff.y / (int)w->resize.step_height;
w->widget[VLW_WIDGET_LIST].data = (w->vscroll.cap << 8) + 1; w->widget[VLW_WIDGET_LIST].data = (w->vscroll.cap << 8) + 1;
ResizeVehicleListWidgets(w);
break; break;
} }
} }
@ -1871,7 +1914,6 @@ static void ShowVehicleListWindowLocal(PlayerID player, byte vehicle_type, Stati
} }
if (w != NULL) { if (w != NULL) {
ResizeVehicleListWidgets(w);
/* Set the minimum window size to the current window size */ /* Set the minimum window size to the current window size */
w->resize.width = w->width; w->resize.width = w->width;
w->resize.height = w->height; w->resize.height = w->height;