Merge branch 'master' into jgrpp

# Conflicts:
#	src/ai/ai_core.cpp
#	src/ai/ai_gui.cpp
#	src/ai/ai_instance.cpp
#	src/console_cmds.cpp
#	src/engine_type.h
#	src/game/game_gui.cpp
#	src/game/game_instance.cpp
#	src/goal.cpp
#	src/goal_cmd.h
#	src/lang/english.txt
#	src/lang/estonian.txt
#	src/network/network_client.cpp
#	src/newgrf.cpp
#	src/newgrf_generic.h
#	src/openttd.cpp
#	src/saveload/saveload.h
#	src/script/api/script_log.cpp
#	src/script/api/script_town.cpp
#	src/settings_table.cpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_map.h
#	src/strings.cpp
#	src/table/settings/difficulty_settings.ini
#	src/table/settings/gui_settings.ini
#	src/tbtr_template_gui_main.h
#	src/timetable_cmd.cpp
#	src/timetable_cmd.h
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/water_cmd.cpp

src/widgets/CMakeLists.txt

@@ -46,6 +46,7 @@ add_files(
     rail_widget.h
     road_widget.h
     screenshot_widget.h
+    script_widget.h
     settings_widget.h
     sign_widget.h
     slider.cpp

src/widgets/ai_widget.h

@@ -10,28 +10,8 @@
 #ifndef WIDGETS_AI_WIDGET_H
 #define WIDGETS_AI_WIDGET_H
 
-#include "../company_type.h"
 #include "../textfile_type.h"
 
-/** Widgets of the #AIListWindow class. */
-enum AIListWidgets {
-	WID_AIL_CAPTION,   ///< Caption of the window.
-	WID_AIL_LIST,      ///< The matrix with all available AIs.
-	WID_AIL_SCROLLBAR, ///< Scrollbar next to the AI list.
-	WID_AIL_INFO_BG,   ///< Panel to draw some AI information on.
-	WID_AIL_ACCEPT,    ///< Accept button.
-	WID_AIL_CANCEL,    ///< Cancel button.
-};
-
-/** Widgets of the #AISettingsWindow class. */
-enum AISettingsWidgets {
-	WID_AIS_CAPTION,    ///< Caption of the window.
-	WID_AIS_BACKGROUND, ///< Panel to draw the settings on.
-	WID_AIS_SCROLLBAR,  ///< Scrollbar to scroll through all settings.
-	WID_AIS_ACCEPT,     ///< Accept button.
-	WID_AIS_RESET,      ///< Reset button.
-};
-
 /** Widgets of the #AIConfigWindow class. */
 enum AIConfigWidgets {
 	WID_AIC_BACKGROUND,       ///< Window background.
@@ -49,22 +29,4 @@ enum AIConfigWidgets {
 	WID_AIC_CONTENT_DOWNLOAD = WID_AIC_TEXTFILE + TFT_END, ///< Download content button.
 };
 
-/** Widgets of the #AIDebugWindow class. */
-enum AIDebugWidgets {
-	WID_AID_VIEW,                 ///< The row of company buttons.
-	WID_AID_NAME_TEXT,            ///< Name of the current selected.
-	WID_AID_SETTINGS,             ///< Settings button.
-	WID_AID_SCRIPT_GAME,          ///< Game Script button.
-	WID_AID_RELOAD_TOGGLE,        ///< Reload button.
-	WID_AID_LOG_PANEL,            ///< Panel where the log is in.
-	WID_AID_SCROLLBAR,            ///< Scrollbar of the log panel.
-	WID_AID_COMPANY_BUTTON_START, ///< Buttons in the VIEW.
-	WID_AID_COMPANY_BUTTON_END = WID_AID_COMPANY_BUTTON_START + MAX_COMPANIES - 1, ///< Last possible button in the VIEW.
-	WID_AID_BREAK_STRING_WIDGETS, ///< The panel to handle the breaking on string.
-	WID_AID_BREAK_STR_ON_OFF_BTN, ///< Enable breaking on string.
-	WID_AID_BREAK_STR_EDIT_BOX,   ///< Edit box for the string to break on.
-	WID_AID_MATCH_CASE_BTN,       ///< Checkbox to use match caching or not.
-	WID_AID_CONTINUE_BTN,         ///< Continue button.
-};
-
 #endif /* WIDGETS_AI_WIDGET_H */

src/widgets/game_widget.h

@@ -5,7 +5,7 @@
  * 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 ai_widget.h Types related to the ai widgets. */
+/** @file game_widget.h Types related to the GS widgets. */
 
 #ifndef WIDGETS_GS_WIDGET_H
 #define WIDGETS_GS_WIDGET_H

src/widgets/script_widget.h

@@ -0,0 +1,52 @@
+/*
+ * 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 script_widget.h Types related to the script widgets. */
+
+#ifndef WIDGETS_SCRIPT_WIDGET_H
+#define WIDGETS_SCRIPT_WIDGET_H
+
+#include "../company_type.h"
+
+/** Widgets of the #ScriptListWindow class. */
+enum ScriptListWidgets {
+	WID_SCRL_CAPTION,   ///< Caption of the window.
+	WID_SCRL_LIST,      ///< The matrix with all available Scripts.
+	WID_SCRL_SCROLLBAR, ///< Scrollbar next to the Script list.
+	WID_SCRL_INFO_BG,   ///< Panel to draw some Script information on.
+	WID_SCRL_ACCEPT,    ///< Accept button.
+	WID_SCRL_CANCEL,    ///< Cancel button.
+};
+
+/** Widgets of the #ScriptSettingsWindow class. */
+enum ScriptSettingsWidgets {
+	WID_SCRS_CAPTION,    ///< Caption of the window.
+	WID_SCRS_BACKGROUND, ///< Panel to draw the settings on.
+	WID_SCRS_SCROLLBAR,  ///< Scrollbar to scroll through all settings.
+	WID_SCRS_ACCEPT,     ///< Accept button.
+	WID_SCRS_RESET,      ///< Reset button.
+};
+
+/** Widgets of the #ScriptDebugWindow class. */
+enum ScriptDebugWidgets {
+	WID_SCRD_VIEW,                 ///< The row of company buttons.
+	WID_SCRD_NAME_TEXT,            ///< Name of the current selected.
+	WID_SCRD_SETTINGS,             ///< Settings button.
+	WID_SCRD_SCRIPT_GAME,          ///< Game Script button.
+	WID_SCRD_RELOAD_TOGGLE,        ///< Reload button.
+	WID_SCRD_LOG_PANEL,            ///< Panel where the log is in.
+	WID_SCRD_SCROLLBAR,            ///< Scrollbar of the log panel.
+	WID_SCRD_COMPANY_BUTTON_START, ///< Buttons in the VIEW.
+	WID_SCRD_COMPANY_BUTTON_END = WID_SCRD_COMPANY_BUTTON_START + MAX_COMPANIES - 1, ///< Last possible button in the VIEW.
+	WID_SCRD_BREAK_STRING_WIDGETS, ///< The panel to handle the breaking on string.
+	WID_SCRD_BREAK_STR_ON_OFF_BTN, ///< Enable breaking on string.
+	WID_SCRD_BREAK_STR_EDIT_BOX,   ///< Edit box for the string to break on.
+	WID_SCRD_MATCH_CASE_BTN,       ///< Checkbox to use match caching or not.
+	WID_SCRD_CONTINUE_BTN,         ///< Continue button.
+};
+
+#endif /* WIDGETS_SCRIPT_WIDGET_H */