cpp/openttd-patchpack/source Changeset - r18678:159c537f5381

Changeset - r18678:159c537f5381

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

truebrain - 13 years ago 2011-12-16 16:49:53
truebrain@openttd.org

(svn r23536) -Codechange: document and rename widgets to be consistent and understandable

6 files changed with 120 insertions and 120 deletions:

src/intro_gui.cpp

src/main_gui.cpp

src/misc_gui.cpp

src/widgets/intro_widget.h

src/widgets/main_widget.h

src/widgets/misc_widget.h

0 comments (0 inline, 0 general)

src/intro_gui.cpp

➞

Show inline comments

@@ @@ -46,55 +46,55 @@ struct SelectGameWindow : public Window @@
 	 * @param data Information about the changed data.
 	 * @param gui_scope Whether the call is done from GUI scope. You may not do everything when not in GUI scope. See #InvalidateWindowData() for details.
 	 */
 	virtual void OnInvalidateData(int data = 0, bool gui_scope = true)
+	{
 		if (!gui_scope) return;
 		this->SetWidgetLoweredState(SGI_TEMPERATE_LANDSCAPE, _settings_newgame.game_creation.landscape == LT_TEMPERATE);
 		this->SetWidgetLoweredState(SGI_ARCTIC_LANDSCAPE,    _settings_newgame.game_creation.landscape == LT_ARCTIC);
 		this->SetWidgetLoweredState(SGI_TROPIC_LANDSCAPE,    _settings_newgame.game_creation.landscape == LT_TROPIC);
 		this->SetWidgetLoweredState(SGI_TOYLAND_LANDSCAPE,   _settings_newgame.game_creation.landscape == LT_TOYLAND);
 		this->SetWidgetLoweredState(WID_SGI_TEMPERATE_LANDSCAPE, _settings_newgame.game_creation.landscape == LT_TEMPERATE);
 		this->SetWidgetLoweredState(WID_SGI_ARCTIC_LANDSCAPE,    _settings_newgame.game_creation.landscape == LT_ARCTIC);
 		this->SetWidgetLoweredState(WID_SGI_TROPIC_LANDSCAPE,    _settings_newgame.game_creation.landscape == LT_TROPIC);
 		this->SetWidgetLoweredState(WID_SGI_TOYLAND_LANDSCAPE,   _settings_newgame.game_creation.landscape == LT_TOYLAND);
+	}
 	virtual void SetStringParameters(int widget) const
+	{
-		if (widget == SGI_DIFFICULTIES) SetDParam(0, STR_DIFFICULTY_LEVEL_EASY + _settings_newgame.difficulty.diff_level);
+		if (widget == WID_SGI_DIFFICULTIES) SetDParam(0, STR_DIFFICULTY_LEVEL_EASY + _settings_newgame.difficulty.diff_level);
+	}
 	virtual void OnInit()
+	{
 		bool missing = _current_language->missing >= _settings_client.gui.missing_strings_threshold && !IsReleasedVersion();
-		this->GetWidget<NWidgetStacked>(SGI_TRANSLATION_SELECTION)->SetDisplayedPlane(missing ? 0 : SZSP_NONE);
+		this->GetWidget<NWidgetStacked>(WID_SGI_TRANSLATION_SELECTION)->SetDisplayedPlane(missing ? 0 : SZSP_NONE);
+	}
 	virtual void DrawWidget(const Rect &r, int widget) const
+	{
 		switch (widget) {
-			case SGI_TRANSLATION:
+			case WID_SGI_TRANSLATION:
 				SetDParam(0, _current_language->missing);
 				DrawStringMultiLine(r.left, r.right, r.top,  r.bottom, STR_INTRO_TRANSLATION, TC_FROMSTRING, SA_CENTER);
 				break;
+		}
+	}
 	virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
