diff --git a/android/app/src/main/res/values-it/arrays.xml b/android/app/src/main/res/values-it/arrays.xml index 2136f74f8..8103406fc 100644 --- a/android/app/src/main/res/values-it/arrays.xml +++ b/android/app/src/main/res/values-it/arrays.xml @@ -137,8 +137,8 @@ Error Warning Performance Warnings - Success Information + Verbose Developer Profile Debug diff --git a/android/app/src/main/res/values-pt-rBR/arrays.xml b/android/app/src/main/res/values-pt-rBR/arrays.xml index 700add540..0aa8cd146 100644 --- a/android/app/src/main/res/values-pt-rBR/arrays.xml +++ b/android/app/src/main/res/values-pt-rBR/arrays.xml @@ -137,8 +137,8 @@ Erro Alerta Alertas de Performance - Sucesso Informação + Detalhado Desenvolvedor Perfil Depuração diff --git a/android/app/src/main/res/values/arrays.xml b/android/app/src/main/res/values/arrays.xml index 996635e6c..0f734ae9b 100644 --- a/android/app/src/main/res/values/arrays.xml +++ b/android/app/src/main/res/values/arrays.xml @@ -242,8 +242,8 @@ Error Warning Performance Warnings - Success Information + Verbose Developer Profile Debug @@ -254,8 +254,8 @@ Error Warning Perf - Success Info + Verbose Dev Profile Debug diff --git a/src/common/log.cpp b/src/common/log.cpp index e1aaa2aa5..734a8e55f 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -17,7 +17,7 @@ namespace Log { -static const char s_log_level_characters[LOGLEVEL_COUNT] = {'X', 'E', 'W', 'P', 'S', 'I', 'D', 'R', 'B', 'T'}; +static const char s_log_level_characters[LOGLEVEL_COUNT] = {'X', 'E', 'W', 'P', 'I', 'V', 'D', 'R', 'B', 'T'}; struct RegisteredCallback { @@ -149,8 +149,8 @@ static void ConsoleOutputLogCallback(void* pUserParam, const char* channelName, FOREGROUND_RED | FOREGROUND_INTENSITY, // ERROR FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY, // WARNING FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY, // PERF - FOREGROUND_GREEN | FOREGROUND_INTENSITY, // SUCCESS FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY, // INFO + FOREGROUND_GREEN | FOREGROUND_INTENSITY, // VERBOSE FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN, // DEV FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY, // PROFILE FOREGROUND_GREEN, // DEBUG @@ -209,8 +209,8 @@ static void DebugOutputLogCallback(void* pUserParam, const char* channelName, co ANDROID_LOG_ERROR, // ERROR ANDROID_LOG_WARN, // WARNING ANDROID_LOG_INFO, // PERF - ANDROID_LOG_INFO, // SUCCESS ANDROID_LOG_INFO, // INFO + ANDROID_LOG_INFO, // VERBOSE ANDROID_LOG_DEBUG, // DEV ANDROID_LOG_DEBUG, // PROFILE ANDROID_LOG_DEBUG, // DEBUG @@ -234,8 +234,8 @@ static void ConsoleOutputLogCallback(void* pUserParam, const char* channelName, "\033[1;31m", // ERROR "\033[1;33m", // WARNING "\033[1;35m", // PERF - "\033[1;32m", // SUCCESS "\033[1;37m", // INFO + "\033[1;32m", // VERBOSE "\033[0;37m", // DEV "\033[1;36m", // PROFILE "\033[0;32m", // DEBUG diff --git a/src/common/log.h b/src/common/log.h index a0257b50c..1223ce037 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -9,8 +9,8 @@ enum LOGLEVEL LOGLEVEL_ERROR = 1, // "ErrorPrint" LOGLEVEL_WARNING = 2, // "WarningPrint" LOGLEVEL_PERF = 3, // "PerfPrint" - LOGLEVEL_SUCCESS = 4, // "SuccessPrint" - LOGLEVEL_INFO = 5, // "InfoPrint" + LOGLEVEL_INFO = 4, // "InfoPrint" + LOGLEVEL_VERBOSE = 5, // "VerbosePrint" LOGLEVEL_DEV = 6, // "DevPrint" LOGLEVEL_PROFILE = 7, // "ProfilePrint" LOGLEVEL_DEBUG = 8, // "DebugPrint" @@ -56,12 +56,12 @@ void Writev(const char* channelName, const char* functionName, LOGLEVEL level, c #define Log_ErrorPrintf(...) Log::Writef(___LogChannel___, __func__, LOGLEVEL_ERROR, __VA_ARGS__) #define Log_WarningPrint(msg) Log::Write(___LogChannel___, __func__, LOGLEVEL_WARNING, msg) #define Log_WarningPrintf(...) Log::Writef(___LogChannel___, __func__, LOGLEVEL_WARNING, __VA_ARGS__) -#define Log_SuccessPrint(msg) Log::Write(___LogChannel___, __func__, LOGLEVEL_SUCCESS, msg) -#define Log_SuccessPrintf(...) Log::Writef(___LogChannel___, __func__, LOGLEVEL_SUCCESS, __VA_ARGS__) -#define Log_InfoPrint(msg) Log::Write(___LogChannel___, __func__, LOGLEVEL_INFO, msg) -#define Log_InfoPrintf(...) Log::Writef(___LogChannel___, __func__, LOGLEVEL_INFO, __VA_ARGS__) #define Log_PerfPrint(msg) Log::Write(___LogChannel___, __func__, LOGLEVEL_PERF, msg) #define Log_PerfPrintf(...) Log::Writef(___LogChannel___, __func__, LOGLEVEL_PERF, __VA_ARGS__) +#define Log_InfoPrint(msg) Log::Write(___LogChannel___, __func__, LOGLEVEL_INFO, msg) +#define Log_InfoPrintf(...) Log::Writef(___LogChannel___, __func__, LOGLEVEL_INFO, __VA_ARGS__) +#define Log_VerbosePrint(msg) Log::Write(___LogChannel___, __func__, LOGLEVEL_VERBOSE, msg) +#define Log_VerbosePrintf(...) Log::Writef(___LogChannel___, __func__, LOGLEVEL_VERBOSE, __VA_ARGS__) #define Log_DevPrint(msg) Log::Write(___LogChannel___, __func__, LOGLEVEL_DEV, msg) #define Log_DevPrintf(...) Log::Writef(___LogChannel___, __func__, LOGLEVEL_DEV, __VA_ARGS__) #define Log_ProfilePrint(msg) Log::Write(___LogChannel___, __func__, LOGLEVEL_PROFILE, msg) diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 22cb672b9..c34a84025 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -377,11 +377,11 @@ void Settings::Save(SettingsInterface& si) const } static std::array s_log_level_names = { - {"None", "Error", "Warning", "Perf", "Success", "Info", "Dev", "Profile", "Debug", "Trace"}}; + {"None", "Error", "Warning", "Perf", "Info", "Verbose", "Dev", "Profile", "Debug", "Trace"}}; static std::array s_log_level_display_names = { {TRANSLATABLE("LogLevel", "None"), TRANSLATABLE("LogLevel", "Error"), TRANSLATABLE("LogLevel", "Warning"), - TRANSLATABLE("LogLevel", "Performance"), TRANSLATABLE("LogLevel", "Success"), - TRANSLATABLE("LogLevel", "Information"), TRANSLATABLE("LogLevel", "Developer"), TRANSLATABLE("LogLevel", "Profile"), + TRANSLATABLE("LogLevel", "Performance"), TRANSLATABLE("LogLevel", "Information"), + TRANSLATABLE("LogLevel", "Verbose"), TRANSLATABLE("LogLevel", "Developer"), TRANSLATABLE("LogLevel", "Profile"), TRANSLATABLE("LogLevel", "Debug"), TRANSLATABLE("LogLevel", "Trace")}}; std::optional Settings::ParseLogLevelName(const char* str) diff --git a/src/core/system.cpp b/src/core/system.cpp index 8920ecb9c..7f50bb192 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -1297,8 +1297,8 @@ void UpdatePerformanceCounters() s_last_global_tick_counter = global_tick_counter; s_fps_timer.Reset(); - Log_PerfPrintf("FPS: %.2f VPS: %.2f Average: %.2fms Worst: %.2fms", s_fps, s_vps, s_average_frame_time, - s_worst_frame_time); + Log_VerbosePrintf("FPS: %.2f VPS: %.2f Average: %.2fms Worst: %.2fms", s_fps, s_vps, s_average_frame_time, + s_worst_frame_time); g_host_interface->OnSystemPerformanceCountersUpdated(); } diff --git a/src/frontend-common/common_host_interface.cpp b/src/frontend-common/common_host_interface.cpp index e77edc5ae..d4794e242 100644 --- a/src/frontend-common/common_host_interface.cpp +++ b/src/frontend-common/common_host_interface.cpp @@ -1928,7 +1928,7 @@ bool CommonHostInterface::SaveInputProfile(const char* profile_path, SettingsInt return false; } - Log_SuccessPrintf("Input profile saved to '%s'", profile_path); + Log_InfoPrintf("Input profile saved to '%s'", profile_path); return true; }