mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r17188) -Codechange: Use display mode names for naming window and widget descriptions.

This commit is contained in:
alberth 2009-08-15 14:39:22 +00:00
parent ff60a5605c
commit dd6fcb08b6
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/news_gui.cpp
View File

@ -333,13 +333,13 @@ struct NewsWindow : Window {
/* static */ uint NewsWindow::duration; ///< Remaining time for showing current news message
static const Widget _news_type13_widgets[] = {
static const Widget _normal_news_widgets[] = {
{ WWT_PANEL, RESIZE_NONE, COLOUR_WHITE, 0, 429, 0, 169, 0x0, STR_NULL},
{ WWT_PANEL, RESIZE_NONE, COLOUR_WHITE, 0, 10, 0, 11, 0x0, STR_NULL},
{ WIDGETS_END},
};
static const NWidgetPart _nested_news_type13_widgets[] = {
static const NWidgetPart _nested_normal_news_widgets[] = {
NWidget(WWT_PANEL, COLOUR_WHITE, NTW_HEADLINE),
NWidget(NWID_HORIZONTAL),
NWidget(WWT_PANEL, COLOUR_WHITE, NTW_CLOSEBOX), SetMinimalSize(11, 12), EndContainer(),
@ -349,20 +349,20 @@ static const NWidgetPart _nested_news_type13_widgets[] = {
EndContainer(),
};
static WindowDesc _news_type13_desc(
static WindowDesc _normal_news_desc(
WDP_CENTER, 476, 430, 170, 430, 170,
WC_NEWS_WINDOW, WC_NONE,
WDF_DEF_WIDGET,
_news_type13_widgets, _nested_news_type13_widgets, lengthof(_nested_news_type13_widgets)
_normal_news_widgets, _nested_normal_news_widgets, lengthof(_nested_normal_news_widgets)
);
static const Widget _news_type2_widgets[] = {
static const Widget _thin_news_widgets[] = {
{ WWT_PANEL, RESIZE_NONE, COLOUR_WHITE, 0, 429, 0, 129, 0x0, STR_NULL},
{ WWT_PANEL, RESIZE_NONE, COLOUR_WHITE, 0, 10, 0, 11, 0x0, STR_NULL},
{ WIDGETS_END},
};
static const NWidgetPart _nested_news_type2_widgets[] = {
static const NWidgetPart _nested_thin_news_widgets[] = {
NWidget(WWT_PANEL, COLOUR_WHITE, NTW_HEADLINE),
NWidget(NWID_HORIZONTAL),
NWidget(WWT_PANEL, COLOUR_WHITE, NTW_CLOSEBOX), SetMinimalSize(11, 12), EndContainer(),
@ -372,14 +372,14 @@ static const NWidgetPart _nested_news_type2_widgets[] = {
EndContainer(),
};
static WindowDesc _news_type2_desc(
static WindowDesc _thin_news_desc(
WDP_CENTER, 476, 430, 130, 430, 130,
WC_NEWS_WINDOW, WC_NONE,
WDF_DEF_WIDGET,
_news_type2_widgets, _nested_news_type2_widgets, lengthof(_nested_news_type2_widgets)
_thin_news_widgets, _nested_thin_news_widgets, lengthof(_nested_thin_news_widgets)
);
static const Widget _news_type0_widgets[] = {
static const Widget _smalll_news_widgets[] = {
{ WWT_PANEL, RESIZE_NONE, COLOUR_LIGHT_BLUE, 0, 279, 14, 86, 0x0, STR_NULL},
{ WWT_CLOSEBOX, RESIZE_NONE, COLOUR_LIGHT_BLUE, 0, 10, 0, 13, STR_BLACK_CROSS, STR_TOOLTIP_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, COLOUR_LIGHT_BLUE, 11, 279, 0, 13, STR_NEWS_MESSAGE_CAPTION, STR_NULL},
@ -387,7 +387,7 @@ static const Widget _news_type0_widgets[] = {
{ WIDGETS_END},
};
static NWidgetPart _nested_news_type0_widgets[] = {
static NWidgetPart _nested_smalll_news_widgets[] = {
/* Caption + close box */
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_LIGHT_BLUE, NTW_CLOSEBOX), SetMinimalSize(11, 14), SetDataTip(STR_BLACK_CROSS, STR_TOOLTIP_CLOSE_WINDOW),
@ -409,12 +409,12 @@ static NWidgetPart _nested_news_type0_widgets[] = {
EndContainer(),
};
static WindowDesc _news_type0_desc(
static WindowDesc _smalll_news_desc(
WDP_CENTER, 476, 280, 87, 280, 87,
WC_NEWS_WINDOW, WC_NONE,
WDF_DEF_WIDGET,
_news_type0_widgets,
_nested_news_type0_widgets, lengthof(_nested_news_type0_widgets)
_smalll_news_widgets,
_nested_smalll_news_widgets, lengthof(_nested_smalll_news_widgets)
);
@ -428,8 +428,8 @@ static void ShowNewspaper(NewsItem *ni)
Window *w;
switch (_news_subtype_data[ni->subtype].display_mode) {
case NM_NORMAL:
_news_type13_desc.top = top;
w = new NewsWindow(&_news_type13_desc, ni);
_normal_news_desc.top = top;
w = new NewsWindow(&_normal_news_desc, ni);
if (ni->flags & NF_VIEWPORT) {
InitializeWindowViewport(w, 2, 58, 426, 110,
ni->reftype1 == NR_VEHICLE ? 0x80000000 | ni->ref1 : GetReferenceTile(ni->reftype1, ni->ref1), ZOOM_LVL_NEWS);
@ -437,8 +437,8 @@ static void ShowNewspaper(NewsItem *ni)
break;
case NM_THIN:
_news_type2_desc.top = top;
w = new NewsWindow(&_news_type2_desc, ni);
_thin_news_desc.top = top;
w = new NewsWindow(&_thin_news_desc, ni);
if (ni->flags & NF_VIEWPORT) {
InitializeWindowViewport(w, 2, 58, 426, 70,
ni->reftype1 == NR_VEHICLE ? 0x80000000 | ni->ref1 : GetReferenceTile(ni->reftype1, ni->ref1), ZOOM_LVL_NEWS);
@ -446,8 +446,8 @@ static void ShowNewspaper(NewsItem *ni)
break;
case NM_SMALL:
_news_type0_desc.top = top;
w = new NewsWindow(&_news_type0_desc, ni);
_smalll_news_desc.top = top;
w = new NewsWindow(&_smalll_news_desc, ni);
if (ni->flags & NF_VIEWPORT) {
InitializeWindowViewport(w, 3, 17, 274, 47,
ni->reftype1 == NR_VEHICLE ? 0x80000000 | ni->ref1 : GetReferenceTile(ni->reftype1, ni->ref1), ZOOM_LVL_NEWS);