+	{
 		switch (widget) {
-			case SGI_DIFFICULTIES: {
+			case WID_SGI_DIFFICULTIES: {
 				Dimension textdim = {0, 0};
 				for (uint i = STR_DIFFICULTY_LEVEL_EASY; i <= STR_DIFFICULTY_LEVEL_CUSTOM; i++) {
 					SetDParam(0, i);
 					textdim = maxdim(textdim, GetStringBoundingBox(STR_INTRO_DIFFICULTY));
+				}
 				textdim.width += padding.width;
 				textdim.height += padding.height;
 				*size = maxdim(*size, textdim);
 				break;
+			}
-			case SGI_TRANSLATION: {
+			case WID_SGI_TRANSLATION: {
 				SetDParam(0, _current_language->missing);
 				int height = GetStringHeight(STR_INTRO_TRANSLATION, size->width);
 				if (height > 3 * FONT_HEIGHT_NORMAL) {
 					/* Don't let the window become too high. */
 					Dimension textdim = GetStringBoundingBox(STR_INTRO_TRANSLATION);
 					textdim.height *= 3;
@@ @@ -110,152 +110,152 @@ struct SelectGameWindow : public Window @@
 	virtual void OnClick(Point pt, int widget, int click_count)
+	{
 #ifdef ENABLE_NETWORK
 		/* Do not create a network server when you (just) have closed one of the game
 		 * creation/load windows for the network server. */
-		if (IsInsideMM(widget, SGI_GENERATE_GAME, SGI_EDIT_SCENARIO + 1)) _is_network_server = false;
+		if (IsInsideMM(widget, WID_SGI_GENERATE_GAME, WID_SGI_EDIT_SCENARIO + 1)) _is_network_server = false;
 #endif /* ENABLE_NETWORK */
 		switch (widget) {
-			case SGI_GENERATE_GAME:
+			case WID_SGI_GENERATE_GAME:
 				if (_ctrl_pressed) {
 					StartNewGameWithoutGUI(GENERATE_NEW_SEED);
 				} else {
 					ShowGenerateLandscape();
+				}
 				break;
 			case SGI_LOAD_GAME:      ShowSaveLoadDialog(SLD_LOAD_GAME); break;
 			case SGI_PLAY_SCENARIO:  ShowSaveLoadDialog(SLD_LOAD_SCENARIO); break;
 			case SGI_PLAY_HEIGHTMAP: ShowSaveLoadDialog(SLD_LOAD_HEIGHTMAP); break;
 			case SGI_EDIT_SCENARIO:  StartScenarioEditor(); break;
 			case WID_SGI_LOAD_GAME:      ShowSaveLoadDialog(SLD_LOAD_GAME); break;
 			case WID_SGI_PLAY_SCENARIO:  ShowSaveLoadDialog(SLD_LOAD_SCENARIO); break;
 			case WID_SGI_PLAY_HEIGHTMAP: ShowSaveLoadDialog(SLD_LOAD_HEIGHTMAP); break;
 			case WID_SGI_EDIT_SCENARIO:  StartScenarioEditor(); break;
-			case SGI_PLAY_NETWORK:
+			case WID_SGI_PLAY_NETWORK:
 				if (!_network_available) {
 					ShowErrorMessage(STR_NETWORK_ERROR_NOTAVAILABLE, INVALID_STRING_ID, WL_ERROR);
 				} else {
 					ShowNetworkGameWindow();
+				}
 				break;
 			case SGI_TEMPERATE_LANDSCAPE: case SGI_ARCTIC_LANDSCAPE:
 			case SGI_TROPIC_LANDSCAPE: case SGI_TOYLAND_LANDSCAPE:
 				SetNewLandscapeType(widget - SGI_TEMPERATE_LANDSCAPE);
 			case WID_SGI_TEMPERATE_LANDSCAPE: case WID_SGI_ARCTIC_LANDSCAPE:
 			case WID_SGI_TROPIC_LANDSCAPE: case WID_SGI_TOYLAND_LANDSCAPE:
 				SetNewLandscapeType(widget - WID_SGI_TEMPERATE_LANDSCAPE);
 				break;
 			case SGI_OPTIONS:         ShowGameOptions(); break;
 			case SGI_DIFFICULTIES:    ShowGameDifficulty(); break;
 			case SGI_SETTINGS_OPTIONS:ShowGameSettings(); break;
 			case SGI_GRF_SETTINGS:    ShowNewGRFSettings(true, true, false, &_grfconfig_newgame); break;
 			case SGI_CONTENT_DOWNLOAD:
 			case WID_SGI_OPTIONS:         ShowGameOptions(); break;
 			case WID_SGI_DIFFICULTIES:    ShowGameDifficulty(); break;
 			case WID_SGI_SETTINGS_OPTIONS:ShowGameSettings(); break;
 			case WID_SGI_GRF_SETTINGS:    ShowNewGRFSettings(true, true, false, &_grfconfig_newgame); break;
 			case WID_SGI_CONTENT_DOWNLOAD:
 				if (!_network_available) {
 					ShowErrorMessage(STR_NETWORK_ERROR_NOTAVAILABLE, INVALID_STRING_ID, WL_ERROR);
 				} else {
 					ShowNetworkContentListWindow();
+				}
 				break;
 			case SGI_AI_SETTINGS:     ShowAIConfigWindow(); break;
 			case SGI_EXIT:            HandleExitGameRequest(); break;
 			case WID_SGI_AI_SETTINGS:     ShowAIConfigWindow(); break;
 			case WID_SGI_EXIT:            HandleExitGameRequest(); break;
+		}
+	}
 };
 static const NWidgetPart _nested_select_game_widgets[] = {
 	NWidget(WWT_CAPTION, COLOUR_BROWN), SetDataTip(STR_INTRO_CAPTION, STR_NULL),
 	NWidget(WWT_PANEL, COLOUR_BROWN),
 	NWidget(NWID_SPACER), SetMinimalSize(0, 8),
 	/* 'generate game' and 'load game' buttons */
 	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, SGI_GENERATE_GAME), SetMinimalSize(158, 12),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_GENERATE_GAME), SetMinimalSize(158, 12),
 							SetDataTip(STR_INTRO_NEW_GAME, STR_INTRO_TOOLTIP_NEW_GAME), SetPadding(0, 0, 0, 10), SetFill(1, 0),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, SGI_LOAD_GAME), SetMinimalSize(158, 12),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_LOAD_GAME), SetMinimalSize(158, 12),
 							SetDataTip(STR_INTRO_LOAD_GAME, STR_INTRO_TOOLTIP_LOAD_GAME), SetPadding(0, 10, 0, 0), SetFill(1, 0),
 	EndContainer(),
 	NWidget(NWID_SPACER), SetMinimalSize(0, 6),
 	/* 'play scenario' and 'play heightmap' buttons */
 	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, SGI_PLAY_SCENARIO), SetMinimalSize(158, 12),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_SCENARIO), SetMinimalSize(158, 12),
 							SetDataTip(STR_INTRO_PLAY_SCENARIO, STR_INTRO_TOOLTIP_PLAY_SCENARIO), SetPadding(0, 0, 0, 10), SetFill(1, 0),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, SGI_PLAY_HEIGHTMAP), SetMinimalSize(158, 12),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_HEIGHTMAP), SetMinimalSize(158, 12),
 							SetDataTip(STR_INTRO_PLAY_HEIGHTMAP, STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP), SetPadding(0, 10, 0, 0), SetFill(1, 0),
 	EndContainer(),
 	NWidget(NWID_SPACER), SetMinimalSize(0, 6),
 	/* 'edit scenario' and 'play multiplayer' buttons */
 	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, SGI_EDIT_SCENARIO), SetMinimalSize(158, 12),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_EDIT_SCENARIO), SetMinimalSize(158, 12),
 							SetDataTip(STR_INTRO_SCENARIO_EDITOR, STR_INTRO_TOOLTIP_SCENARIO_EDITOR), SetPadding(0, 0, 0, 10), SetFill(1, 0),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, SGI_PLAY_NETWORK), SetMinimalSize(158, 12),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_NETWORK), SetMinimalSize(158, 12),
 							SetDataTip(STR_INTRO_MULTIPLAYER, STR_INTRO_TOOLTIP_MULTIPLAYER), SetPadding(0, 10, 0, 0), SetFill(1, 0),
 	EndContainer(),
 	NWidget(NWID_SPACER), SetMinimalSize(0, 7),
 	/* climate selection buttons */
 	NWidget(NWID_HORIZONTAL),
 		NWidget(NWID_SPACER), SetMinimalSize(10, 0), SetFill(1, 0),
