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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/crashlog.cpp
#	src/fileio.cpp
#	src/fileio_func.h
#	src/fios_gui.cpp
#	src/ini_load.cpp
#	src/ini_type.h
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/network_client.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/os/windows/win32.cpp
#	src/road_cmd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/settings.ini
#	src/tree_cmd.cpp
#	src/tree_gui.cpp
#	src/vehicle_base.h
#	src/video/cocoa/cocoa_v.mm
#	src/video/cocoa/event.mm
#	src/video/cocoa/wnd_quartz.mm
#	src/viewport.cpp
#	src/widgets/tree_widget.h
This commit is contained in:
Jonathan G Rennison
2021-01-30 23:24:40 +00:00
parent 33d9e48bcf 0f91cb0479
commit 6c3e5642f8
235 changed files with 3537 additions and 3063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/widgets/tree_widget.h
View File

@@ -12,21 +12,14 @@
/** Widgets of the #BuildTreesWindow class. */
enum BuildTreesWidgets {
WID_BT_TYPE_11, ///< Tree 1st column 1st row.
WID_BT_TYPE_12, ///< Tree 1st column 2nd row.
WID_BT_TYPE_13, ///< Tree 1st column 3rd row.
WID_BT_TYPE_14, ///< Tree 1st column 4th row.
WID_BT_TYPE_21, ///< Tree 2st column 1st row.
WID_BT_TYPE_22, ///< Tree 2st column 2nd row.
WID_BT_TYPE_23, ///< Tree 2st column 3rd row.
WID_BT_TYPE_24, ///< Tree 2st column 4th row.
WID_BT_TYPE_31, ///< Tree 3st column 1st row.
WID_BT_TYPE_32, ///< Tree 3st column 2nd row.
WID_BT_TYPE_33, ///< Tree 3st column 3rd row.
WID_BT_TYPE_34, ///< Tree 3st column 4th row.
WID_BT_TYPE_RANDOM, ///< Button to build random type of tree.
WID_BT_SE_PANE, ///< Selection pane to show/hide scenario editor tools.
WID_BT_MODE_NORMAL, ///< Select normal/rectangle planting mode.
WID_BT_MODE_FOREST_SM, ///< Select small forest planting mode.
WID_BT_MODE_FOREST_LG, ///< Select large forest planting mode.
WID_BT_MANY_RANDOM, ///< Button to build many random trees.
WID_BT_REMOVE_ALL, ///< Button to remove all trees.
WID_BT_TYPE_BUTTON_FIRST, ///< First tree type selection button. (This must be last in the enum.)
};
#endif /* WIDGETS_TREE_WIDGET_H */