Mercurial > hg > openttd

changeset 15549:79711faf7037 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r20208) -Add: Allow access of the industry cargoes window from the industry view window.
author alberth <alberth@openttd.org>
date Fri, 23 Jul 2010 18:44:04 +0000
parents 4cff8c4bcc67
children 02df68b0a3c0
files src/industry_gui.cpp src/lang/english.txt
diffstat 2 files changed, 14 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -47,6 +47,8 @@
 	CST_DIR,   ///< Industry-directory window
 };
 
+static void ShowIndustryCargoesWindow(IndustryType id);
+
 /**
  * Gets the string to display after the cargo name (using callback 37)
  * @param cargo the cargo for which the suffix is requested
@@ -614,6 +616,7 @@
 	IVW_VIEWPORT,
 	IVW_INFO,
 	IVW_GOTO,
+	IVW_DISPLAY,
 };
 
 class IndustryViewWindow : public Window
@@ -806,6 +809,12 @@
 				}
 				break;
 			}
+
+			case IVW_DISPLAY: {
+				Industry *i = Industry::Get(this->window_number);
+				ShowIndustryCargoesWindow(i->type);
+				break;
+			}
 		}
 	}
 
@@ -873,8 +882,8 @@
 	NWidget(WWT_PANEL, COLOUR_CREAM, IVW_INFO), SetMinimalSize(260, 2), SetResize(1, 0),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_CREAM, IVW_GOTO), SetMinimalSize(130, 12), SetDataTip(STR_BUTTON_LOCATION, STR_INDUSTRY_VIEW_LOCATION_TOOLTIP),
-		NWidget(WWT_PANEL, COLOUR_CREAM), SetResize(1, 0), EndContainer(),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_CREAM, IVW_GOTO), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_BUTTON_LOCATION, STR_INDUSTRY_VIEW_LOCATION_TOOLTIP),
+		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),
 	EndContainer(),
 };
@@ -2384,7 +2393,7 @@
  * Open the industry and cargoes window.
  * @param id Industry type to display.
  */
-void ShowIndustryCargoesWindow(IndustryType id)
+static void ShowIndustryCargoesWindow(IndustryType id)
 {
 	assert(id < NUM_INDUSTRYTYPES);
 
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -2124,6 +2124,8 @@
 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_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
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Land Area Information