The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-19 02:36:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

MsgHandler: small cleanup

Browse Source
This commit is contained in:
Michael M 2017-07-25 21:11:17 -07:00
parent 76459d88bf
commit 737651f298
4 changed files with 48 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Android/jni/MainAndroid.cpp
View File

@ -152,7 +152,7 @@ void Host_UpdateProgressDialog(const char* caption, int position, int total)
{ {
} }
static bool MsgAlert(const char* caption, const char* text, bool yes_no, int /*Style*/) static bool MsgAlert(const char* caption, const char* text, bool yes_no, MsgType /*style*/)
{ {
__android_log_print(ANDROID_LOG_ERROR, DOLPHIN_TAG, "%s:%s", caption, text); __android_log_print(ANDROID_LOG_ERROR, DOLPHIN_TAG, "%s:%s", caption, text);

34
Source/Core/Common/MsgHandler.cpp
View File

@ -16,7 +16,7 @@
#include <windows.h> #include <windows.h>
#endif #endif
bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style); bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, MsgType style);
static MsgAlertHandler msg_handler = DefaultMsgHandler; static MsgAlertHandler msg_handler = DefaultMsgHandler;
static bool AlertEnabled = true; static bool AlertEnabled = true;
@ -42,14 +42,14 @@ void SetEnableAlert(bool enable)
AlertEnabled = enable; AlertEnabled = enable;
} }
std::string GetTranslation(const char* string) std::string GetStringT(const char* string)
{ {
return str_translator(string); return str_translator(string);
} }
// This is the first stop for gui alerts where the log is updated and the // This is the first stop for gui alerts where the log is updated and the
// correct window is shown // correct window is shown
bool MsgAlert(bool yes_no, int Style, const char* format, ...) bool MsgAlert(bool yes_no, MsgType style, const char* format, ...)
{ {
// Read message and write it to the log // Read message and write it to the log
std::string caption; std::string caption;
@ -68,18 +68,18 @@ bool MsgAlert(bool yes_no, int Style, const char* format, ...)
crit_caption = str_translator(_trans("Critical")); crit_caption = str_translator(_trans("Critical"));
} }
switch (Style) switch (style)
{ {
case INFORMATION: case MsgType::Information:
caption = info_caption; caption = info_caption;
break; break;
case QUESTION: case MsgType::Question:
caption = ques_caption; caption = ques_caption;
break; break;
case WARNING: case MsgType::Warning:
caption = warn_caption; caption = warn_caption;
break; break;
case CRITICAL: case MsgType::Critical:
caption = crit_caption; caption = crit_caption;
break; break;
} }
@ -92,24 +92,24 @@ bool MsgAlert(bool yes_no, int Style, const char* format, ...)
ERROR_LOG(MASTER_LOG, "%s: %s", caption.c_str(), buffer); ERROR_LOG(MASTER_LOG, "%s: %s", caption.c_str(), buffer);
// Don't ignore questions, especially AskYesNo, PanicYesNo could be ignored // Don't ignore questions, especially AskYesNo, PanicYesNo could be ignored
if (msg_handler && (AlertEnabled || Style == QUESTION || Style == CRITICAL)) if (msg_handler && (AlertEnabled || style == MsgType::Question || style == MsgType::Critical))
return msg_handler(caption.c_str(), buffer, yes_no, Style); return msg_handler(caption.c_str(), buffer, yes_no, style);
return true; return true;
} }
// Default non library dependent panic alert // Default non library dependent panic alert
bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style) bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, MsgType style)
{ {
#ifdef _WIN32 #ifdef _WIN32
int STYLE = MB_ICONINFORMATION; int window_style = MB_ICONINFORMATION;
if (Style == QUESTION) if (style == MsgType::Question)
STYLE = MB_ICONQUESTION; window_style = MB_ICONQUESTION;
if (Style == WARNING) if (style == MsgType::Warning)
STYLE = MB_ICONWARNING; window_style = MB_ICONWARNING;
return IDYES == MessageBox(0, UTF8ToTStr(text).c_str(), UTF8ToTStr(caption).c_str(), return IDYES == MessageBox(0, UTF8ToTStr(text).c_str(), UTF8ToTStr(caption).c_str(),
STYLE | (yes_no ? MB_YESNO : MB_OK)); window_style | (yes_no ? MB_YESNO : MB_OK));
#else #else
fprintf(stderr, "%s\n", text); fprintf(stderr, "%s\n", text);

59
Source/Core/Common/MsgHandler.h
View File

@ -7,22 +7,22 @@
#include <string> #include <string>
// Message alerts // Message alerts
enum MSG_TYPE enum class MsgType
{ {
INFORMATION, Information,
QUESTION, Question,
WARNING, Warning,
CRITICAL Critical
}; };
typedef bool (*MsgAlertHandler)(const char* caption, const char* text, bool yes_no, int Style); typedef bool (*MsgAlertHandler)(const char* caption, const char* text, bool yes_no, MsgType style);
typedef std::string (*StringTranslator)(const char* text); typedef std::string (*StringTranslator)(const char* text);
void RegisterMsgAlertHandler(MsgAlertHandler handler); void RegisterMsgAlertHandler(MsgAlertHandler handler);
void RegisterStringTranslator(StringTranslator translator); void RegisterStringTranslator(StringTranslator translator);
std::string GetTranslation(const char* string); std::string GetStringT(const char* string);
bool MsgAlert(bool yes_no, int Style, const char* format, ...) bool MsgAlert(bool yes_no, MsgType style, const char* format, ...)
#ifdef __GNUC__ #ifdef __GNUC__
__attribute__((format(printf, 3, 4))) __attribute__((format(printf, 3, 4)))
#endif #endif
@ -30,31 +30,28 @@ bool MsgAlert(bool yes_no, int Style, const char* format, ...)
void SetEnableAlert(bool enable); void SetEnableAlert(bool enable);
#ifdef _WIN32 #ifdef _WIN32
#define SuccessAlert(format, ...) MsgAlert(false, INFORMATION, format, __VA_ARGS__) #define SuccessAlert(format, ...) MsgAlert(false, MsgType::Information, format, __VA_ARGS__)
#define PanicAlert(format, ...) MsgAlert(false, WARNING, format, __VA_ARGS__) #define PanicAlert(format, ...) MsgAlert(false, MsgType::Warning, format, __VA_ARGS__)
#define PanicYesNo(format, ...) MsgAlert(true, WARNING, format, __VA_ARGS__) #define PanicYesNo(format, ...) MsgAlert(true, MsgType::Warning, format, __VA_ARGS__)
#define AskYesNo(format, ...) MsgAlert(true, QUESTION, format, __VA_ARGS__) #define AskYesNo(format, ...) MsgAlert(true, MsgType::Question, format, __VA_ARGS__)
#define CriticalAlert(format, ...) MsgAlert(false, CRITICAL, format, __VA_ARGS__) #define CriticalAlert(format, ...) MsgAlert(false, MsgType::Critical, format, __VA_ARGS__)
// Use these macros (that do the same thing) if the message should be translated. // Use these macros (that do the same thing) if the message should be translated.
#define SuccessAlertT(format, ...) MsgAlert(false, INFORMATION, format, __VA_ARGS__) #define SuccessAlertT(format, ...) MsgAlert(false, MsgType::Information, format, __VA_ARGS__)
#define PanicAlertT(format, ...) MsgAlert(false, WARNING, format, __VA_ARGS__) #define PanicAlertT(format, ...) MsgAlert(false, MsgType::Warning, format, __VA_ARGS__)
#define PanicYesNoT(format, ...) MsgAlert(true, WARNING, format, __VA_ARGS__) #define PanicYesNoT(format, ...) MsgAlert(true, MsgType::Warning, format, __VA_ARGS__)
#define AskYesNoT(format, ...) MsgAlert(true, QUESTION, format, __VA_ARGS__) #define AskYesNoT(format, ...) MsgAlert(true, MsgType::Question, format, __VA_ARGS__)
#define CriticalAlertT(format, ...) MsgAlert(false, CRITICAL, format, __VA_ARGS__) #define CriticalAlertT(format, ...) MsgAlert(false, MsgType::Critical, format, __VA_ARGS__)
#define GetStringT(string) GetTranslation(string)
#else #else
#define SuccessAlert(format, ...) MsgAlert(false, INFORMATION, format, ##__VA_ARGS__) #define SuccessAlert(format, ...) MsgAlert(false, MsgType::Information, format, ##__VA_ARGS__)
#define PanicAlert(format, ...) MsgAlert(false, WARNING, format, ##__VA_ARGS__) #define PanicAlert(format, ...) MsgAlert(false, MsgType::Warning, format, ##__VA_ARGS__)
#define PanicYesNo(format, ...) MsgAlert(true, WARNING, format, ##__VA_ARGS__) #define PanicYesNo(format, ...) MsgAlert(true, MsgType::Warning, format, ##__VA_ARGS__)
#define AskYesNo(format, ...) MsgAlert(true, QUESTION, format, ##__VA_ARGS__) #define AskYesNo(format, ...) MsgAlert(true, MsgType::Question, format, ##__VA_ARGS__)
#define CriticalAlert(format, ...) MsgAlert(false, CRITICAL, format, ##__VA_ARGS__) #define CriticalAlert(format, ...) MsgAlert(false, MsgType::Critical, format, ##__VA_ARGS__)
// Use these macros (that do the same thing) if the message should be translated. // Use these macros (that do the same thing) if the message should be translated.
#define SuccessAlertT(format, ...) MsgAlert(false, INFORMATION, format, ##__VA_ARGS__) #define SuccessAlertT(format, ...) MsgAlert(false, MsgType::Information, format, ##__VA_ARGS__)
#define PanicAlertT(format, ...) MsgAlert(false, WARNING, format, ##__VA_ARGS__) #define PanicAlertT(format, ...) MsgAlert(false, MsgType::Warning, format, ##__VA_ARGS__)
#define PanicYesNoT(format, ...) MsgAlert(true, WARNING, format, ##__VA_ARGS__) #define PanicYesNoT(format, ...) MsgAlert(true, MsgType::Warning, format, ##__VA_ARGS__)
#define AskYesNoT(format, ...) MsgAlert(true, QUESTION, format, ##__VA_ARGS__) #define AskYesNoT(format, ...) MsgAlert(true, MsgType::Question, format, ##__VA_ARGS__)
#define CriticalAlertT(format, ...) MsgAlert(false, CRITICAL, format, ##__VA_ARGS__) #define CriticalAlertT(format, ...) MsgAlert(false, MsgType::Critical, format, ##__VA_ARGS__)
#define GetStringT(string) GetTranslation(string)
#endif #endif

4
Source/Core/DolphinWX/Main.cpp
View File

@ -64,7 +64,7 @@
IMPLEMENT_APP(DolphinApp) IMPLEMENT_APP(DolphinApp)
bool wxMsgAlert(const char*, const char*, bool, int); bool wxMsgAlert(const char*, const char*, bool, MsgType);
std::string wxStringTranslator(const char*); std::string wxStringTranslator(const char*);
CFrame* main_frame = nullptr; CFrame* main_frame = nullptr;
@ -351,7 +351,7 @@ void DolphinApp::OnIdle(wxIdleEvent& ev)
// ------------ // ------------
// Talk to GUI // Talk to GUI
bool wxMsgAlert(const char* caption, const char* text, bool yes_no, int /*Style*/) bool wxMsgAlert(const char* caption, const char* text, bool yes_no, MsgType /*style*/)
{ {
if (wxIsMainThread()) if (wxIsMainThread())
{ {