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

(svn r12441) -Feature: open the time table when pressing the order button while pressing the CTRL key. Patch by Phil Sophus.

This commit is contained in:
rubidium 2008-03-27 14:34:29 +00:00
parent b490a21e50
commit e9dad7637e
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui.h
View File

@ -83,6 +83,9 @@ enum {
DDSP_PLACE_AUTOROAD,
};
/* timetable_gui.cpp */
void ShowTimetableWindow(const Vehicle *v);
/* misc_gui.cpp */
void PlaceLandBlockInfo();
void ShowAboutWindow();

2
src/lang/english.txt
View File

@ -2721,6 +2721,8 @@ STR_REFIT_TIP :{BLACK}Select w
STR_REFIT_ORDER :(Refit to {STRING})
STR_TIMETABLE_VIEW :{BLACK}Timetable
STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Switch to the timetable view
STR_ORDER_VIEW :{BLACK}Orders
STR_ORDER_VIEW_TOOLTIP :{BLACK}Switch to the order view
STR_8829_ORDERS :{WHITE}{VEHICLE} (Orders)
STR_882A_END_OF_ORDERS :{SETX 10}- - End of Orders - -
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}

8
src/timetable_gui.cpp
View File

@ -24,6 +24,7 @@
enum TimetableViewWindowWidgets {
TTV_WIDGET_CLOSEBOX = 0,
TTV_CAPTION,
TTV_ORDER_VIEW,
TTV_STICKY,
TTV_TIMETABLE_PANEL,
TTV_SCROLLBAR,
@ -236,6 +237,10 @@ static void TimetableWndProc(Window *w, WindowEvent *we)
const Vehicle *v = GetVehicle(w->window_number);
switch (we->we.click.widget) {
case TTV_ORDER_VIEW: /* Order view button */
ShowOrdersWindow(v);
break;
case TTV_TIMETABLE_PANEL: { /* Main panel. */
int selected = GetOrderFromTimetableWndPt(w, we->we.click.pt.y, v);
@ -310,7 +315,8 @@ static void TimetableWndProc(Window *w, WindowEvent *we)
static const Widget _timetable_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, // TTV_WIDGET_CLOSEBOX
{ WWT_CAPTION, RESIZE_RIGHT, 14, 11, 387, 0, 13, STR_TIMETABLE_TITLE, STR_018C_WINDOW_TITLE_DRAG_THIS}, // TTV_CAPTION
{ WWT_CAPTION, RESIZE_RIGHT, 14, 11, 326, 0, 13, STR_TIMETABLE_TITLE, STR_018C_WINDOW_TITLE_DRAG_THIS}, // TTV_CAPTION
{ WWT_PUSHTXTBTN, RESIZE_LR, 14, 327, 387, 0, 13, STR_ORDER_VIEW, STR_ORDER_VIEW_TOOLTIP}, // TTV_ORDER_VIEW
{ WWT_STICKYBOX, RESIZE_LR, 14, 388, 399, 0, 13, STR_NULL, STR_STICKY_BUTTON}, // TTV_STICKY
{ WWT_PANEL, RESIZE_RB, 14, 0, 387, 14, 95, STR_NULL, STR_TIMETABLE_TOOLTIP}, // TTV_TIMETABLE_PANEL

6
src/vehicle_gui.cpp
View File

@ -2079,7 +2079,11 @@ static void VehicleViewWndProc(Window *w, WindowEvent *e)
ShowVehicleRefitWindow(v, INVALID_VEH_ORDER_ID);
break;
case VVW_WIDGET_SHOW_ORDERS: /* show orders */
ShowOrdersWindow(v);
if (_ctrl_pressed) {
ShowTimetableWindow(v);
} else {
ShowOrdersWindow(v);
}
break;
case VVW_WIDGET_SHOW_DETAILS: /* show details */
ShowVehicleDetailsWindow(v);