dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'departure-boards-sx' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2015-11-01 11:30:28 +00:00
parent b47c8825e7 7dc91d0858
commit 98047b5d87
8 changed files with 61 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
projects/openttd_vs100.vcxproj
View File

@@ -310,6 +310,7 @@
<ClCompile Include="..\src\date.cpp" /> <ClCompile Include="..\src\date.cpp" />
<ClCompile Include="..\src\debug.cpp" /> <ClCompile Include="..\src\debug.cpp" />
<ClCompile Include="..\src\dedicated.cpp" /> <ClCompile Include="..\src\dedicated.cpp" />
<ClCompile Include="..\src\departures.cpp" />
<ClCompile Include="..\src\depot.cpp" /> <ClCompile Include="..\src\depot.cpp" />
<ClCompile Include="..\src\disaster_vehicle.cpp" /> <ClCompile Include="..\src\disaster_vehicle.cpp" />
<ClCompile Include="..\src\driver.cpp" /> <ClCompile Include="..\src\driver.cpp" />
@@ -436,6 +437,9 @@
<ClInclude Include="..\src\date_type.h" /> <ClInclude Include="..\src\date_type.h" />
<ClInclude Include="..\src\debug.h" /> <ClInclude Include="..\src\debug.h" />
<ClInclude Include="..\src\video\dedicated_v.h" /> <ClInclude Include="..\src\video\dedicated_v.h" />
<ClInclude Include="..\src\departures_func.h" />
<ClInclude Include="..\src\departures_gui.h" />
<ClInclude Include="..\src\departures_type.h" />
<ClInclude Include="..\src\depot_base.h" /> <ClInclude Include="..\src\depot_base.h" />
<ClInclude Include="..\src\depot_func.h" /> <ClInclude Include="..\src\depot_func.h" />
<ClInclude Include="..\src\depot_map.h" /> <ClInclude Include="..\src\depot_map.h" />
@@ -709,6 +713,7 @@
<ClCompile Include="..\src\company_gui.cpp" /> <ClCompile Include="..\src\company_gui.cpp" />
<ClCompile Include="..\src\console_gui.cpp" /> <ClCompile Include="..\src\console_gui.cpp" />
<ClCompile Include="..\src\date_gui.cpp" /> <ClCompile Include="..\src\date_gui.cpp" />
<ClCompile Include="..\src\departures_gui.cpp" />
<ClCompile Include="..\src\depot_gui.cpp" /> <ClCompile Include="..\src\depot_gui.cpp" />
<ClCompile Include="..\src\dock_gui.cpp" /> <ClCompile Include="..\src\dock_gui.cpp" />
<ClCompile Include="..\src\engine_gui.cpp" /> <ClCompile Include="..\src\engine_gui.cpp" />
@@ -768,6 +773,7 @@
<ClInclude Include="..\src\widgets\company_widget.h" /> <ClInclude Include="..\src\widgets\company_widget.h" />
<ClInclude Include="..\src\widgets\console_widget.h" /> <ClInclude Include="..\src\widgets\console_widget.h" />
<ClInclude Include="..\src\widgets\date_widget.h" /> <ClInclude Include="..\src\widgets\date_widget.h" />
<ClInclude Include="..\src\widgets\departures_widget.h" />
<ClInclude Include="..\src\widgets\depot_widget.h" /> <ClInclude Include="..\src\widgets\depot_widget.h" />
<ClInclude Include="..\src\widgets\dock_widget.h" /> <ClInclude Include="..\src\widgets\dock_widget.h" />
<ClCompile Include="..\src\widgets\dropdown.cpp" /> <ClCompile Include="..\src\widgets\dropdown.cpp" />

18
projects/openttd_vs100.vcxproj.filters
View File

