miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added 'OK' button to error message dialog

Browse Source
This commit is contained in:
pelya
2017-04-07 21:52:47 +03:00
parent f2405b6e3e
commit 7a5e2b454e
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/error_gui.cpp
View File

@@ -37,7 +37,10 @@ static const NWidgetPart _nested_errmsg_widgets[] = {
NWidget(WWT_CAPTION, COLOUR_RED, WID_EM_CAPTION), SetDataTip(STR_ERROR_MESSAGE_CAPTION, STR_NULL), NWidget(WWT_CAPTION, COLOUR_RED, WID_EM_CAPTION), SetDataTip(STR_ERROR_MESSAGE_CAPTION, STR_NULL),
EndContainer(), EndContainer(),
NWidget(WWT_PANEL, COLOUR_RED), NWidget(WWT_PANEL, COLOUR_RED),
NWidget(WWT_EMPTY, COLOUR_RED, WID_EM_MESSAGE), SetPadding(0, 2, 0, 2), SetMinimalSize(236, 32), NWidget(WWT_TEXT, COLOUR_RED), SetDataTip(STR_EMPTY, STR_NULL), // Add some borders
NWidget(WWT_EMPTY, COLOUR_RED, WID_EM_MESSAGE), SetPadding(4, 4, 4, 4), SetMinimalSize(236, 32),
NWidget(WWT_TEXT, COLOUR_RED), SetDataTip(STR_EMPTY, STR_NULL),
NWidget(WWT_PUSHTXTBTN, COLOUR_RED, WID_EM_CLOSE), SetPadding(4, 4, 4, 4), SetDataTip(STR_BUTTON_OK, STR_NULL),
EndContainer(), EndContainer(),
}; };
@@ -54,10 +57,13 @@ static const NWidgetPart _nested_errmsg_face_widgets[] = {
NWidget(WWT_CAPTION, COLOUR_RED, WID_EM_CAPTION), SetDataTip(STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY, STR_NULL), NWidget(WWT_CAPTION, COLOUR_RED, WID_EM_CAPTION), SetDataTip(STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY, STR_NULL),
EndContainer(), EndContainer(),
NWidget(WWT_PANEL, COLOUR_RED), NWidget(WWT_PANEL, COLOUR_RED),
NWidget(WWT_TEXT, COLOUR_RED), SetDataTip(STR_EMPTY, STR_NULL), // Add some borders
NWidget(NWID_HORIZONTAL), SetPIP(2, 1, 2), NWidget(NWID_HORIZONTAL), SetPIP(2, 1, 2),
NWidget(WWT_EMPTY, COLOUR_RED, WID_EM_FACE), SetMinimalSize(92, 119), SetFill(0, 1), SetPadding(2, 0, 1, 0), NWidget(WWT_EMPTY, COLOUR_RED, WID_EM_FACE), SetMinimalSize(92, 119), SetFill(0, 1), SetPadding(4, 4, 4, 4),
NWidget(WWT_EMPTY, COLOUR_RED, WID_EM_MESSAGE), SetFill(0, 1), SetMinimalSize(238, 123), NWidget(WWT_EMPTY, COLOUR_RED, WID_EM_MESSAGE), SetFill(0, 1), SetMinimalSize(238, 123), SetPadding(4, 4, 4, 4),
EndContainer(), EndContainer(),
NWidget(WWT_TEXT, COLOUR_RED), SetDataTip(STR_EMPTY, STR_NULL),
NWidget(WWT_PUSHTXTBTN, COLOUR_RED, WID_EM_CLOSE), SetPadding(4, 4, 4, 4), SetDataTip(STR_BUTTON_OK, STR_NULL),
EndContainer(), EndContainer(),
}; };
@@ -320,6 +326,18 @@ public:
return ES_HANDLED; return ES_HANDLED;
} }
virtual void OnClick(Point pt, int widget, int click_count)
{
switch (widget) {
case WID_EM_CLOSE:
delete this;
break;
default:
break;
}
}
/** /**
* Check whether the currently shown error message was critical or not. * Check whether the currently shown error message was critical or not.
* @return True iff the message was critical. * @return True iff the message was critical.

1
src/widgets/error_widget.h
View File

@@ -17,6 +17,7 @@ enum ErrorMessageWidgets {
WID_EM_CAPTION, ///< Caption of the window. WID_EM_CAPTION, ///< Caption of the window.
WID_EM_FACE, ///< Error title. WID_EM_FACE, ///< Error title.
WID_EM_MESSAGE, ///< Error message. WID_EM_MESSAGE, ///< Error message.
WID_EM_CLOSE, ///< Close button.
}; };
#endif /* WIDGETS_ERROR_WIDGET_H */ #endif /* WIDGETS_ERROR_WIDGET_H */