-		NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, SGI_TEMPERATE_LANDSCAPE), SetMinimalSize(77, 55),
+		NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, WID_SGI_TEMPERATE_LANDSCAPE), SetMinimalSize(77, 55),
 							SetDataTip(SPR_SELECT_TEMPERATE, STR_INTRO_TOOLTIP_TEMPERATE),
 		NWidget(NWID_SPACER), SetMinimalSize(3, 0), SetFill(1, 0),
-		NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, SGI_ARCTIC_LANDSCAPE), SetMinimalSize(77, 55),
+		NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, WID_SGI_ARCTIC_LANDSCAPE), SetMinimalSize(77, 55),
 							SetDataTip(SPR_SELECT_SUB_ARCTIC, STR_INTRO_TOOLTIP_SUB_ARCTIC_LANDSCAPE),
 		NWidget(NWID_SPACER), SetMinimalSize(3, 0), SetFill(1, 0),
-		NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, SGI_TROPIC_LANDSCAPE), SetMinimalSize(77, 55),
+		NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, WID_SGI_TROPIC_LANDSCAPE), SetMinimalSize(77, 55),
 							SetDataTip(SPR_SELECT_SUB_TROPICAL, STR_INTRO_TOOLTIP_SUB_TROPICAL_LANDSCAPE),
 		NWidget(NWID_SPACER), SetMinimalSize(3, 0), SetFill(1, 0),
-		NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, SGI_TOYLAND_LANDSCAPE), SetMinimalSize(77, 55),
+		NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, WID_SGI_TOYLAND_LANDSCAPE), SetMinimalSize(77, 55),
 							SetDataTip(SPR_SELECT_TOYLAND, STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE),
 		NWidget(NWID_SPACER), SetMinimalSize(10, 0), SetFill(1, 0),
 	EndContainer(),
 	NWidget(NWID_SPACER), SetMinimalSize(0, 7),
-	NWidget(NWID_SELECTION, INVALID_COLOUR, SGI_TRANSLATION_SELECTION),
+	NWidget(NWID_SELECTION, INVALID_COLOUR, WID_SGI_TRANSLATION_SELECTION),
 		NWidget(NWID_VERTICAL),
