dolphin-emu/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-21 21:11:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

more LogWindow cleanup, fixes some issues with enabling/disabling logs

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2712 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2009-03-21 01:40:30 +00:00
parent 2edd9a15ba
commit 87d2c2ed2e
2 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Source/Core/DolphinWX/Src/LogWindow.cpp
View File

@ -226,32 +226,14 @@ void CLogWindow::OnClear(wxCommandEvent& WXUNUSED (event))
// Enable or disable all boxes for the current verbosity level and save the changes. // Enable or disable all boxes for the current verbosity level and save the changes.
void CLogWindow::OnToggleAll(wxCommandEvent& WXUNUSED (event)) void CLogWindow::OnToggleAll(wxCommandEvent& WXUNUSED (event))
{ {
static bool enable = false; static bool enableAll = false;
for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i) for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
{ {
m_checks->Check(i, enable); ToggleLog(i, enableAll);
m_logManager->setEnable((LogTypes::LOG_TYPE)i, enable);
if (enable)
{
if (m_writeWindow)
m_logManager->addListener((LogTypes::LOG_TYPE)i, this);
if (m_writeFile)
m_logManager->addListener((LogTypes::LOG_TYPE)i, m_fileLog);
if (m_writeConsole)
m_logManager->addListener((LogTypes::LOG_TYPE)i, m_console);
}
else
{
m_logManager->removeListener((LogTypes::LOG_TYPE)i, this);
m_logManager->removeListener((LogTypes::LOG_TYPE)i, m_fileLog);
m_logManager->removeListener((LogTypes::LOG_TYPE)i, m_console);
}
} }
enable = !enable; enableAll = !enableAll;
SaveSettings();
} }
// Append checkboxes and update checked groups. // Append checkboxes and update checked groups.
@ -346,21 +328,33 @@ void CLogWindow::OnOptionsCheck(wxCommandEvent& event)
void CLogWindow::OnLogCheck(wxCommandEvent& event) void CLogWindow::OnLogCheck(wxCommandEvent& event)
{ {
int i = event.GetInt(); int i = event.GetInt();
if (m_checks->IsChecked(i)) ToggleLog(i, m_checks->IsChecked(i));
}
void CLogWindow::ToggleLog(int _logType, bool enable)
{
LogTypes::LOG_TYPE logType = (LogTypes::LOG_TYPE)_logType;
m_checks->Check(_logType, enable);
m_logManager->setEnable(logType, enable);
if (enable)
{ {
if (m_writeWindow) if (m_writeWindow)
m_logManager->addListener((LogTypes::LOG_TYPE)i, this); m_logManager->addListener(logType, this);
if (m_writeFile) if (m_writeFile)
m_logManager->addListener((LogTypes::LOG_TYPE)i, m_fileLog); m_logManager->addListener(logType, m_fileLog);
if (m_writeConsole) if (m_writeConsole)
m_logManager->addListener((LogTypes::LOG_TYPE)i, m_console); m_logManager->addListener(logType, m_console);
} }
else else
{ {
m_logManager->removeListener((LogTypes::LOG_TYPE)i, this); m_logManager->removeListener(logType, this);
m_logManager->removeListener((LogTypes::LOG_TYPE)i, m_fileLog); m_logManager->removeListener(logType, m_fileLog);
m_logManager->removeListener((LogTypes::LOG_TYPE)i, m_console); m_logManager->removeListener(logType, m_console);
} }
SaveSettings(); SaveSettings();
} }
@ -379,9 +373,9 @@ void CLogWindow::UpdateLog()
{ {
m_logTimer->Stop(); m_logTimer->Stop();
wxString collected_text; wxString collected_text;
// rough estimate.
m_logSection.Enter();
m_logSection.Enter();
// rough estimate
collected_text.reserve(100 * msgQueue.size()); collected_text.reserve(100 * msgQueue.size());
int msgQueueSize = (int)msgQueue.size(); int msgQueueSize = (int)msgQueue.size();
for (int i = 0; i < msgQueueSize; i++) for (int i = 0; i < msgQueueSize; i++)

1
Source/Core/DolphinWX/Src/LogWindow.h
View File

@ -79,6 +79,7 @@ private:
void OnToggleAll(wxCommandEvent& event); void OnToggleAll(wxCommandEvent& event);
void OnLogTimer(wxTimerEvent& WXUNUSED(event)); void OnLogTimer(wxTimerEvent& WXUNUSED(event));
void ToggleLog(int _logType, bool enable);
void UpdateChecks(); void UpdateChecks();
void UpdateLog(); void UpdateLog();