(svn r15805) -Codechange: Completing/fixing airportpicker widget names and adding them as comment

This commit is contained in:
alberth 2009-03-22 09:58:38 +00:00
parent 4eaf4e6182
commit 8324f65b4b

View File

@ -156,20 +156,35 @@ void ShowBuildAirToolbar()
class AirportPickerWindow : public PickerWindowBase { class AirportPickerWindow : public PickerWindowBase {
enum { enum {
BAW_BOTTOMPANEL = 10, BAW_CLOSEBOX,
BAW_CAPTION,
/* Panels and labels. */
BAW_SMALL_AIRPORTS_PANEL,
BAW_SMALL_AIRPORTS_LABEL,
BAW_LARGE_AIRPORTS_PANEL,
BAW_LARGE_AIRPORTS_LABEL,
BAW_HUB_AIRPORTS_PANEL,
BAW_HUB_AIRPORTS_LABEL,
BAW_HELIPORTS_PANEL,
BAW_HELIPORTS_LABEL,
BAW_BOTTOMPANEL,
/* Airport selection buttons. */
BAW_SMALL_AIRPORT, BAW_SMALL_AIRPORT,
BAW_CITY_AIRPORT, BAW_CITY_AIRPORT,
BAW_HELIPORT, BAW_HELIPORT,
BAW_METRO_AIRPORT, BAW_METRO_AIRPORT,
BAW_STR_INTERNATIONAL_AIRPORT, BAW_INTERNATIONAL_AIRPORT,
BAW_COMMUTER_AIRPORT, BAW_COMMUTER_AIRPORT,
BAW_HELIDEPOT, BAW_HELIDEPOT,
BAW_STR_INTERCONTINENTAL_AIRPORT, BAW_INTERCONTINENTAL_AIRPORT,
BAW_HELISTATION, BAW_HELISTATION,
/* Coverage. */
BAW_BTN_DONTHILIGHT,
BAW_BTN_DOHILIGHT,
BAW_COVERAGE_LABEL,
BAW_LAST_AIRPORT = BAW_HELISTATION, BAW_LAST_AIRPORT = BAW_HELISTATION,
BAW_AIRPORT_COUNT = BAW_LAST_AIRPORT - BAW_SMALL_AIRPORT + 1, BAW_AIRPORT_COUNT = BAW_LAST_AIRPORT - BAW_SMALL_AIRPORT + 1,
BAW_BTN_DONTHILIGHT = BAW_LAST_AIRPORT + 1,
BAW_BTN_DOHILIGHT,
}; };
public: public:
@ -246,8 +261,8 @@ public:
{ {
switch (widget) { switch (widget) {
case BAW_SMALL_AIRPORT: case BAW_CITY_AIRPORT: case BAW_HELIPORT: case BAW_METRO_AIRPORT: case BAW_SMALL_AIRPORT: case BAW_CITY_AIRPORT: case BAW_HELIPORT: case BAW_METRO_AIRPORT:
case BAW_STR_INTERNATIONAL_AIRPORT: case BAW_COMMUTER_AIRPORT: case BAW_HELIDEPOT: case BAW_INTERNATIONAL_AIRPORT: case BAW_COMMUTER_AIRPORT: case BAW_HELIDEPOT:
case BAW_STR_INTERCONTINENTAL_AIRPORT: case BAW_HELISTATION: case BAW_INTERCONTINENTAL_AIRPORT: case BAW_HELISTATION:
this->RaiseWidget(_selected_airport_type + BAW_SMALL_AIRPORT); this->RaiseWidget(_selected_airport_type + BAW_SMALL_AIRPORT);
_selected_airport_type = widget - BAW_SMALL_AIRPORT; _selected_airport_type = widget - BAW_SMALL_AIRPORT;
this->LowerWidget(_selected_airport_type + BAW_SMALL_AIRPORT); this->LowerWidget(_selected_airport_type + BAW_SMALL_AIRPORT);
@ -273,29 +288,29 @@ public:
}; };
static const Widget _build_airport_picker_widgets[] = { static const Widget _build_airport_picker_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, // BAW_CLOSEBOX
{ WWT_CAPTION, RESIZE_NONE, COLOUR_DARK_GREEN, 11, 147, 0, 13, STR_3001_AIRPORT_SELECTION, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, COLOUR_DARK_GREEN, 11, 147, 0, 13, STR_3001_AIRPORT_SELECTION, STR_018C_WINDOW_TITLE_DRAG_THIS}, // BAW_CAPTION
{ WWT_PANEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 14, 52, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 14, 52, 0x0, STR_NULL}, // BAW_SMALL_AIRPORTS_PANEL
{ WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 14, 27, STR_SMALL_AIRPORTS, STR_NULL}, { WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 14, 27, STR_SMALL_AIRPORTS, STR_NULL}, // BAW_SMALL_AIRPORTS_LABEL
{ WWT_PANEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 53, 89, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 53, 89, 0x0, STR_NULL}, // BAW_LARGE_AIRPORTS_PANEL
{ WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 52, 65, STR_LARGE_AIRPORTS, STR_NULL}, { WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 52, 65, STR_LARGE_AIRPORTS, STR_NULL}, // BAW_LARGE_AIRPORTS_LABEL
{ WWT_PANEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 90, 127, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 90, 127, 0x0, STR_NULL}, // BAW_HUB_AIRPORTS_PANEL
{ WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 90, 103, STR_HUB_AIRPORTS, STR_NULL}, { WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 90, 103, STR_HUB_AIRPORTS, STR_NULL}, // BAW_HUB_AIRPORTS_LABEL
{ WWT_PANEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 128, 177, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 128, 177, 0x0, STR_NULL}, // BAW_HELIPORTS_PANEL
{ WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 128, 141, STR_HELIPORTS, STR_NULL}, { WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 128, 141, STR_HELIPORTS, STR_NULL}, // BAW_HELIPORTS_LABEL
{ WWT_PANEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 178, 239, 0x0, STR_NULL}, // bottom general box { WWT_PANEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 178, 239, 0x0, STR_NULL}, // BAW_BOTTOMPANEL
{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 27, 38, STR_SMALL_AIRPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, { WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 27, 38, STR_SMALL_AIRPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_SMALL_AIRPORT
{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 65, 76, STR_CITY_AIRPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, { WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 65, 76, STR_CITY_AIRPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_CITY_AIRPORT
{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 141, 152, STR_HELIPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, { WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 141, 152, STR_HELIPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_HELIPORT
{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 77, 88, STR_METRO_AIRPORT , STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, { WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 77, 88, STR_METRO_AIRPORT , STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_METRO_AIRPORT
{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 103, 114, STR_INTERNATIONAL_AIRPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, { WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 103, 114, STR_INTERNATIONAL_AIRPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_INTERNATIONAL_AIRPORT
{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 39, 50, STR_COMMUTER_AIRPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, { WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 39, 50, STR_COMMUTER_AIRPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_COMMUTER_AIRPORT
{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 165, 176, STR_HELIDEPOT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, { WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 165, 176, STR_HELIDEPOT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_HELIDEPOT
{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 115, 126, STR_INTERCONTINENTAL_AIRPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, { WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 115, 126, STR_INTERCONTINENTAL_AIRPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_INTERCONTINENTAL_AIRPORT
{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 153, 164, STR_HELISTATION, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, { WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 153, 164, STR_HELISTATION, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_HELISTATION
{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 14, 73, 191, 202, STR_02DB_OFF, STR_3065_DON_T_HIGHLIGHT_COVERAGE}, { WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 14, 73, 191, 202, STR_02DB_OFF, STR_3065_DON_T_HIGHLIGHT_COVERAGE}, // BAW_BTN_DONTHILIGHT
{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 74, 133, 191, 202, STR_02DA_ON, STR_3064_HIGHLIGHT_COVERAGE_AREA}, { WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 74, 133, 191, 202, STR_02DA_ON, STR_3064_HIGHLIGHT_COVERAGE_AREA}, // BAW_BTN_DOHILIGHT
{ WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 178, 191, STR_3066_COVERAGE_AREA_HIGHLIGHT, STR_NULL}, { WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 178, 191, STR_3066_COVERAGE_AREA_HIGHLIGHT, STR_NULL}, // BAW_COVERAGE_LABEL
{ WIDGETS_END}, { WIDGETS_END},
}; };