Mercurial > hg > openttd

changeset 18706:64cbab132e45 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r23554) -Codechange: some minor consistency fixes
author truebrain <truebrain@openttd.org>
date Fri, 16 Dec 2011 18:42:20 +0000
parents 73e09862a265
children 24984855dd2e
files src/widgets/news_widget.h src/widgets/order_widget.h src/widgets/osk_widget.h src/widgets/station_widget.h src/widgets/subsidy_widget.h src/widgets/tree_widget.h
diffstat 6 files changed, 30 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/src/widgets/news_widget.h
+++ b/src/widgets/news_widget.h
@@ -57,7 +57,7 @@
 
 /** Widgets of the WC_GAME_OPTIONS (WC_GAME_OPTIONS is also used in others). */
 enum MessageOptionWidgets {
-	WID_MO_BACKGROUND,        ///< Background of the widget.
+	WID_MO_BACKGROUND,        ///< Background of the window.
 	WID_MO_LABEL,             ///< Top label.
 	WID_MO_DROP_SUMMARY,      ///< Dropdown that adjusts at once the level for all settings.
 	WID_MO_LABEL_SUMMARY,     ///< Label of the summary drop down.
--- a/src/widgets/order_widget.h
+++ b/src/widgets/order_widget.h
@@ -14,7 +14,7 @@
 
 /** Widgets of the WC_VEHICLE_ORDERS. */
 enum OrderWidgets {
-	WID_O_CAPTION,                   ///< Window caption.
+	WID_O_CAPTION,                   ///< Caption of the window.
 	WID_O_TIMETABLE_VIEW,            ///< Toggle timetable view.
 	WID_O_ORDER_LIST,                ///< Order list panel.
 	WID_O_SCROLLBAR,                 ///< Order list scrollbar.
--- a/src/widgets/osk_widget.h
+++ b/src/widgets/osk_widget.h
@@ -14,18 +14,18 @@
 
 /** Widgets of the WC_OSK. */
 enum OnScreenKeyboardWidgets {
-	WID_OSK_CAPTION,         ///< Caption of window.
-	WID_OSK_TEXT,            ///< Edit box.
-	WID_OSK_CANCEL,          ///< Cancel key.
-	WID_OSK_OK,              ///< Ok key.
-	WID_OSK_BACKSPACE,       ///< Backspace key.
-	WID_OSK_SPECIAL,         ///< Special key (at keyborads often used for tab key).
-	WID_OSK_CAPS,            ///< Capslock key.
-	WID_OSK_SHIFT,           ///< Shift(lock) key.
-	WID_OSK_SPACE,           ///< Space bar.
-	WID_OSK_LEFT,            ///< Cursor left key.
-	WID_OSK_RIGHT,           ///< Cursor right key.
-	WID_OSK_LETTERS,         ///< First widget of the 'normal' keys.
+	WID_OSK_CAPTION,   ///< Caption of window.
+	WID_OSK_TEXT,      ///< Edit box.
+	WID_OSK_CANCEL,    ///< Cancel key.
+	WID_OSK_OK,        ///< Ok key.
+	WID_OSK_BACKSPACE, ///< Backspace key.
+	WID_OSK_SPECIAL,   ///< Special key (at keyborads often used for tab key).
+	WID_OSK_CAPS,      ///< Capslock key.
+	WID_OSK_SHIFT,     ///< Shift(lock) key.
+	WID_OSK_SPACE,     ///< Space bar.
+	WID_OSK_LEFT,      ///< Cursor left key.
+	WID_OSK_RIGHT,     ///< Cursor right key.
+	WID_OSK_LETTERS,   ///< First widget of the 'normal' keys.
 
 	WID_OSK_NUMBERS_FIRST = WID_OSK_LETTERS,            ///< First widget of the numbers row.
 	WID_OSK_NUMBERS_LAST  = WID_OSK_NUMBERS_FIRST + 13, ///< Last widget of the numbers row.
--- a/src/widgets/station_widget.h
+++ b/src/widgets/station_widget.h
@@ -29,6 +29,7 @@
 
 /** Widgets of the WC_STATION_LIST. */
 enum StationListWidgets {
+	/* Name starts with ST instead of S, because of collision with SaveLoadWidgets */
 	WID_STL_CAPTION,        ///< Caption of the window.
 	WID_STL_LIST,           ///< The main panel, list of stations.
 	WID_STL_SCROLLBAR,      ///< Scrollbar next to the main panel.
--- a/src/widgets/subsidy_widget.h
+++ b/src/widgets/subsidy_widget.h
@@ -14,7 +14,7 @@
 
 /** Widgets of the WC_SUBSIDIES_LIST. */
 enum SubsidyListWidgets {
-	/* Name starts with SU instead of S, because of collision with StationListWidgets */
+	/* Name starts with SU instead of S, because of collision with SaveLoadWidgets. */
 	WID_SUL_PANEL,     ///< Main panel of window.
 	WID_SUL_SCROLLBAR, ///< Scrollbar of panel.
 };
--- a/src/widgets/tree_widget.h
+++ b/src/widgets/tree_widget.h
@@ -14,20 +14,20 @@
 
 /** Widgets of the WC_BUILD_TREES. */
 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 1st column 1st row
-	WID_BT_TYPE_22,         ///< tree 1st column 2nd row
-	WID_BT_TYPE_23,         ///< tree 1st column 3rd row
-	WID_BT_TYPE_24,         ///< tree 1st column 4th row
-	WID_BT_TYPE_31,         ///< tree 1st column 1st row
-	WID_BT_TYPE_32,         ///< tree 1st column 2nd row
-	WID_BT_TYPE_33,         ///< tree 1st column 3rd row
-	WID_BT_TYPE_34,         ///< tree 1st column 4th row
-	WID_BT_TYPE_RANDOM,     ///< button to build random type of tree
-	WID_BT_MANY_RANDOM,     ///< button to build many random trees
+	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 1st column 1st row.
+	WID_BT_TYPE_22,         ///< Tree 1st column 2nd row.
+	WID_BT_TYPE_23,         ///< Tree 1st column 3rd row.
+	WID_BT_TYPE_24,         ///< Tree 1st column 4th row.
+	WID_BT_TYPE_31,         ///< Tree 1st column 1st row.
+	WID_BT_TYPE_32,         ///< Tree 1st column 2nd row.
+	WID_BT_TYPE_33,         ///< Tree 1st column 3rd row.
+	WID_BT_TYPE_34,         ///< Tree 1st column 4th row.
+	WID_BT_TYPE_RANDOM,     ///< Button to build random type of tree.
+	WID_BT_MANY_RANDOM,     ///< Button to build many random trees.
 };
 
 #endif /* WIDGETS_TREE_WIDGET_H */