Mercurial > hg > openttd

changeset 18707:24984855dd2e draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r23555) -Fix (r23554): save before commit
author truebrain <truebrain@openttd.org>
date Fri, 16 Dec 2011 18:43:36 +0000
parents 64cbab132e45
children 4e23d6467710
files src/widgets/network_content_widget.h src/widgets/newgrf_debug_widget.h src/widgets/newgrf_widget.h src/widgets/sign_widget.h src/widgets/smallmap_widget.h
diffstat 5 files changed, 73 insertions(+), 73 deletions(-) [+]
line wrap: on
line diff
--- a/src/widgets/network_content_widget.h
+++ b/src/widgets/network_content_widget.h
@@ -18,7 +18,7 @@
 	WID_NCDS_CANCELOK,   ///< (Optional) Cancel/OK button.
 };
 
-/** Widgets of the WC_NETWORK_WINDOW (WC_NETWORK_WINDOW is also used in NetworkGameWindowWidgets, NetworkStartServerWidgets, and NetworkLobbyWindowWidgets). */
+/** Widgets of the WC_NETWORK_WINDOW (WC_NETWORK_WINDOW is also used in NetworkGameWidgets, NetworkStartServerWidgets, and NetworkLobbyWidgets). */
 enum NetworkContentListWidgets {
 	WID_NCL_BACKGROUND,     ///< Resize button.
 
--- a/src/widgets/newgrf_debug_widget.h
+++ b/src/widgets/newgrf_debug_widget.h
@@ -14,27 +14,27 @@
 
 /** Widgets of the WC_NEWGRF_INSPECT. */
 enum NewGRFInspectWidgets {
-	WID_NGRFI_CAPTION,   ///< The caption bar of course
-	WID_NGRFI_PARENT,    ///< Inspect the parent
-	WID_NGRFI_MAINPANEL, ///< Panel widget containing the actual data
-	WID_NGRFI_SCROLLBAR, ///< Scrollbar
+	WID_NGRFI_CAPTION,   ///< The caption bar of course.
+	WID_NGRFI_PARENT,    ///< Inspect the parent.
+	WID_NGRFI_MAINPANEL, ///< Panel widget containing the actual data.
+	WID_NGRFI_SCROLLBAR, ///< Scrollbar.
 };
 
 /** Widgets of the WC_SPRITE_ALIGNER. */
 enum SpriteAlignerWidgets {
-	WID_SA_CAPTION,  ///< Caption of the window
-	WID_SA_PREVIOUS, ///< Skip to the previous sprite
-	WID_SA_GOTO,     ///< Go to a given sprite
-	WID_SA_NEXT,     ///< Skip to the next sprite
-	WID_SA_UP,       ///< Move the sprite up
-	WID_SA_LEFT,     ///< Move the sprite to the left
-	WID_SA_RIGHT,    ///< Move the sprite to the right
-	WID_SA_DOWN,     ///< Move the sprite down
-	WID_SA_SPRITE,   ///< The actual sprite
-	WID_SA_OFFSETS,  ///< The sprite offsets
-	WID_SA_PICKER,   ///< Sprite picker
-	WID_SA_LIST,     ///< Queried sprite list
-	WID_SA_SCROLLBAR,///< Scrollbar for sprite list
+	WID_SA_CAPTION,   ///< Caption of the window.
+	WID_SA_PREVIOUS,  ///< Skip to the previous sprite.
+	WID_SA_GOTO,      ///< Go to a given sprite.
+	WID_SA_NEXT,      ///< Skip to the next sprite.
+	WID_SA_UP,        ///< Move the sprite up.
+	WID_SA_LEFT,      ///< Move the sprite to the left.
+	WID_SA_RIGHT,     ///< Move the sprite to the right.
+	WID_SA_DOWN,      ///< Move the sprite down.
+	WID_SA_SPRITE,    ///< The actual sprite.
+	WID_SA_OFFSETS,   ///< The sprite offsets.
+	WID_SA_PICKER,    ///< Sprite picker.
+	WID_SA_LIST,      ///< Queried sprite list.
+	WID_SA_SCROLLBAR, ///< Scrollbar for sprite list.
 };
 
 #endif /* WIDGETS_NEWGRF_DEBUG_WIDGET_H */
--- a/src/widgets/newgrf_widget.h
+++ b/src/widgets/newgrf_widget.h
@@ -16,17 +16,17 @@
 
 /** Widgets of the WC_GRF_PARAMETERS. */
 enum NewGRFParametersWidgets {
-	WID_NP_SHOW_NUMPAR,      ///< #NWID_SELECTION to optionally display #WID_NP_NUMPAR
-	WID_NP_NUMPAR_DEC,       ///< Button to decrease number of parameters
-	WID_NP_NUMPAR_INC,       ///< Button to increase number of parameters
-	WID_NP_NUMPAR,           ///< Optional number of parameters
-	WID_NP_NUMPAR_TEXT,      ///< Text description
-	WID_NP_BACKGROUND,       ///< Panel to draw the settings on
-	WID_NP_SCROLLBAR,        ///< Scrollbar to scroll through all settings
-	WID_NP_ACCEPT,           ///< Accept button
-	WID_NP_RESET,            ///< Reset button
-	WID_NP_SHOW_DESCRIPTION, ///< #NWID_SELECTION to optionally display parameter descriptions
-	WID_NP_DESCRIPTION,      ///< Multi-line description of a parameter
+	WID_NP_SHOW_NUMPAR,      ///< #NWID_SELECTION to optionally display #WID_NP_NUMPAR.
+	WID_NP_NUMPAR_DEC,       ///< Button to decrease number of parameters.
+	WID_NP_NUMPAR_INC,       ///< Button to increase number of parameters.
+	WID_NP_NUMPAR,           ///< Optional number of parameters.
+	WID_NP_NUMPAR_TEXT,      ///< Text description.
+	WID_NP_BACKGROUND,       ///< Panel to draw the settings on.
+	WID_NP_SCROLLBAR,        ///< Scrollbar to scroll through all settings.
+	WID_NP_ACCEPT,           ///< Accept button.
+	WID_NP_RESET,            ///< Reset button.
+	WID_NP_SHOW_DESCRIPTION, ///< #NWID_SELECTION to optionally display parameter descriptions.
+	WID_NP_DESCRIPTION,      ///< Multi-line description of a parameter.
 };
 
 /** Widgets of the WC_NEWGRF_TEXTFILE. */
@@ -39,34 +39,34 @@
 
 /** Widgets of the WC_GAME_OPTIONS (WC_GAME_OPTIONS is also used in others). */
 enum NewGRFStateWidgets {
-	WID_NS_PRESET_LIST,         ///< Active NewGRF preset.
-	WID_NS_PRESET_SAVE,         ///< Save list of active NewGRFs as presets.
-	WID_NS_PRESET_DELETE,       ///< Delete active preset.
-	WID_NS_ADD,                 ///< Add NewGRF to active list.
-	WID_NS_REMOVE,              ///< Remove NewGRF from active list.
-	WID_NS_MOVE_UP,             ///< Move NewGRF up in active list.
-	WID_NS_MOVE_DOWN,           ///< Move NewGRF down in active list.
-	WID_NS_FILTER,              ///< Filter list of available NewGRFs.
-	WID_NS_FILE_LIST,           ///< List window of active NewGRFs.
-	WID_NS_SCROLLBAR,           ///< Scrollbar for active NewGRF list.
-	WID_NS_AVAIL_LIST,          ///< List window of available NewGRFs.
-	WID_NS_SCROLL2BAR,          ///< Scrollbar for available NewGRF list.
-	WID_NS_NEWGRF_INFO_TITLE,   ///< Title for Info on selected NewGRF.
-	WID_NS_NEWGRF_INFO,         ///< Panel for Info on selected NewGRF.
-	WID_NS_OPEN_URL,            ///< Open URL of NewGRF.
-	WID_NS_NEWGRF_TEXTFILE,     ///< Open NewGRF readme, changelog (+1) or license (+2).
+	WID_NS_PRESET_LIST,       ///< Active NewGRF preset.
+	WID_NS_PRESET_SAVE,       ///< Save list of active NewGRFs as presets.
+	WID_NS_PRESET_DELETE,     ///< Delete active preset.
+	WID_NS_ADD,               ///< Add NewGRF to active list.
+	WID_NS_REMOVE,            ///< Remove NewGRF from active list.
+	WID_NS_MOVE_UP,           ///< Move NewGRF up in active list.
+	WID_NS_MOVE_DOWN,         ///< Move NewGRF down in active list.
+	WID_NS_FILTER,            ///< Filter list of available NewGRFs.
+	WID_NS_FILE_LIST,         ///< List window of active NewGRFs.
+	WID_NS_SCROLLBAR,         ///< Scrollbar for active NewGRF list.
+	WID_NS_AVAIL_LIST,        ///< List window of available NewGRFs.
+	WID_NS_SCROLL2BAR,        ///< Scrollbar for available NewGRF list.
+	WID_NS_NEWGRF_INFO_TITLE, ///< Title for Info on selected NewGRF.
+	WID_NS_NEWGRF_INFO,       ///< Panel for Info on selected NewGRF.
+	WID_NS_OPEN_URL,          ///< Open URL of NewGRF.
+	WID_NS_NEWGRF_TEXTFILE,   ///< Open NewGRF readme, changelog (+1) or license (+2).
 	WID_NS_SET_PARAMETERS = WID_NS_NEWGRF_TEXTFILE + TFT_END,   ///< Open Parameters Window for selected, active NewGRF.
-	WID_NS_TOGGLE_PALETTE,      ///< Toggle Palette of selected, active NewGRF.
-	WID_NS_APPLY_CHANGES,       ///< Apply changes to NewGRF config.
-	WID_NS_RESCAN_FILES,        ///< Rescan files (available NewGRFs).
-	WID_NS_RESCAN_FILES2,       ///< Rescan files (active NewGRFs).
-	WID_NS_CONTENT_DOWNLOAD,    ///< Open content download (available NewGRFs).
-	WID_NS_CONTENT_DOWNLOAD2,   ///< Open content download (active NewGRFs).
-	WID_NS_SHOW_REMOVE,         ///< Select active list buttons (0 = normal, 1 = simple layout).
-	WID_NS_SHOW_APPLY,          ///< Select display of the buttons below the 'details'.
+	WID_NS_TOGGLE_PALETTE,    ///< Toggle Palette of selected, active NewGRF.
+	WID_NS_APPLY_CHANGES,     ///< Apply changes to NewGRF config.
+	WID_NS_RESCAN_FILES,      ///< Rescan files (available NewGRFs).
+	WID_NS_RESCAN_FILES2,     ///< Rescan files (active NewGRFs).
+	WID_NS_CONTENT_DOWNLOAD,  ///< Open content download (available NewGRFs).
+	WID_NS_CONTENT_DOWNLOAD2, ///< Open content download (active NewGRFs).
+	WID_NS_SHOW_REMOVE,       ///< Select active list buttons (0 = normal, 1 = simple layout).
+	WID_NS_SHOW_APPLY,        ///< Select display of the buttons below the 'details'.
 };
 
-/** Widgets of the WC_MODAL_PROGRESS (WC_MODAL_PROGRESS is also used in GenerationProgressWindowWidgets). */
+/** Widgets of the WC_MODAL_PROGRESS (WC_MODAL_PROGRESS is also used in GenerationProgressWidgets). */
 enum ScanProgressWidgets {
 	WID_SP_PROGRESS_BAR,  ///< Simple progress bar.
 	WID_SP_PROGRESS_TEXT, ///< Text explaining what is happening.
--- a/src/widgets/sign_widget.h
+++ b/src/widgets/sign_widget.h
@@ -14,7 +14,7 @@
 
 /** Widgets of the WC_SIGN_LIST. */
 enum SignListWidgets {
-	/* Name starts with SI instead of S, because of collision with StationListWidgets */
+	/* Name starts with SI instead of S, because of collision with SaveLoadWidgets */
 	WID_SIL_CAPTION,               ///< Caption of the window.
 	WID_SIL_LIST,                  ///< List of signs.
 	WID_SIL_SCROLLBAR,             ///< Scrollbar of list.
--- a/src/widgets/smallmap_widget.h
+++ b/src/widgets/smallmap_widget.h
@@ -14,24 +14,24 @@
 
 /** Widgets of the WC_SMALLMAP. */
 enum SmallMapWidgets {
-	WID_SM_CAPTION,           ///< Caption of the window.
-	WID_SM_MAP_BORDER,        ///< Border around the smallmap.
-	WID_SM_MAP,               ///< Panel containing the smallmap.
-	WID_SM_LEGEND,            ///< Bottom panel to display smallmap legends.
-	WID_SM_ZOOM_IN,           ///< Button to zoom in one step.
-	WID_SM_ZOOM_OUT,          ///< Button to zoom out one step.
-	WID_SM_CONTOUR,           ///< Button to select the contour view (height map).
-	WID_SM_VEHICLES,          ///< Button to select the vehicles view.
-	WID_SM_INDUSTRIES,        ///< Button to select the industries view.
-	WID_SM_ROUTES,            ///< Button to select the routes view.
-	WID_SM_VEGETATION,        ///< Button to select the vegetation view.
-	WID_SM_OWNERS,            ///< Button to select the owners view.
-	WID_SM_CENTERMAP,         ///< Button to move smallmap center to main window center.
-	WID_SM_TOGGLETOWNNAME,    ///< Toggle button to display town names.
-	WID_SM_SELECT_BUTTONS,    ///< Selection widget for the buttons present in some smallmap modes.
-	WID_SM_ENABLE_ALL,        ///< Button to enable display of all legend entries.
-	WID_SM_DISABLE_ALL,       ///< Button to disable display of all legend entries.
-	WID_SM_SHOW_HEIGHT,       ///< Show heightmap toggle button.
+	WID_SM_CAPTION,        ///< Caption of the window.
+	WID_SM_MAP_BORDER,     ///< Border around the smallmap.
+	WID_SM_MAP,            ///< Panel containing the smallmap.
+	WID_SM_LEGEND,         ///< Bottom panel to display smallmap legends.
+	WID_SM_ZOOM_IN,        ///< Button to zoom in one step.
+	WID_SM_ZOOM_OUT,       ///< Button to zoom out one step.
+	WID_SM_CONTOUR,        ///< Button to select the contour view (height map).
+	WID_SM_VEHICLES,       ///< Button to select the vehicles view.
+	WID_SM_INDUSTRIES,     ///< Button to select the industries view.
+	WID_SM_ROUTES,         ///< Button to select the routes view.
+	WID_SM_VEGETATION,     ///< Button to select the vegetation view.
+	WID_SM_OWNERS,         ///< Button to select the owners view.
+	WID_SM_CENTERMAP,      ///< Button to move smallmap center to main window center.
+	WID_SM_TOGGLETOWNNAME, ///< Toggle button to display town names.
+	WID_SM_SELECT_BUTTONS, ///< Selection widget for the buttons present in some smallmap modes.
+	WID_SM_ENABLE_ALL,     ///< Button to enable display of all legend entries.
+	WID_SM_DISABLE_ALL,    ///< Button to disable display of all legend entries.
+	WID_SM_SHOW_HEIGHT,    ///< Show heightmap toggle button.
 };
 
 #endif /* WIDGETS_SMALLMAP_WIDGET_H */