cpp/openttd-patchpack/source Changeset - r15539:3325df4b392b

Changeset - r15539:3325df4b392b

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

alberth - 14 years ago 2010-07-23 18:44:04
alberth@openttd.org

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

2 files changed with 14 insertions and 3 deletions:

src/industry_gui.cpp

src/lang/english.txt

0 comments (0 inline, 0 general)

src/industry_gui.cpp

➞

Show inline comments

@@ @@ -47,6 +47,8 @@ enum CargoSuffixType { @@
 	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 @@ enum IndustryViewWidgets { @@
 	IVW_VIEWPORT,
 	IVW_INFO,
 	IVW_GOTO,
 	IVW_DISPLAY,
 };
 class IndustryViewWindow : public Window
@@ @@ -806,6 +809,12 @@ public: @@
+				}
 				break;
+			}
 			case IVW_DISPLAY: {
 				Industry *i = Industry::Get(this->window_number);
 				ShowIndustryCargoesWindow(i->type);
 				break;
+			}
+		}
+	}
@@ @@ -873,8 +882,8 @@ static const NWidgetPart _nested_industr @@
 	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 @@ const int IndustryCargoesWindow::VERT_TE @@
  * 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);

src/lang/english.txt

➞

Show inline comments

@@ @@ -2124,6 +2124,8 @@ STR_INDUSTRY_CARGOES_CUSTOMERS @@
 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

0 comments (0 inline, 0 general)