-			NWidget(WWT_EMPTY, COLOUR_ORANGE, SGI_TRANSLATION), SetMinimalSize(316, 12), SetFill(1, 0), SetPadding(0, 10, 7, 10),
+			NWidget(WWT_EMPTY, COLOUR_ORANGE, WID_SGI_TRANSLATION), SetMinimalSize(316, 12), SetFill(1, 0), SetPadding(0, 10, 7, 10),
 		EndContainer(),
 	EndContainer(),
 	/* 'game options' and 'difficulty options' buttons */
 	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, SGI_OPTIONS), SetMinimalSize(158, 12),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_OPTIONS), SetMinimalSize(158, 12),
 							SetDataTip(STR_INTRO_GAME_OPTIONS, STR_INTRO_TOOLTIP_GAME_OPTIONS), SetPadding(0, 0, 0, 10), SetFill(1, 0),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, SGI_DIFFICULTIES), SetMinimalSize(158, 12),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_DIFFICULTIES), SetMinimalSize(158, 12),
 							SetDataTip(STR_INTRO_DIFFICULTY, STR_INTRO_TOOLTIP_DIFFICULTY_OPTIONS), SetPadding(0, 10, 0, 0), SetFill(1, 0),
 	EndContainer(),
 	NWidget(NWID_SPACER), SetMinimalSize(0, 6),
 	/* 'advanced settings' and 'newgrf settings' buttons */
 	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, SGI_SETTINGS_OPTIONS), SetMinimalSize(158, 12),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_SETTINGS_OPTIONS), SetMinimalSize(158, 12),
 							SetDataTip(STR_INTRO_ADVANCED_SETTINGS, STR_INTRO_TOOLTIP_ADVANCED_SETTINGS), SetPadding(0, 0, 0, 10), SetFill(1, 0),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, SGI_GRF_SETTINGS), SetMinimalSize(158, 12),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_GRF_SETTINGS), SetMinimalSize(158, 12),
 							SetDataTip(STR_INTRO_NEWGRF_SETTINGS, STR_INTRO_TOOLTIP_NEWGRF_SETTINGS), SetPadding(0, 10, 0, 0), SetFill(1, 0),
 	EndContainer(),
 	NWidget(NWID_SPACER), SetMinimalSize(0, 6),
 	/* 'online content' and 'ai settings' buttons */
 	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, SGI_CONTENT_DOWNLOAD), SetMinimalSize(158, 12),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_CONTENT_DOWNLOAD), SetMinimalSize(158, 12),
 							SetDataTip(STR_INTRO_ONLINE_CONTENT, STR_INTRO_TOOLTIP_ONLINE_CONTENT), SetPadding(0, 0, 0, 10), SetFill(1, 0),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, SGI_AI_SETTINGS), SetMinimalSize(158, 12),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_AI_SETTINGS), SetMinimalSize(158, 12),
 							SetDataTip(STR_INTRO_AI_SETTINGS, STR_INTRO_TOOLTIP_AI_SETTINGS), SetPadding(0, 10, 0, 0), SetFill(1, 0),
 	EndContainer(),
 	NWidget(NWID_SPACER), SetMinimalSize(0, 6),
 	/* 'exit program' button */
 	NWidget(NWID_HORIZONTAL),
 		NWidget(NWID_SPACER), SetFill(1, 0),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, SGI_EXIT), SetMinimalSize(128, 12),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_EXIT), SetMinimalSize(128, 12),
 							SetDataTip(STR_INTRO_QUIT, STR_INTRO_TOOLTIP_QUIT),
 		NWidget(NWID_SPACER), SetFill(1, 0),
 	EndContainer(),
 	NWidget(NWID_SPACER), SetMinimalSize(0, 8),

src/main_gui.cpp

➞

Show inline comments

@@ @@ -199,13 +199,13 @@ void ZoomInOrOutToCursorWindow(bool in, @@
 			DoZoomInOutWindow(in ? ZOOM_IN : ZOOM_OUT, w);
+		}
+	}
+}
 static const struct NWidgetPart _nested_main_window_widgets[] = {
-	NWidget(NWID_VIEWPORT, INVALID_COLOUR, MW_VIEWPORT), SetResize(1, 1),
+	NWidget(NWID_VIEWPORT, INVALID_COLOUR, WID_M_VIEWPORT), SetResize(1, 1),
 };
 static const WindowDesc _main_window_desc(
 	WDP_MANUAL, 0, 0,
 	WC_MAIN_WINDOW, WC_NONE,
 ,
@@ @@ -241,13 +241,13 @@ struct MainWindow : Window @@
 	MainWindow() : Window()
+	{
 		this->InitNested(&_main_window_desc, 0);
 		CLRBITS(this->flags, WF_WHITE_BORDER);
 		ResizeWindow(this, _screen.width, _screen.height);
-		NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(MW_VIEWPORT);
+		NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(WID_M_VIEWPORT);
 		nvp->InitializeViewport(this, TileXY(32, 32), ZOOM_LVL_VIEWPORT);
+	}
 	virtual void OnPaint()
+	{
 		this->DrawWidgets();
@@ @@ -420,13 +420,13 @@ struct MainWindow : Window @@
+		}
+	}
 	virtual void OnResize()
