From 3576488527e9adead2b21697820b662a0f6d770a Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 1 Nov 2015 11:14:51 +0000 Subject: [PATCH 1/2] Fix departures_widget.h being missing from source.list Fix whitespace issues. --- source.list | 1 + src/widgets/departures_widget.h | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source.list b/source.list index f33c687c52..e6f094e302 100644 --- a/source.list +++ b/source.list @@ -520,6 +520,7 @@ widgets/cheat_widget.h widgets/company_widget.h widgets/console_widget.h widgets/date_widget.h +widgets/departures_widget.h widgets/depot_widget.h widgets/dock_widget.h widgets/dropdown.cpp diff --git a/src/widgets/departures_widget.h b/src/widgets/departures_widget.h index e39b4d6cdf..3b2fc68396 100644 --- a/src/widgets/departures_widget.h +++ b/src/widgets/departures_widget.h @@ -7,16 +7,16 @@ * 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 . */ -/** @file waypoint_widget.h Types related to the waypoint widgets. */ +/** @file departures_widget.h Types related to the departures widgets. */ #ifndef WIDGETS_DEPARTURES_WIDGET_H #define WIDGETS_DEPARTURES_WIDGET_H /** Widgets of the WC_DEPARTURES_BOARD. */ enum DeparturesWindowWidgets { - WID_DB_CAPTION, ///< Window caption - WID_DB_LIST, ///< List of departures - WID_DB_SCROLLBAR, ///< List scrollbar + WID_DB_CAPTION, ///< Window caption + WID_DB_LIST, ///< List of departures + WID_DB_SCROLLBAR, ///< List scrollbar WID_DB_SHOW_DEPS, ///< Toggle departures button WID_DB_SHOW_ARRS, ///< Toggle arrivals button WID_DB_SHOW_VIA, ///< Toggle via button From b457c67ac1478ee2a10862767b6f64633947a943 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 1 Nov 2015 11:17:39 +0000 Subject: [PATCH 2/2] Update project info. --- projects/openttd_vs100.vcxproj | 6 ++++++ projects/openttd_vs100.vcxproj.filters | 18 ++++++++++++++++++ projects/openttd_vs140.vcxproj | 6 ++++++ projects/openttd_vs140.vcxproj.filters | 18 ++++++++++++++++++ projects/openttd_vs80.vcproj | 4 ++++ projects/openttd_vs90.vcproj | 4 ++++ 6 files changed, 56 insertions(+) diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj index 37f9948032..5d2582f16b 100644 --- a/projects/openttd_vs100.vcxproj +++ b/projects/openttd_vs100.vcxproj @@ -310,6 +310,7 @@ + @@ -432,6 +433,9 @@ + + + @@ -698,6 +702,7 @@ + @@ -755,6 +760,7 @@ + diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters index 06800ffdaf..a3e6eb500a 100644 --- a/projects/openttd_vs100.vcxproj.filters +++ b/projects/openttd_vs100.vcxproj.filters @@ -159,6 +159,9 @@ Source Files + + Source Files + Source Files @@ -525,6 +528,15 @@ Header Files + + Header Files + + + Header Files + + + Header Files + Header Files @@ -1323,6 +1335,9 @@ GUI Source Code + + GUI Source Code + GUI Source Code @@ -1494,6 +1509,9 @@ Widgets + + Widgets + Widgets diff --git a/projects/openttd_vs140.vcxproj b/projects/openttd_vs140.vcxproj index 88f7b44ddd..147f2e3d44 100644 --- a/projects/openttd_vs140.vcxproj +++ b/projects/openttd_vs140.vcxproj @@ -327,6 +327,7 @@ + @@ -449,6 +450,9 @@ + + + @@ -715,6 +719,7 @@ + @@ -772,6 +777,7 @@ + diff --git a/projects/openttd_vs140.vcxproj.filters b/projects/openttd_vs140.vcxproj.filters index 06800ffdaf..a3e6eb500a 100644 --- a/projects/openttd_vs140.vcxproj.filters +++ b/projects/openttd_vs140.vcxproj.filters @@ -159,6 +159,9 @@ Source Files + + Source Files + Source Files @@ -525,6 +528,15 @@ Header Files + + Header Files + + + Header Files + + + Header Files + Header Files @@ -1323,6 +1335,9 @@ GUI Source Code + + GUI Source Code + GUI Source Code @@ -1494,6 +1509,9 @@ Widgets + + Widgets + Widgets diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj index e0ec9119f0..60002ba318 100644 --- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -2326,6 +2326,10 @@ RelativePath=".\..\src\widgets\date_widget.h" > + + diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj index e4b6b35207..bc298f66e5 100644 --- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -2323,6 +2323,10 @@ RelativePath=".\..\src\widgets\date_widget.h" > + +