@@ -159,6 +159,9 @@
<ClCompile Include="..\src\dedicated.cpp"> <ClCompile Include="..\src\dedicated.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\departures.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\depot.cpp"> <ClCompile Include="..\src\depot.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@@ -537,6 +540,15 @@
<ClInclude Include="..\src\video\dedicated_v.h"> <ClInclude Include="..\src\video\dedicated_v.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\departures_func.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\departures_gui.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\departures_type.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\depot_base.h"> <ClInclude Include="..\src\depot_base.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1356,6 +1368,9 @@
<ClCompile Include="..\src\date_gui.cpp"> <ClCompile Include="..\src\date_gui.cpp">
<Filter>GUI Source Code</Filter> <Filter>GUI Source Code</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\departures_gui.cpp">
<Filter>GUI Source Code</Filter>
</ClCompile>
<ClCompile Include="..\src\depot_gui.cpp"> <ClCompile Include="..\src\depot_gui.cpp">
<Filter>GUI Source Code</Filter> <Filter>GUI Source Code</Filter>
</ClCompile> </ClCompile>
@@ -1533,6 +1548,9 @@
<ClInclude Include="..\src\widgets\date_widget.h"> <ClInclude Include="..\src\widgets\date_widget.h">
<Filter>Widgets</Filter> <Filter>Widgets</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\widgets\departures_widget.h">
<Filter>Widgets</Filter>
</ClInclude>
<ClInclude Include="..\src\widgets\depot_widget.h"> <ClInclude Include="..\src\widgets\depot_widget.h">
<Filter>Widgets</Filter> <Filter>Widgets</Filter>
</ClInclude> </ClInclude>

6
projects/openttd_vs140.vcxproj
View File

@@ -327,6 +327,7 @@
<ClCompile Include="..\src\date.cpp" /> <ClCompile Include="..\src\date.cpp" />
<ClCompile Include="..\src\debug.cpp" /> <ClCompile Include="..\src\debug.cpp" />
<ClCompile Include="..\src\dedicated.cpp" /> <ClCompile Include="..\src\dedicated.cpp" />
<ClCompile Include="..\src\departures.cpp" />
<ClCompile Include="..\src\depot.cpp" /> <ClCompile Include="..\src\depot.cpp" />
<ClCompile Include="..\src\disaster_vehicle.cpp" /> <ClCompile Include="..\src\disaster_vehicle.cpp" />
<ClCompile Include="..\src\driver.cpp" /> <ClCompile Include="..\src\driver.cpp" />
@@ -449,6 +450,9 @@
<ClInclude Include="..\src\date_type.h" /> <ClInclude Include="..\src\date_type.h" />
<ClInclude Include="..\src\debug.h" /> <ClInclude Include="..\src\debug.h" />
<ClInclude Include="..\src\video\dedicated_v.h" /> <ClInclude Include="..\src\video\dedicated_v.h" />
<ClInclude Include="..\src\departures_func.h" />
<ClInclude Include="..\src\departures_gui.h" />
<ClInclude Include="..\src\departures_type.h" />
<ClInclude Include="..\src\depot_base.h" /> <ClInclude Include="..\src\depot_base.h" />
<ClInclude Include="..\src\depot_func.h" /> <ClInclude Include="..\src\depot_func.h" />
<ClInclude Include="..\src\depot_map.h" /> <ClInclude Include="..\src\depot_map.h" />
@@ -715,6 +719,7 @@
<ClCompile Include="..\src\company_gui.cpp" /> <ClCompile Include="..\src\company_gui.cpp" />
<ClCompile Include="..\src\console_gui.cpp" /> <ClCompile Include="..\src\console_gui.cpp" />
<ClCompile Include="..\src\date_gui.cpp" /> <ClCompile Include="..\src\date_gui.cpp" />
<ClCompile Include="..\src\departures_gui.cpp" />
<ClCompile Include="..\src\depot_gui.cpp" /> <ClCompile Include="..\src\depot_gui.cpp" />
<ClCompile Include="..\src\dock_gui.cpp" /> <ClCompile Include="..\src\dock_gui.cpp" />
<ClCompile Include="..\src\engine_gui.cpp" /> <ClCompile Include="..\src\engine_gui.cpp" />
@@ -772,6 +777,7 @@
<ClInclude Include="..\src\widgets\company_widget.h" /> <ClInclude Include="..\src\widgets\company_widget.h" />
<ClInclude Include="..\src\widgets\console_widget.h" /> <ClInclude Include="..\src\widgets\console_widget.h" />
<ClInclude Include="..\src\widgets\date_widget.h" /> <ClInclude Include="..\src\widgets\date_widget.h" />
<ClInclude Include="..\src\widgets\departures_widget.h" />
<ClInclude Include="..\src\widgets\depot_widget.h" /> <ClInclude Include="..\src\widgets\depot_widget.h" />
<ClInclude Include="..\src\widgets\dock_widget.h" /> <ClInclude Include="..\src\widgets\dock_widget.h" />
<ClCompile Include="..\src\widgets\dropdown.cpp" /> <ClCompile Include="..\src\widgets\dropdown.cpp" />

18
projects/openttd_vs140.vcxproj.filters
View File

