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

This commit is contained in:
truebrain
2011-12-16 16:27:45 +00:00
parent b90aa80e77
commit e9f584ac21
36 changed files with 1713 additions and 1714 deletions

View File

@@ -108,10 +108,10 @@ static const NWidgetPart _bootstrap_query_widgets[] = {
NWidget(WWT_CAPTION, COLOUR_GREY), SetDataTip(STR_MISSING_GRAPHICS_SET_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY),
NWidget(WWT_PANEL, COLOUR_GREY, BAFDW_QUESTION), EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY, WID_BAFD_QUESTION), EndContainer(),
NWidget(NWID_HORIZONTAL),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, BAFDW_YES), SetDataTip(STR_MISSING_GRAPHICS_YES_DOWNLOAD, STR_NULL),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, BAFDW_NO), SetDataTip(STR_MISSING_GRAPHICS_NO_QUIT, STR_NULL),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_BAFD_YES), SetDataTip(STR_MISSING_GRAPHICS_YES_DOWNLOAD, STR_NULL),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_BAFD_NO), SetDataTip(STR_MISSING_GRAPHICS_NO_QUIT, STR_NULL),
EndContainer(),
EndContainer(),
};
@@ -152,14 +152,14 @@ public:
}
switch (widget) {
case BAFDW_QUESTION:
case WID_BAFD_QUESTION:
/* The question is twice as wide as the buttons, and determine the height based on the width. */
size->width = this->button_size.width * 2;
size->height = GetStringHeight(STR_MISSING_GRAPHICS_SET_MESSAGE, size->width - WD_FRAMETEXT_LEFT - WD_FRAMETEXT_RIGHT) + WD_FRAMETEXT_BOTTOM + WD_FRAMETEXT_TOP;
break;
case BAFDW_YES:
case BAFDW_NO:
case WID_BAFD_YES:
case WID_BAFD_NO:
*size = this->button_size;
break;
}
@@ -175,12 +175,12 @@ public:
virtual void OnClick(Point pt, int widget, int click_count)
{
switch (widget) {
case BAFDW_YES:
case WID_BAFD_YES:
/* We got permission to connect! Yay! */
_network_content_client.Connect();
break;
case BAFDW_NO:
case WID_BAFD_NO:
_exit_game = true;
break;