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

(svn r20208) -Add: Allow access of the industry cargoes window from the industry view window.

release/1.1
alberth 2010-07-23 18:44:04 +00:00
parent f601259f46
commit 27dba2b3b2
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/industry_gui.cpp
View File

@ -47,6 +47,8 @@ enum CargoSuffixType {
CST_DIR, ///< Industry-directory window CST_DIR, ///< Industry-directory window
}; };
static void ShowIndustryCargoesWindow(IndustryType id);
/** /**
* Gets the string to display after the cargo name (using callback 37) * Gets the string to display after the cargo name (using callback 37)
* @param cargo the cargo for which the suffix is requested * @param cargo the cargo for which the suffix is requested
@ -614,6 +616,7 @@ enum IndustryViewWidgets {
IVW_VIEWPORT, IVW_VIEWPORT,
IVW_INFO, IVW_INFO,
IVW_GOTO, IVW_GOTO,
IVW_DISPLAY,
}; };
class IndustryViewWindow : public Window class IndustryViewWindow : public Window
@ -806,6 +809,12 @@ public:
} }
break; break;
} }
case IVW_DISPLAY: {
Industry *i = Industry::Get(this->window_number);
ShowIndustryCargoesWindow(i->type);
break;
}
} }
} }
@ -873,8 +882,8 @@ static const NWidgetPart _nested_industry_view_widgets[] = {
NWidget(WWT_PANEL, COLOUR_CREAM, IVW_INFO), SetMinimalSize(260, 2), SetResize(1, 0), NWidget(WWT_PANEL, COLOUR_CREAM, IVW_INFO), SetMinimalSize(260, 2), SetResize(1, 0),
EndContainer(), EndContainer(),
NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL),
NWidget(WWT_PUSHTXTBTN, COLOUR_CREAM, IVW_GOTO), SetMinimalSize(130, 12), SetDataTip(STR_BUTTON_LOCATION, STR_INDUSTRY_VIEW_LOCATION_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_CREAM, IVW_GOTO), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_BUTTON_LOCATION, STR_INDUSTRY_VIEW_LOCATION_TOOLTIP),
NWidget(WWT_PANEL, COLOUR_CREAM), SetResize(1, 0), EndContainer(), NWidget(WWT_PUSHTXTBTN, COLOUR_CREAM, IVW_DISPLAY), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_INDUSTRY_DISPLAY_CHAIN, STR_INDUSTRY_DISPLAY_CHAIN_TOOLTIP),
NWidget(WWT_RESIZEBOX, COLOUR_CREAM), NWidget(WWT_RESIZEBOX, COLOUR_CREAM),
EndContainer(), EndContainer(),
}; };
@ -2384,7 +2393,7 @@ const int IndustryCargoesWindow::VERT_TEXT_PADDING = 5; ///< Vertical padding ar
* Open the industry and cargoes window. * Open the industry and cargoes window.
* @param id Industry type to display. * @param id Industry type to display.
*/ */
void ShowIndustryCargoesWindow(IndustryType id) static void ShowIndustryCargoesWindow(IndustryType id)
{ {
assert(id < NUM_INDUSTRYTYPES); assert(id < NUM_INDUSTRYTYPES);

2
src/lang/english.txt
View File

@ -2124,6 +2124,8 @@ STR_INDUSTRY_CARGOES_CUSTOMERS :{WHITE}Acceptin
STR_INDUSTRY_CARGOES_HOUSES :{WHITE}Houses STR_INDUSTRY_CARGOES_HOUSES :{WHITE}Houses
STR_INDUSTRY_CARGOES_INDUSTRY_TOOLTIP :{BLACK}Click at the industry to see its suppliers and customers STR_INDUSTRY_CARGOES_INDUSTRY_TOOLTIP :{BLACK}Click at the industry to see its suppliers and customers
STR_INDUSTRY_CARGOES_CARGO_TOOLTIP :{BLACK}{STRING}{}Click at the cargo to see its suppliers and customers STR_INDUSTRY_CARGOES_CARGO_TOOLTIP :{BLACK}{STRING}{}Click at the cargo to see its suppliers and customers
STR_INDUSTRY_DISPLAY_CHAIN :{BLACK}Display chain
STR_INDUSTRY_DISPLAY_CHAIN_TOOLTIP :{BLACK}Display cargo supplying and accepting industries
# Land area window # Land area window
STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Land Area Information STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Land Area Information