@@ -159,6 +159,9 @@
<ClCompile Include="..\src\dedicated.cpp"> <ClCompile Include="..\src\dedicated.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\departures.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\depot.cpp"> <ClCompile Include="..\src\depot.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@@ -525,6 +528,15 @@
<ClInclude Include="..\src\video\dedicated_v.h"> <ClInclude Include="..\src\video\dedicated_v.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\departures_func.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\departures_gui.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\departures_type.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\depot_base.h"> <ClInclude Include="..\src\depot_base.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1323,6 +1335,9 @@
<ClCompile Include="..\src\date_gui.cpp"> <ClCompile Include="..\src\date_gui.cpp">
<Filter>GUI Source Code</Filter> <Filter>GUI Source Code</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\departures_gui.cpp">
<Filter>GUI Source Code</Filter>
</ClCompile>
<ClCompile Include="..\src\depot_gui.cpp"> <ClCompile Include="..\src\depot_gui.cpp">
<Filter>GUI Source Code</Filter> <Filter>GUI Source Code</Filter>
</ClCompile> </ClCompile>
@@ -1494,6 +1509,9 @@
<ClInclude Include="..\src\widgets\date_widget.h"> <ClInclude Include="..\src\widgets\date_widget.h">
<Filter>Widgets</Filter> <Filter>Widgets</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\widgets\departures_widget.h">
<Filter>Widgets</Filter>
</ClInclude>
<ClInclude Include="..\src\widgets\depot_widget.h"> <ClInclude Include="..\src\widgets\depot_widget.h">
<Filter>Widgets</Filter> <Filter>Widgets</Filter>
</ClInclude> </ClInclude>

4
projects/openttd_vs80.vcproj
View File

@@ -2378,6 +2378,10 @@
RelativePath=".\..\src\widgets\date_widget.h" RelativePath=".\..\src\widgets\date_widget.h"
> >
</File> </File>
<File
RelativePath=".\..\src\widgets\departures_widget.h"
>
</File>
<File <File
RelativePath=".\..\src\widgets\depot_widget.h" RelativePath=".\..\src\widgets\depot_widget.h"
> >

4
projects/openttd_vs90.vcproj
View File

@@ -2375,6 +2375,10 @@
RelativePath=".\..\src\widgets\date_widget.h" RelativePath=".\..\src\widgets\date_widget.h"
> >
</File> </File>
<File
RelativePath=".\..\src\widgets\departures_widget.h"
>
</File>
<File <File
RelativePath=".\..\src\widgets\depot_widget.h" RelativePath=".\..\src\widgets\depot_widget.h"
> >

1
source.list
View File

@@ -535,6 +535,7 @@ widgets/cheat_widget.h
widgets/company_widget.h widgets/company_widget.h
widgets/console_widget.h widgets/console_widget.h
widgets/date_widget.h widgets/date_widget.h
widgets/departures_widget.h
widgets/depot_widget.h widgets/depot_widget.h
widgets/dock_widget.h widgets/dock_widget.h
widgets/dropdown.cpp widgets/dropdown.cpp

8
src/widgets/departures_widget.h
View File

@@ -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 <http://www.gnu.org/licenses/>. * 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 waypoint_widget.h Types related to the waypoint widgets. */ /** @file departures_widget.h Types related to the departures widgets. */
#ifndef WIDGETS_DEPARTURES_WIDGET_H #ifndef WIDGETS_DEPARTURES_WIDGET_H
#define WIDGETS_DEPARTURES_WIDGET_H #define WIDGETS_DEPARTURES_WIDGET_H
/** Widgets of the WC_DEPARTURES_BOARD. */ /** Widgets of the WC_DEPARTURES_BOARD. */
enum DeparturesWindowWidgets { enum DeparturesWindowWidgets {
WID_DB_CAPTION, ///< Window caption WID_DB_CAPTION, ///< Window caption
WID_DB_LIST, ///< List of departures WID_DB_LIST, ///< List of departures
WID_DB_SCROLLBAR, ///< List scrollbar WID_DB_SCROLLBAR, ///< List scrollbar
WID_DB_SHOW_DEPS, ///< Toggle departures button WID_DB_SHOW_DEPS, ///< Toggle departures button
WID_DB_SHOW_ARRS, ///< Toggle arrivals button WID_DB_SHOW_ARRS, ///< Toggle arrivals button
WID_DB_SHOW_VIA, ///< Toggle via button WID_DB_SHOW_VIA, ///< Toggle via button