diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-04-13 00:58:37 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-04-13 00:58:37 -0500 |
| commit | 605bbf5ca833399c1a6aad2a3b0e21cb4c910d11 (patch) | |
| tree | 53acc60e471e39f234af37ac56c4ce39029eb60b /Source/Core/DolphinWX/Src/LogConfigWindow.cpp | |
| parent | 2444fdbbdd4310f0e012b661d258b20a4eaf4800 (diff) | |
| parent | 48927c17d252223ffdaa5cfb34aa850eb6ee6ee1 (diff) | |
Merge remote-tracking branch 'origin/master' into Android-trash
Diffstat (limited to 'Source/Core/DolphinWX/Src/LogConfigWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/LogConfigWindow.cpp | 35 |
1 files changed, 32 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/Src/LogConfigWindow.cpp b/Source/Core/DolphinWX/Src/LogConfigWindow.cpp index a4a5fa647a..ed78da65ca 100644 --- a/Source/Core/DolphinWX/Src/LogConfigWindow.cpp +++ b/Source/Core/DolphinWX/Src/LogConfigWindow.cpp @@ -111,12 +111,20 @@ void LogConfigWindow::LoadSettings() IniFile ini; ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX)); + // Retrieve the verbosity value from the config ini file. int verbosity; ini.Get("Options", "Verbosity", &verbosity, 0); - if (verbosity < 1) verbosity = 1; - if (verbosity > MAX_LOGLEVEL) verbosity = MAX_LOGLEVEL; + + // Ensure the verbosity level is valid. + if (verbosity < 1) + verbosity = 1; + if (verbosity > MAX_LOGLEVEL) + verbosity = MAX_LOGLEVEL; + + // Actually set the logging verbosity. m_verbosity->SetSelection(verbosity - 1); + // Get the logger output settings from the config ini file. ini.Get("Options", "WriteToFile", &m_writeFile, false); m_writeFileCB->SetValue(m_writeFile); ini.Get("Options", "WriteToConsole", &m_writeConsole, true); @@ -134,11 +142,17 @@ void LogConfigWindow::LoadSettings() { m_writeDebugger = false; } + + // Run through all of the log types and check each checkbox for each logging type + // depending on its set value within the config ini. for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i) { bool log_enabled; ini.Get("Logs", m_LogManager->GetShortName((LogTypes::LOG_TYPE)i), &log_enabled, true); - if (log_enabled) enableAll = false; + + if (log_enabled) + enableAll = false; + m_checks->Check(i, log_enabled); } } @@ -148,7 +162,10 @@ void LogConfigWindow::SaveSettings() IniFile ini; ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX)); + // Save the verbosity level. ini.Set("Options", "Verbosity", m_verbosity->GetSelection() + 1); + + // Save the enabled/disabled states of the logger outputs to the config ini. ini.Set("Options", "WriteToFile", m_writeFile); ini.Set("Options", "WriteToConsole", m_writeConsole); ini.Set("Options", "WriteToWindow", m_writeWindow); @@ -156,16 +173,28 @@ void LogConfigWindow::SaveSettings() if (IsDebuggerPresent()) ini.Set("Options", "WriteToDebugger", m_writeDebugger); #endif + + // Save all enabled/disabled states of the log types to the config ini. for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i) + { ini.Set("Logs", m_LogManager->GetShortName((LogTypes::LOG_TYPE)i), m_checks->IsChecked(i)); + } + ini.Save(File::GetUserPath(F_LOGGERCONFIG_IDX)); } +// If the verbosity changes while logging void LogConfigWindow::OnVerbosityChange(wxCommandEvent& event) { + // Get the new verbosity int v = m_verbosity->GetSelection() + 1; + + // Set all log types to that verbosity level for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++) + { m_LogManager->SetLogLevel((LogTypes::LOG_TYPE)i, (LogTypes::LOG_LEVELS)v); + } + event.Skip(); } |
