mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 18:31:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Display[Error|Info]Message: Add optional parameter 'Caption'

Browse Source
This commit is contained in:
M. Liebmann
2015-09-17 12:01:05 +02:00
parent 653d196e16
commit 8ad20d4513
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gui/widget/messagebox.cpp
View File

@@ -334,7 +334,27 @@ void DisplayErrorMessage(const char * const ErrorMsg)
ShowMsg(LOCALE_MESSAGEBOX_ERROR, ErrorMsg, CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR); ShowMsg(LOCALE_MESSAGEBOX_ERROR, ErrorMsg, CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR);
} }
void DisplayInfoMessage(const char * const ErrorMsg) void DisplayErrorMessage(const char * const ErrorMsg, const neutrino_locale_t Caption)
{ {
ShowMsg(LOCALE_MESSAGEBOX_INFO, ErrorMsg, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); ShowMsg(Caption, ErrorMsg, CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR);
}
void DisplayErrorMessage(const char * const ErrorMsg, const std::string &Caption)
{
ShowMsg(Caption, ErrorMsg, CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR);
}
void DisplayInfoMessage(const char * const InfoMsg)
{
ShowMsg(LOCALE_MESSAGEBOX_INFO, InfoMsg, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO);
}
void DisplayInfoMessage(const char * const InfoMsg, const neutrino_locale_t Caption)
{
ShowMsg(Caption, InfoMsg, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO);
}
void DisplayInfoMessage(const char * const InfoMsg, const std::string &Caption)
{
ShowMsg(Caption, InfoMsg, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO);
} }

4
src/gui/widget/messagebox.h
View File

@@ -108,6 +108,10 @@ int ShowMsg(const std::string &Caption, const std::string & Text, const CMessage
int ShowMsg(const std::string &Caption, const neutrino_locale_t Text, const CMessageBox::result_ &Default, const uint32_t ShowButtons, const char * const Icon = NULL, const int Width = 450, const int timeout = -1, bool returnDefaultOnTimeout = false); // UTF-8 int ShowMsg(const std::string &Caption, const neutrino_locale_t Text, const CMessageBox::result_ &Default, const uint32_t ShowButtons, const char * const Icon = NULL, const int Width = 450, const int timeout = -1, bool returnDefaultOnTimeout = false); // UTF-8
void DisplayErrorMessage(const char * const ErrorMsg); // UTF-8 void DisplayErrorMessage(const char * const ErrorMsg); // UTF-8
void DisplayErrorMessage(const char * const ErrorMsg, const neutrino_locale_t Caption); // UTF-8
void DisplayErrorMessage(const char * const ErrorMsg, const std::string &Caption); // UTF-8
void DisplayInfoMessage(const char * const InfoMsg); // UTF-8 void DisplayInfoMessage(const char * const InfoMsg); // UTF-8
void DisplayInfoMessage(const char * const InfoMsg, const neutrino_locale_t Caption); // UTF-8
void DisplayInfoMessage(const char * const InfoMsg, const std::string &Caption); // UTF-8
#endif #endif