Merge branch 'master' into jgrpp

# Conflicts:
#	config.lib
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj
#	projects/openttd_vs142.vcxproj.filters
#	src/aircraft_cmd.cpp
#	src/base_station_base.h
#	src/core/pool_type.hpp
#	src/disaster_vehicle.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/group.h
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/network_command.cpp
#	src/network/network_server.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehiclelist.cpp
#	src/window_type.h

src/widgets/industry_widget.h

@@ -30,10 +30,12 @@ enum IndustryViewWidgets {
 
 /** Widgets of the #IndustryDirectoryWindow class. */
 enum IndustryDirectoryWidgets {
-	WID_ID_DROPDOWN_ORDER,    ///< Dropdown for the order of the sort.
-	WID_ID_DROPDOWN_CRITERIA, ///< Dropdown for the criteria of the sort.
-	WID_ID_INDUSTRY_LIST,     ///< Industry list.
-	WID_ID_SCROLLBAR,         ///< Scrollbar of the list.
+	WID_ID_DROPDOWN_ORDER,       ///< Dropdown for the order of the sort.
+	WID_ID_DROPDOWN_CRITERIA,    ///< Dropdown for the criteria of the sort.
+	WID_ID_FILTER_BY_ACC_CARGO,  ///< Accepted cargo filter dropdown list.
+	WID_ID_FILTER_BY_PROD_CARGO, ///< Produced cargo filter dropdown list.
+	WID_ID_INDUSTRY_LIST,        ///< Industry list.
+	WID_ID_SCROLLBAR,            ///< Scrollbar of the list.
 };
 
 /** Widgets of the #IndustryCargoesWindow class */

src/widgets/news_widget.h

@@ -31,6 +31,7 @@ enum NewsWidgets {
 	WID_N_VEH_NAME,    ///< Name of the new vehicle.
 	WID_N_VEH_SPR,     ///< Graphical display of the new vehicle.
 	WID_N_VEH_INFO,    ///< Some technical data of the new vehicle.
+	WID_N_SHOW_GROUP,  ///< Show vehicle's group
 };
 
 /** Widgets of the #MessageHistoryWindow class. */

src/widgets/screenshot_widget.h

@@ -0,0 +1,26 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file screenshot_widget.h Types related to the screenshot widgets. */
+
+#ifndef WIDGETS_SCREENSHOT_WIDGET_H
+#define WIDGETS_SCREENSHOT_WIDGET_H
+
+/** Widgets of the #ScreenshotWindow class. */
+
+enum ScreenshotWindowWidgets {
+	WID_SC_TAKE,             ///< Button for taking a normal screenshot
+	WID_SC_TAKE_ZOOMIN,      ///< Button for taking a zoomed in screenshot
+	WID_SC_TAKE_DEFAULTZOOM, ///< Button for taking a screenshot at normal zoom
+	WID_SC_TAKE_WORLD,       ///< Button for taking a screenshot of the whole world
+	WID_SC_TAKE_HEIGHTMAP,   ///< Button for taking a heightmap "screenshot"
+	WID_SC_TAKE_MINIMAP,     ///< Button for taking a minimap screenshot
+};
+
+
+#endif /* WIDGETS_SCREENSHOT_WIDGET_H */
+