ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LogManager: add SaveSettings

This commit is contained in:
Michael Maltese 2017-07-07 16:10:38 -07:00
parent 8ff8dfcdf2
commit c9e8289e82
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/Common/Logging/LogManager.cpp
View File

@ -160,6 +160,24 @@ LogManager::~LogManager()
delete m_listeners[LogListener::FILE_LISTENER]; delete m_listeners[LogListener::FILE_LISTENER];
} }
void LogManager::SaveSettings()
{
IniFile ini;
ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX));
IniFile::Section* options = ini.GetOrCreateSection("Options");
options->Set("Verbosity", GetLogLevel());
options->Set("WriteToFile", m_listener_ids[LogListener::FILE_LISTENER]);
options->Set("WriteToConsole", m_listener_ids[LogListener::CONSOLE_LISTENER]);
options->Set("WriteToWindow", m_listener_ids[LogListener::LOG_WINDOW_LISTENER]);
// Save all enabled/disabled states of the log types to the config ini.
for (const auto& container : m_log)
ini.GetOrCreateSection("Logs")->Set(container.m_short_name, container.m_enable);
ini.Save(File::GetUserPath(F_LOGGERCONFIG_IDX));
}
void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file,
int line, const char* format, va_list args) int line, const char* format, va_list args)
{ {
@ -244,6 +262,8 @@ void LogManager::Init()
void LogManager::Shutdown() void LogManager::Shutdown()
{ {
if (s_log_manager)
s_log_manager->SaveSettings();
delete s_log_manager; delete s_log_manager;
s_log_manager = nullptr; s_log_manager = nullptr;
} }

2
Source/Core/Common/Logging/LogManager.h
View File

@ -53,6 +53,8 @@ public:
void EnableListener(LogListener::LISTENER id, bool enable); void EnableListener(LogListener::LISTENER id, bool enable);
bool IsListenerEnabled(LogListener::LISTENER id) const; bool IsListenerEnabled(LogListener::LISTENER id) const;
void SaveSettings();
private: private:
struct LogContainer struct LogContainer
{ {

18
Source/Core/DolphinWX/LogConfigWindow.cpp
View File

@ -133,23 +133,7 @@ void LogConfigWindow::LoadSettings()
void LogConfigWindow::SaveSettings() void LogConfigWindow::SaveSettings()
{ {
IniFile ini; m_LogManager->SaveSettings();
ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX));
IniFile::Section* options = ini.GetOrCreateSection("Options");
options->Set("Verbosity", m_verbosity->GetSelection() + 1);
options->Set("WriteToFile", m_writeFile);
options->Set("WriteToConsole", m_writeConsole);
options->Set("WriteToWindow", m_writeWindow);
// Save all enabled/disabled states of the log types to the config ini.
for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
{
ini.GetOrCreateSection("Logs")->Set(m_LogManager->GetShortName((LogTypes::LOG_TYPE)i),
m_checks->IsChecked(i));
}
ini.Save(File::GetUserPath(F_LOGGERCONFIG_IDX));
} }
// If the verbosity changes while logging // If the verbosity changes while logging