+	{
 		if (this->viewport != NULL) {
-			NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(MW_VIEWPORT);
+			NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(WID_M_VIEWPORT);
 			nvp->UpdateViewportCoordinates(this);
+		}
+	}
 	/**
 	 * Some data on this window has become invalid.

src/misc_gui.cpp

➞

Show inline comments

@@ @@ -45,13 +45,13 @@ int _caret_timer; @@
 static const NWidgetPart _nested_land_info_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY),
 		NWidget(WWT_CAPTION, COLOUR_GREY), SetDataTip(STR_LAND_AREA_INFORMATION_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 		NWidget(WWT_DEBUGBOX, COLOUR_GREY),
 	EndContainer(),
-	NWidget(WWT_PANEL, COLOUR_GREY, LIW_BACKGROUND), EndContainer(),
+	NWidget(WWT_PANEL, COLOUR_GREY, WID_LI_BACKGROUND), EndContainer(),
 };
 static const WindowDesc _land_info_desc(
 	WDP_AUTO, 0, 0,
 	WC_LAND_INFO, WC_NONE,
 ,
@@ @@ -70,13 +70,13 @@ class LandInfoWindow : public Window { @@
 public:
 	char landinfo_data[LAND_INFO_LINE_END][LAND_INFO_LINE_BUFF_SIZE];
 	TileIndex tile;
 	virtual void DrawWidget(const Rect &r, int widget) const
+	{
-		if (widget != LIW_BACKGROUND) return;
+		if (widget != WID_LI_BACKGROUND) return;
 		uint y = r.top + WD_TEXTPANEL_TOP;
 		for (uint i = 0; i < LAND_INFO_CENTERED_LINES; i++) {
 			if (StrEmpty(this->landinfo_data[i])) break;
 			DrawString(r.left + WD_FRAMETEXT_LEFT, r.right - WD_FRAMETEXT_RIGHT, y, this->landinfo_data[i], i == 0 ? TC_LIGHT_BLUE : TC_FROMSTRING, SA_HOR_CENTER);
@@ @@ -89,13 +89,13 @@ public: @@
 			DrawStringMultiLine(r.left + WD_FRAMETEXT_LEFT, r.right - WD_FRAMETEXT_RIGHT, y, r.bottom - WD_TEXTPANEL_BOTTOM, STR_JUST_RAW_STRING, TC_FROMSTRING, SA_CENTER);
+		}
+	}
 	virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
+	{
-		if (widget != LIW_BACKGROUND) return;
+		if (widget != WID_LI_BACKGROUND) return;
 		size->height = WD_TEXTPANEL_TOP + WD_TEXTPANEL_BOTTOM;
 		for (uint i = 0; i < LAND_INFO_CENTERED_LINES; i++) {
 			if (StrEmpty(this->landinfo_data[i])) break;
 			uint width = GetStringBoundingBox(this->landinfo_data[i]).width + WD_FRAMETEXT_LEFT + WD_FRAMETEXT_RIGHT;
@@ @@ -358,15 +358,15 @@ static const NWidgetPart _nested_about_w @@
 		NWidget(WWT_CAPTION, COLOUR_GREY), SetDataTip(STR_ABOUT_OPENTTD, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_GREY), SetPIP(4, 2, 4),
 		NWidget(WWT_LABEL, COLOUR_GREY), SetDataTip(STR_ABOUT_ORIGINAL_COPYRIGHT, STR_NULL),
 		NWidget(WWT_LABEL, COLOUR_GREY), SetDataTip(STR_ABOUT_VERSION, STR_NULL),
 		NWidget(WWT_FRAME, COLOUR_GREY), SetPadding(0, 5, 1, 5),
-			NWidget(WWT_EMPTY, INVALID_COLOUR, AW_SCROLLING_TEXT),
+			NWidget(WWT_EMPTY, INVALID_COLOUR, WID_A_SCROLLING_TEXT),
 		EndContainer(),
-		NWidget(WWT_LABEL, COLOUR_GREY, AW_WEBSITE), SetDataTip(STR_BLACK_RAW_STRING, STR_NULL),
+		NWidget(WWT_LABEL, COLOUR_GREY, WID_A_WEBSITE), SetDataTip(STR_BLACK_RAW_STRING, STR_NULL),
 		NWidget(WWT_LABEL, COLOUR_GREY), SetDataTip(STR_ABOUT_COPYRIGHT_OPENTTD, STR_NULL),
 	EndContainer(),
 };
 static const WindowDesc _about_desc(
 	WDP_CENTER, 0, 0,
@@ @@ -443,23 +443,23 @@ struct AboutWindow : public Window { @@
 	AboutWindow() : Window()
+	{
 		this->InitNested(&_about_desc);
 		this->counter = 5;
-		this->text_position = this->GetWidget<NWidgetBase>(AW_SCROLLING_TEXT)->pos_y + this->GetWidget<NWidgetBase>(AW_SCROLLING_TEXT)->current_y;
+		this->text_position = this->GetWidget<NWidgetBase>(WID_A_SCROLLING_TEXT)->pos_y + this->GetWidget<NWidgetBase>(WID_A_SCROLLING_TEXT)->current_y;
+	}
 	virtual void SetStringParameters(int widget) const
+	{
-		if (widget == AW_WEBSITE) SetDParamStr(0, "Website: http://www.openttd.org");
+		if (widget == WID_A_WEBSITE) SetDParamStr(0, "Website: http://www.openttd.org");
+	}
 	virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
+	{
-		if (widget != AW_SCROLLING_TEXT) return;
+		if (widget != WID_A_SCROLLING_TEXT) return;
 		this->line_height = FONT_HEIGHT_NORMAL;
 		Dimension d;
 		d.height = this->line_height * num_visible_lines;
@@ @@ -469,13 +469,13 @@ struct AboutWindow : public Window { @@
+		}
 		*size = maxdim(*size, d);
+	}
 	virtual void DrawWidget(const Rect &r, int widget) const
+	{
-		if (widget != AW_SCROLLING_TEXT) return;
+		if (widget != WID_A_SCROLLING_TEXT) return;
 		int y = this->text_position;
 		/* Show all scrolling _credits */
 		for (uint i = 0; i < lengthof(_credits); i++) {
 			if (y >= r.top + 7 && y < r.bottom - this->line_height) {
@@ @@ -488,14 +488,14 @@ struct AboutWindow : public Window { @@
 	virtual void OnTick()
+	{
 		if (--this->counter == 0) {
 			this->counter = 5;
 			this->text_position--;
 			/* If the last text has scrolled start a new from the start */
 			if (this->text_position < (int)(this->GetWidget<NWidgetBase>(AW_SCROLLING_TEXT)->pos_y - lengthof(_credits) * this->line_height)) {
 				this->text_position = this->GetWidget<NWidgetBase>(AW_SCROLLING_TEXT)->pos_y + this->GetWidget<NWidgetBase>(AW_SCROLLING_TEXT)->current_y;
 			if (this->text_position < (int)(this->GetWidget<NWidgetBase>(WID_A_SCROLLING_TEXT)->pos_y - lengthof(_credits) * this->line_height)) {
 				this->text_position = this->GetWidget<NWidgetBase>(WID_A_SCROLLING_TEXT)->pos_y + this->GetWidget<NWidgetBase>(WID_A_SCROLLING_TEXT)->current_y;
+			}
 			this->SetDirty();
+		}
+	}
 };
@@ @@ -600,13 +600,13 @@ void HideFillingPercent(TextEffectID *te @@
 	RemoveTextEffect(*te_id);
 	*te_id = INVALID_TE_ID;
+}
 static const NWidgetPart _nested_tooltips_widgets[] = {
-	NWidget(WWT_PANEL, COLOUR_GREY, TTW_BACKGROUND), SetMinimalSize(200, 32), EndContainer(),
+	NWidget(WWT_PANEL, COLOUR_GREY, WID_TT_BACKGROUND), SetMinimalSize(200, 32), EndContainer(),
 };
 static const WindowDesc _tool_tips_desc(
 	WDP_MANUAL, 0, 0, // Coordinates and sizes are not used,
 	WC_TOOLTIPS, WC_NONE,
 ,
@@ @@ -1115,36 +1115,36 @@ struct QueryStringWindow : public QueryS @@
 		InitializeTextBuffer(&this->text, this->edit_str_buf, max_bytes, max_chars);
 		this->InitNested(desc);
 		this->parent = parent;
 		this->SetFocusedWidget(QUERY_STR_WIDGET_TEXT);
 		this->LowerWidget(QUERY_STR_WIDGET_TEXT);
 		this->SetFocusedWidget(WID_QS_TEXT);
 		this->LowerWidget(WID_QS_TEXT);
+	}
 	virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
+	{
-		if (widget == QUERY_STR_WIDGET_DEFAULT && (this->flags & QSF_ENABLE_DEFAULT) == 0) {
+		if (widget == WID_QS_DEFAULT && (this->flags & QSF_ENABLE_DEFAULT) == 0) {
 			/* We don't want this widget to show! */
 			fill->width = 0;
 			resize->width = 0;
 			size->width = 0;
+		}
+	}
 	virtual void OnPaint()
+	{
 		this->DrawWidgets();
-		this->DrawEditBox(QUERY_STR_WIDGET_TEXT);
+		this->DrawEditBox(WID_QS_TEXT);
+	}
 	virtual void SetStringParameters(int widget) const
+	{
-		if (widget == QUERY_STR_WIDGET_CAPTION) SetDParam(0, this->caption);
+		if (widget == WID_QS_CAPTION) SetDParam(0, this->caption);
+	}
 	void OnOk()
+	{
 		if (this->orig == NULL || strcmp(this->text.buf, this->orig) != 0) {
 			/* If the parent is NULL, the editbox is handled by general function
@@ @@ -1158,33 +1158,33 @@ struct QueryStringWindow : public QueryS @@
+		}
+	}
 	virtual void OnClick(Point pt, int widget, int click_count)
+	{
 		switch (widget) {
-			case QUERY_STR_WIDGET_DEFAULT:
+			case WID_QS_DEFAULT:
 				this->text.buf[0] = '\0';
 				/* FALL THROUGH */
-			case QUERY_STR_WIDGET_OK:
+			case WID_QS_OK:
 				this->OnOk();
 				/* FALL THROUGH */
-			case QUERY_STR_WIDGET_CANCEL:
+			case WID_QS_CANCEL:
 				delete this;
 				break;
+		}
+	}
 	virtual void OnMouseLoop()
+	{
-		this->HandleEditBox(QUERY_STR_WIDGET_TEXT);
+		this->HandleEditBox(WID_QS_TEXT);
+	}
 	virtual EventState OnKeyPress(uint16 key, uint16 keycode)
+	{
 		EventState state = ES_NOT_HANDLED;
-		switch (this->HandleEditBoxKey(QUERY_STR_WIDGET_TEXT, key, keycode, state)) {
+		switch (this->HandleEditBoxKey(WID_QS_TEXT, key, keycode, state)) {
 			default: NOT_REACHED();
 			case HEBR_EDITING: {
 				Window *osk = FindWindowById(WC_OSK, 0);
 				if (osk != NULL && osk->parent == this) osk->InvalidateData();
 				break;
+			}
@@ @@ -1195,13 +1195,13 @@ struct QueryStringWindow : public QueryS @@
+		}
 		return state;
+	}
 	virtual void OnOpenOSKWindow(int wid)
+	{
-		ShowOnScreenKeyboard(this, wid, QUERY_STR_WIDGET_CANCEL, QUERY_STR_WIDGET_OK);
+		ShowOnScreenKeyboard(this, wid, WID_QS_CANCEL, WID_QS_OK);
+	}
 	~QueryStringWindow()
+	{
 		if (!this->handled && this->parent != NULL) {
 			Window *parent = this->parent;
@@ @@ -1211,21 +1211,21 @@ struct QueryStringWindow : public QueryS @@
+	}
 };
 static const NWidgetPart _nested_query_string_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY),
-		NWidget(WWT_CAPTION, COLOUR_GREY, QUERY_STR_WIDGET_CAPTION), SetDataTip(STR_WHITE_STRING, STR_NULL),
+		NWidget(WWT_CAPTION, COLOUR_GREY, WID_QS_CAPTION), SetDataTip(STR_WHITE_STRING, STR_NULL),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_GREY),
-		NWidget(WWT_EDITBOX, COLOUR_GREY, QUERY_STR_WIDGET_TEXT), SetMinimalSize(256, 12), SetFill(1, 1), SetPadding(2, 2, 2, 2),
+		NWidget(WWT_EDITBOX, COLOUR_GREY, WID_QS_TEXT), SetMinimalSize(256, 12), SetFill(1, 1), SetPadding(2, 2, 2, 2),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
 		NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_STR_WIDGET_DEFAULT), SetMinimalSize(87, 12), SetFill(1, 1), SetDataTip(STR_BUTTON_DEFAULT, STR_NULL),
 		NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_STR_WIDGET_CANCEL), SetMinimalSize(86, 12), SetFill(1, 1), SetDataTip(STR_BUTTON_CANCEL, STR_NULL),
 		NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_STR_WIDGET_OK), SetMinimalSize(87, 12), SetFill(1, 1), SetDataTip(STR_BUTTON_OK, STR_NULL),
 		NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_QS_DEFAULT), SetMinimalSize(87, 12), SetFill(1, 1), SetDataTip(STR_BUTTON_DEFAULT, STR_NULL),
 		NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_QS_CANCEL), SetMinimalSize(86, 12), SetFill(1, 1), SetDataTip(STR_BUTTON_CANCEL, STR_NULL),
 		NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_QS_OK), SetMinimalSize(87, 12), SetFill(1, 1), SetDataTip(STR_BUTTON_OK, STR_NULL),
 	EndContainer(),
 };
 static const WindowDesc _query_string_desc(
 	WDP_CENTER, 0, 0,
 	WC_QUERY_STRING, WC_NONE,
@@ @@ -1279,44 +1279,44 @@ struct QueryWindow : public Window { @@
 		if (this->proc != NULL) this->proc(this->parent, false);
+	}
 	virtual void SetStringParameters(int widget) const
+	{
 		switch (widget) {
-			case QUERY_WIDGET_CAPTION:
+			case WID_Q_CAPTION:
 				CopyInDParam(1, this->params, lengthof(this->params));
 				SetDParam(0, this->caption);
 				break;
-			case QUERY_WIDGET_TEXT:
+			case WID_Q_TEXT:
 				CopyInDParam(0, this->params, lengthof(this->params));
 				break;
+		}
+	}
 	virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
+	{
-		if (widget != QUERY_WIDGET_TEXT) return;
+		if (widget != WID_Q_TEXT) return;
 		Dimension d = GetStringMultiLineBoundingBox(this->message, *size);
 		d.width += padding.width;
 		d.height += padding.height;
 		*size = d;
+	}
 	virtual void DrawWidget(const Rect &r, int widget) const
+	{
-		if (widget != QUERY_WIDGET_TEXT) return;
+		if (widget != WID_Q_TEXT) return;
 		DrawStringMultiLine(r.left, r.right, r.top, r.bottom, this->message, TC_FROMSTRING, SA_CENTER);
+	}
 	virtual void OnClick(Point pt, int widget, int click_count)
+	{
 		switch (widget) {
-			case QUERY_WIDGET_YES: {
+			case WID_Q_YES: {
 				/* in the Generate New World window, clicking 'Yes' causes
 				 * DeleteNonVitalWindows() to be called - we shouldn't be in a window then */
 				QueryCallbackProc *proc = this->proc;
 				Window *parent = this->parent;
 				/* Prevent the destructor calling the callback function */
 				this->proc = NULL;
@@ @@ -1324,13 +1324,13 @@ struct QueryWindow : public Window { @@
 				if (proc != NULL) {
 					proc(parent, true);
 					proc = NULL;
+				}
 				break;
+			}
-			case QUERY_WIDGET_NO:
+			case WID_Q_NO:
 				delete this;
 				break;
+		}
+	}
 	virtual EventState OnKeyPress(uint16 key, uint16 keycode)
@@ @@ -1352,19 +1352,19 @@ struct QueryWindow : public Window { @@
+	}
 };
 static const NWidgetPart _nested_query_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_RED),
-		NWidget(WWT_CAPTION, COLOUR_RED, QUERY_WIDGET_CAPTION), SetDataTip(STR_JUST_STRING, STR_NULL),
+		NWidget(WWT_CAPTION, COLOUR_RED, WID_Q_CAPTION), SetDataTip(STR_JUST_STRING, STR_NULL),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_RED), SetPIP(8, 15, 8),
-		NWidget(WWT_TEXT, COLOUR_RED, QUERY_WIDGET_TEXT), SetMinimalSize(200, 12),
+		NWidget(WWT_TEXT, COLOUR_RED, WID_Q_TEXT), SetMinimalSize(200, 12),
 		NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(20, 29, 20),
 			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, QUERY_WIDGET_NO), SetMinimalSize(71, 12), SetDataTip(STR_QUIT_NO, STR_NULL),
 			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, QUERY_WIDGET_YES), SetMinimalSize(71, 12), SetDataTip(STR_QUIT_YES, STR_NULL),
 			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_Q_NO), SetMinimalSize(71, 12), SetDataTip(STR_QUIT_NO, STR_NULL),
 			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_Q_YES), SetMinimalSize(71, 12), SetDataTip(STR_QUIT_YES, STR_NULL),
 		EndContainer(),
 	EndContainer(),
 };
 static const WindowDesc _query_desc(
 	WDP_CENTER, 0, 0,

src/widgets/intro_widget.h

➞

Show inline comments

@@ @@ -11,28 +11,28 @@ @@
 #ifndef WIDGETS_INTRO_WIDGET_H
 #define WIDGETS_INTRO_WIDGET_H
 /** Widgets of the WC_SELECT_GAME. */
 enum SelectGameIntroWidgets {
 	SGI_GENERATE_GAME,
 	SGI_LOAD_GAME,
 	SGI_PLAY_SCENARIO,
 	SGI_PLAY_HEIGHTMAP,
 	SGI_EDIT_SCENARIO,
 	SGI_PLAY_NETWORK,
 	SGI_TEMPERATE_LANDSCAPE,
 	SGI_ARCTIC_LANDSCAPE,
 	SGI_TROPIC_LANDSCAPE,
 	SGI_TOYLAND_LANDSCAPE,
 	SGI_TRANSLATION_SELECTION,
 	SGI_TRANSLATION,
 	SGI_OPTIONS,
 	SGI_DIFFICULTIES,
 	SGI_SETTINGS_OPTIONS,
 	SGI_GRF_SETTINGS,
 	SGI_CONTENT_DOWNLOAD,
 	SGI_AI_SETTINGS,
 	SGI_EXIT,
 	WID_SGI_GENERATE_GAME,         ///< Generate game button.
 	WID_SGI_LOAD_GAME,             ///< Load game button.
 	WID_SGI_PLAY_SCENARIO,         ///< Play scenario button.
 	WID_SGI_PLAY_HEIGHTMAP,        ///< Play heightmap button.
 	WID_SGI_EDIT_SCENARIO,         ///< Edit scenario button.
 	WID_SGI_PLAY_NETWORK,          ///< Play network button.
 	WID_SGI_TEMPERATE_LANDSCAPE,   ///< Select temperate landscape button.
 	WID_SGI_ARCTIC_LANDSCAPE,      ///< Select arctic landscape button.
 	WID_SGI_TROPIC_LANDSCAPE,      ///< Select tropic landscape button.
 	WID_SGI_TOYLAND_LANDSCAPE,     ///< Select toyland landscape button.
 	WID_SGI_TRANSLATION_SELECTION, ///< Translation selection.
 	WID_SGI_TRANSLATION,           ///< Translation.
 	WID_SGI_OPTIONS,               ///< Options button.
 	WID_SGI_DIFFICULTIES,          ///< Difficulties button.
 	WID_SGI_SETTINGS_OPTIONS,      ///< Settings button.
 	WID_SGI_GRF_SETTINGS,          ///< NewGRF button.
 	WID_SGI_CONTENT_DOWNLOAD,      ///< Content Download button.
 	WID_SGI_AI_SETTINGS,           ///< AI button.
 	WID_SGI_EXIT,                  ///< Exit button.
 };
 #endif /* WIDGETS_INTRO_WIDGET_H */

src/widgets/main_widget.h

➞

Show inline comments

@@ @@ -10,11 +10,11 @@ @@
 /** @file main_widget.h Types related to the main widgets. */
 #ifndef WIDGETS_MAIN_WIDGET_H
 #define WIDGETS_MAIN_WIDGET_H
 /** Widgets of the WC_MAIN_WINDOW. */
 enum MainWindowWidgets {
 	MW_VIEWPORT, ///< Main window viewport.
 enum MainWidgets {
 	WID_M_VIEWPORT, ///< Main window viewport.
 };
 #endif /* WIDGETS_MAIN_WIDGET_H */

src/widgets/misc_widget.h

➞

Show inline comments

@@ @@ -11,38 +11,38 @@ @@
 #ifndef WIDGETS_MISC_WIDGET_H
 #define WIDGETS_MISC_WIDGET_H
 /** Widgets of the WC_LAND_INFO. */
 enum LandInfoWidgets {
-	LIW_BACKGROUND, ///< Background to draw on
+	WID_LI_BACKGROUND, ///< Background of the window.
 };
 /** Widgets of the WC_TOOLTIPS. */
 enum ToolTipsWidgets {
-	TTW_BACKGROUND, ///< Background to draw on
+	WID_TT_BACKGROUND, ///< Background of the window.
 };
 /** Widgets of the WC_GAME_OPTIONS (WC_GAME_OPTIONS is also used in others). */
 enum AboutWidgets {
 	AW_SCROLLING_TEXT,       ///< The actually scrolling text
 	AW_WEBSITE,              ///< URL of OpenTTD website
 	WID_A_SCROLLING_TEXT, ///< The actually scrolling text.
 	WID_A_WEBSITE,        ///< URL of OpenTTD website.
 };
 /** Widgets of the WC_QUERY_STRING (WC_QUERY_STRING is also used in QueryEditSignWidgets). */
 enum QueryStringWidgets {
 	QUERY_STR_WIDGET_CAPTION,
 	QUERY_STR_WIDGET_TEXT,
 	QUERY_STR_WIDGET_DEFAULT,
 	QUERY_STR_WIDGET_CANCEL,
 	QUERY_STR_WIDGET_OK
 	WID_QS_CAPTION, ///< Caption of the window.
 	WID_QS_TEXT,    ///< Text of the query.
 	WID_QS_DEFAULT, ///< Default button.
 	WID_QS_CANCEL,  ///< Cancel button.
 	WID_QS_OK       ///< OK button.
 };
 /** Widgets of the WC_CONFIRM_POPUP_QUERY (WC_CONFIRM_POPUP_QUERY is also used in BootstrapAskForDownloadWidgets). */
 enum QueryWidgets {
 	QUERY_WIDGET_CAPTION,
 	QUERY_WIDGET_TEXT,
 	QUERY_WIDGET_NO,
 	QUERY_WIDGET_YES
 	WID_Q_CAPTION, ///< Caption of the window.
 	WID_Q_TEXT,    ///< Text of the query.
 	WID_Q_NO,      ///< Yes button.
 	WID_Q_YES      ///< No button.
 };
 #endif /* WIDGETS_MISC_WIDGET_H */

0 comments (0 inline, 0 general)