megbox.cpp/h: add overloaded version of ShowMsg() with string/locale combination

Constellation was missed.
This commit is contained in:
2016-12-23 20:51:39 +01:00
parent c92fa3f0f4
commit 22a7006644
2 changed files with 27 additions and 0 deletions

View File

@@ -528,6 +528,22 @@ int ShowMsg( const std::string & Title,
return (result); return (result);
} }
int ShowMsg( const std::string & Title,
const neutrino_locale_t Text,
const CMsgBox::msg_result_t Default,
const uint32_t ShowButtons,
const char * const Icon,
const int Width,
const int Timeout,
bool returnDefaultOnTimeout,
const int& Text_mode,
fb_pixel_t color_frame)
{
int result = ShowMsg2UTF(Title.c_str(), g_Locale->getText(Text), Default, ShowButtons, Icon, Width, Timeout, returnDefaultOnTimeout, Text_mode, color_frame);
return (result);
}
void DisplayErrorMessage(const char * const ErrorMsg, const neutrino_locale_t& caption, const int& Text_mode) void DisplayErrorMessage(const char * const ErrorMsg, const neutrino_locale_t& caption, const int& Text_mode)
{ {
ShowMsg(caption, ErrorMsg, CMsgBox::mbrCancel, CMsgBox::mbBack, NEUTRINO_ICON_ERROR, 500, NO_TIMEOUT, false, Text_mode, COL_RED); ShowMsg(caption, ErrorMsg, CMsgBox::mbrCancel, CMsgBox::mbBack, NEUTRINO_ICON_ERROR, 500, NO_TIMEOUT, false, Text_mode, COL_RED);

View File

@@ -392,6 +392,17 @@ int ShowMsg( const std::string & Title,
const int& Text_mode = DEFAULT_MSGBOX_TEXT_MODE, const int& Text_mode = DEFAULT_MSGBOX_TEXT_MODE,
fb_pixel_t color_frame = HINTBOX_DEFAULT_FRAME_COLOR); // UTF-8 fb_pixel_t color_frame = HINTBOX_DEFAULT_FRAME_COLOR); // UTF-8
int ShowMsg( const std::string & Title,
const neutrino_locale_t Text,
const CMsgBox::msg_result_t Default,
const uint32_t ShowButtons,
const char * const Icon = NULL,
const int Width = MSGBOX_MIN_WIDTH,
const int Timeout = NO_TIMEOUT,
bool returnDefaultOnTimeout = false,
const int& Text_mode = DEFAULT_MSGBOX_TEXT_MODE,
fb_pixel_t color_frame = HINTBOX_DEFAULT_FRAME_COLOR); // UTF-8
void DisplayErrorMessage(const char * const ErrorMsg, const int& Text_mode = DEFAULT_MSGBOX_TEXT_MODE); // UTF-8 void DisplayErrorMessage(const char * const ErrorMsg, const int& Text_mode = DEFAULT_MSGBOX_TEXT_MODE); // UTF-8
void DisplayErrorMessage(const char * const ErrorMsg, const neutrino_locale_t& caption, const int& Text_mode = DEFAULT_MSGBOX_TEXT_MODE); // UTF-8 void DisplayErrorMessage(const char * const ErrorMsg, const neutrino_locale_t& caption, const int& Text_mode = DEFAULT_MSGBOX_TEXT_MODE); // UTF-8
void DisplayErrorMessage(const char * const ErrorMsg, const std::string& caption, const int& Text_mode = DEFAULT_MSGBOX_TEXT_MODE); // UTF-8 void DisplayErrorMessage(const char * const ErrorMsg, const std::string& caption, const int& Text_mode = DEFAULT_MSGBOX_TEXT_MODE); // UTF-8