piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 15:19:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

GUI: Log window colors in windows, font and word wrap option

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4157 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson
2009-09-02 12:09:51 +00:00
parent b2533a5ef2
commit ad491dd9f0
5 changed files with 201 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Externals/wxWidgets/include/wx/setup.h vendored
View File

@ -1284,7 +1284,7 @@
// //
// Recommended setting: 1, only set it to 0 if your compiler doesn't have // Recommended setting: 1, only set it to 0 if your compiler doesn't have
// or can't compile <richedit.h> // or can't compile <richedit.h>
#define wxUSE_RICHEDIT 0 #define wxUSE_RICHEDIT 1
// Set this to 1 to use extra features of richedit v2 and later controls // Set this to 1 to use extra features of richedit v2 and later controls
// //

1
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -326,6 +326,7 @@ CFrame::CFrame(wxFrame* parent,
// Give it a console early to show potential messages from this onward // Give it a console early to show potential messages from this onward
ConsoleListener *Console = LogManager::GetInstance()->getConsoleListener(); ConsoleListener *Console = LogManager::GetInstance()->getConsoleListener();
if (SConfig::GetInstance().m_InterfaceConsole) Console->Open(); if (SConfig::GetInstance().m_InterfaceConsole) Console->Open();
if (SConfig::GetInstance().m_InterfaceLogWindow) m_LogWindow = new CLogWindow(this);
// Start debugging mazimized // Start debugging mazimized
if (UseDebugger) this->Maximize(true); if (UseDebugger) this->Maximize(true);

2
Source/Core/DolphinWX/Src/FrameWiimote.cpp
View File

@ -397,6 +397,8 @@ wxBitmap CFrame::CreateBitmapForSpeakers(int BitmapType, bool On)
// ------------- // -------------
void CFrame::DoMoveIcons() void CFrame::DoMoveIcons()
{ {
if (!m_pStatusBar) return;
if(HaveLeds) MoveLeds(); if(HaveLeds) MoveLeds();
if(HaveSpeakers) MoveSpeakers(); if(HaveSpeakers) MoveSpeakers();

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

@ -35,6 +35,8 @@ BEGIN_EVENT_TABLE(CLogWindow, wxDialog)
EVT_BUTTON(IDM_CLEARLOG, CLogWindow::OnClear) EVT_BUTTON(IDM_CLEARLOG, CLogWindow::OnClear)
EVT_BUTTON(IDM_TOGGLEALL, CLogWindow::OnToggleAll) EVT_BUTTON(IDM_TOGGLEALL, CLogWindow::OnToggleAll)
EVT_RADIOBOX(IDM_VERBOSITY, CLogWindow::OnOptionsCheck) EVT_RADIOBOX(IDM_VERBOSITY, CLogWindow::OnOptionsCheck)
EVT_CHOICE(IDM_FONT, CLogWindow::OnOptionsCheck)
EVT_CHECKBOX(IDM_WRAPLINE, CLogWindow::OnOptionsCheck)
EVT_CHECKBOX(IDM_WRITEFILE, CLogWindow::OnOptionsCheck) EVT_CHECKBOX(IDM_WRITEFILE, CLogWindow::OnOptionsCheck)
EVT_CHECKBOX(IDM_WRITECONSOLE, CLogWindow::OnOptionsCheck) EVT_CHECKBOX(IDM_WRITECONSOLE, CLogWindow::OnOptionsCheck)
EVT_CHECKBOX(IDM_WRITEWINDOW, CLogWindow::OnOptionsCheck) EVT_CHECKBOX(IDM_WRITEWINDOW, CLogWindow::OnOptionsCheck)
@ -42,15 +44,16 @@ BEGIN_EVENT_TABLE(CLogWindow, wxDialog)
EVT_TIMER(IDTM_UPDATELOG, CLogWindow::OnLogTimer) EVT_TIMER(IDTM_UPDATELOG, CLogWindow::OnLogTimer)
END_EVENT_TABLE() END_EVENT_TABLE()
CLogWindow::CLogWindow(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style) CLogWindow::CLogWindow(CFrame *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style)
: wxDialog(parent, id, title, position, size, style) : wxDialog(parent, id, title, position, size, style)
, m_logSection(1) , Parent(parent), m_LogSection(1), m_Log(NULL), m_cmdline(NULL)
, m_LogAccess(true)
{ {
m_logManager = LogManager::GetInstance(); m_LogManager = LogManager::GetInstance();
for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i) for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
m_logManager->addListener((LogTypes::LOG_TYPE)i, this); m_LogManager->addListener((LogTypes::LOG_TYPE)i, this);
m_fileLog = m_logManager->getFileListener(); m_fileLog = m_LogManager->getFileListener();
m_console = m_logManager->getConsoleListener(); m_console = m_LogManager->getConsoleListener();
CreateGUIControls(); CreateGUIControls();
@ -59,75 +62,85 @@ CLogWindow::CLogWindow(wxWindow *parent, wxWindowID id, const wxString &title, c
void CLogWindow::CreateGUIControls() void CLogWindow::CreateGUIControls()
{ {
wxBoxSizer* sUber = new wxBoxSizer(wxHORIZONTAL), // whole plane
* sLeft = new wxBoxSizer(wxVERTICAL), // LEFT sizer
* sRight = new wxBoxSizer(wxVERTICAL), // RIGHT sizer
* sRightBottom = new wxBoxSizer(wxHORIZONTAL); // submit row
// Left side: buttons (-submit), options, and log type selection
wxStaticBoxSizer* sbLeftOptions = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Options"));
// Verbosity // Verbosity
wxArrayString wxLevels; wxArrayString wxLevels, wxLevelsUse;
for (int i = 1; i <= MAX_LOGLEVEL; ++i) wxLevels.Add(wxString::Format(wxT("%i"), i)); wxLevels.Add(wxT("Notice"));
m_verbosity = new wxRadioBox(this, IDM_VERBOSITY, wxT("Verbosity"), wxDefaultPosition, wxDefaultSize, wxLevels, 0, wxRA_SPECIFY_COLS, wxDefaultValidator); wxLevels.Add(wxT("Error"));
wxLevels.Add(wxT("Warning"));
wxLevels.Add(wxT("Info"));
wxLevels.Add(wxT("Debug"));
for (int i = 0; i < MAX_LOGLEVEL; ++i) wxLevelsUse.Add(wxString::Format(wxT("%s"), wxLevels.Item(i).c_str()));
m_verbosity = new wxRadioBox(this, IDM_VERBOSITY, wxT("Verbosity"), wxDefaultPosition, wxDefaultSize, wxLevelsUse, 0, wxRA_SPECIFY_ROWS, wxDefaultValidator);
// Don't take up so much space
m_verbosity->SetButtonFont(wxFont(7, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL));
// Font
wxChoice * m_FontChoice = new wxChoice(this, IDM_FONT, wxDefaultPosition, wxDefaultSize, * new wxArrayString(), 0, wxDefaultValidator);
m_FontChoice->Append(wxT("Default font"));
m_FontChoice->Append(wxT("Modern font"));
m_FontChoice->SetSelection(0);
// Options // Options
wxCheckBox * m_WrapLine = new wxCheckBox(this, IDM_WRAPLINE, wxT("Word Wrap"));
m_writeFileCB = new wxCheckBox(this, IDM_WRITEFILE, wxT("Write to File"), wxDefaultPosition, wxDefaultSize, 0); m_writeFileCB = new wxCheckBox(this, IDM_WRITEFILE, wxT("Write to File"), wxDefaultPosition, wxDefaultSize, 0);
m_writeConsoleCB = new wxCheckBox(this, IDM_WRITECONSOLE, wxT("Write to Console"), wxDefaultPosition, wxDefaultSize, 0); m_writeConsoleCB = new wxCheckBox(this, IDM_WRITECONSOLE, wxT("Write to Console"), wxDefaultPosition, wxDefaultSize, 0);
m_writeWindowCB = new wxCheckBox(this, IDM_WRITEWINDOW, wxT("Write to Window ->"), wxDefaultPosition, wxDefaultSize, 0); m_writeWindowCB = new wxCheckBox(this, IDM_WRITEWINDOW, wxT("Write to Window ->"), wxDefaultPosition, wxDefaultSize, 0);
wxBoxSizer* sLogCtrl = new wxBoxSizer(wxHORIZONTAL);
sLogCtrl->Add(new wxButton(this, IDM_TOGGLEALL, wxT("Toggle all"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT), 1);
sLogCtrl->Add(new wxButton(this, IDM_CLEARLOG, wxT("Clear"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT), 1);
m_checks = new wxCheckListBox(this, IDM_LOGCHECKS, wxDefaultPosition, wxDefaultSize); m_checks = new wxCheckListBox(this, IDM_LOGCHECKS, wxDefaultPosition, wxDefaultSize);
// Right side: Log viewer and submit row // Log viewer and submit row
m_log = new wxTextCtrl(this, IDM_LOG, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_Log = CreateTextCtrl(this, IDM_LOG, wxTE_RICH | wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP);
wxTE_RICH2 | wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP); DefaultFont = m_Log->GetFont();
// FIXME See note in UpdateLog()
//m_log->SetBackgroundColour(*wxBLACK);
//m_log->SetFont(DebuggerFont);
m_cmdline = new wxTextCtrl(this, IDM_SUBMITCMD, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_cmdline = new wxTextCtrl(this, IDM_SUBMITCMD, wxEmptyString, wxDefaultPosition, wxDefaultSize,
wxTE_PROCESS_ENTER | wxTE_PROCESS_TAB); wxTE_PROCESS_ENTER | wxTE_PROCESS_TAB);
//m_cmdline->SetFont(DebuggerFont); //m_cmdline->SetFont(DebuggerFont);
// Sizers // Sizers
sbLeftOptions->Add(m_writeFileCB); sUber = new wxBoxSizer(wxHORIZONTAL); // whole plane
sbLeftOptions->Add(m_writeConsoleCB); sLeft = new wxBoxSizer(wxVERTICAL); // left sizer
sbLeftOptions->Add(m_writeWindowCB); sRight = new wxBoxSizer(wxVERTICAL); // right sizer
sRightBottom = new wxBoxSizer(wxHORIZONTAL); // submit row
// Left side: buttons (-submit), options, and log type selection
wxStaticBoxSizer* sbLeftOptions = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Options"));
sLeft->Add(m_verbosity, 0, wxEXPAND); wxBoxSizer* sLogCtrl = new wxBoxSizer(wxHORIZONTAL);
sLeft->Add(sbLeftOptions, 0, wxEXPAND); sLogCtrl->Add(new wxButton(this, IDM_TOGGLEALL, wxT("Toggle all"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT), 1);
sLogCtrl->Add(new wxButton(this, IDM_CLEARLOG, wxT("Clear"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT), 1);
sbLeftOptions->Add(m_FontChoice, 0, (wxDOWN), 1);
sbLeftOptions->Add(m_WrapLine, 0, (wxDOWN), 1);
sbLeftOptions->Add(m_writeFileCB, 0, (wxDOWN), 1);
sbLeftOptions->Add(m_writeConsoleCB, 0, (wxDOWN), 1);
sbLeftOptions->Add(m_writeWindowCB, 0);
sLeft->Add(m_verbosity, 0, wxEXPAND | (wxLEFT | wxRIGHT), 5);
sLeft->Add(sbLeftOptions, 0, wxEXPAND | (wxLEFT | wxRIGHT), 5);
sLeft->Add(sLogCtrl, 0, wxEXPAND); sLeft->Add(sLogCtrl, 0, wxEXPAND);
sLeft->Add(m_checks, 1, wxEXPAND); sLeft->Add(m_checks, 1, wxEXPAND);
sRightBottom->Add(m_cmdline, 1, wxEXPAND); PopulateRight();
sRight->Add(m_log, 1, wxEXPAND | wxSHRINK);
sRight->Add(sRightBottom, 0, wxEXPAND);
// Take care of the main sizer and some settings
sUber->Add(sLeft, 0, wxEXPAND); sUber->Add(sLeft, 0, wxEXPAND);
sUber->Add(sRight, 1, wxEXPAND); sUber->Add(sRight, 1, wxEXPAND);
this->SetSizer(sUber);
SetSizer(sUber); // Settings
SetAffirmativeId(IDM_SUBMITCMD); SetAffirmativeId(IDM_SUBMITCMD);
UpdateChecks(); UpdateChecks();
m_cmdline->SetFocus(); m_cmdline->SetFocus();
m_logTimer = new wxTimer(this, IDTM_UPDATELOG); m_LogTimer = new wxTimer(this, IDTM_UPDATELOG);
m_logTimer->Start(UPDATETIME); m_LogTimer->Start(UPDATETIME);
} }
CLogWindow::~CLogWindow() CLogWindow::~CLogWindow()
{ {
for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i) for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
{ {
m_logManager->removeListener((LogTypes::LOG_TYPE)i, this); m_LogManager->removeListener((LogTypes::LOG_TYPE)i, this);
} }
m_logTimer->Stop(); m_LogTimer->Stop();
delete m_logTimer; delete m_LogTimer;
SaveSettings(); SaveSettings();
} }
@ -150,7 +163,7 @@ void CLogWindow::SaveSettings()
ini.Set("Options", "WriteToConsole", m_writeConsole); ini.Set("Options", "WriteToConsole", m_writeConsole);
ini.Set("Options", "WriteToWindow", m_writeWindow); ini.Set("Options", "WriteToWindow", m_writeWindow);
for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i) 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.Set("Logs", m_LogManager->getShortName((LogTypes::LOG_TYPE)i), m_checks->IsChecked(i));
ini.Save(LOGGER_CONFIG_FILE); ini.Save(LOGGER_CONFIG_FILE);
} }
@ -166,7 +179,7 @@ void CLogWindow::LoadSettings()
SetSize(x, y, w, h); SetSize(x, y, w, h);
ini.Get("Options", "Verbosity", &verbosity, 0); ini.Get("Options", "Verbosity", &verbosity, 0);
if (verbosity < 1) verbosity = 1; if (verbosity < 1) verbosity = 1;
if (verbosity > DEBUG_LEVEL) verbosity = DEBUG_LEVEL; if (verbosity > MAX_LOGLEVEL) verbosity = MAX_LOGLEVEL;
m_verbosity->SetSelection(verbosity - 1); m_verbosity->SetSelection(verbosity - 1);
ini.Get("Options", "WriteToFile", &m_writeFile, true); ini.Get("Options", "WriteToFile", &m_writeFile, true);
m_writeFileCB->SetValue(m_writeFile); m_writeFileCB->SetValue(m_writeFile);
@ -177,29 +190,30 @@ void CLogWindow::LoadSettings()
for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i) for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
{ {
bool enable; bool enable;
ini.Get("Logs", m_logManager->getShortName((LogTypes::LOG_TYPE)i), &enable, true); ini.Get("Logs", m_LogManager->getShortName((LogTypes::LOG_TYPE)i), &enable, true);
if (m_writeWindow && enable) if (m_writeWindow && enable)
m_logManager->addListener((LogTypes::LOG_TYPE)i, this); m_LogManager->addListener((LogTypes::LOG_TYPE)i, this);
else else
m_logManager->removeListener((LogTypes::LOG_TYPE)i, this); m_LogManager->removeListener((LogTypes::LOG_TYPE)i, this);
if (m_writeFile && enable) if (m_writeFile && enable)
m_logManager->addListener((LogTypes::LOG_TYPE)i, m_fileLog); m_LogManager->addListener((LogTypes::LOG_TYPE)i, m_fileLog);
else else
m_logManager->removeListener((LogTypes::LOG_TYPE)i, m_fileLog); m_LogManager->removeListener((LogTypes::LOG_TYPE)i, m_fileLog);
if (m_writeConsole && enable) if (m_writeConsole && enable)
m_logManager->addListener((LogTypes::LOG_TYPE)i, m_console); m_LogManager->addListener((LogTypes::LOG_TYPE)i, m_console);
else else
m_logManager->removeListener((LogTypes::LOG_TYPE)i, m_console); m_LogManager->removeListener((LogTypes::LOG_TYPE)i, m_console);
m_logManager->setLogLevel((LogTypes::LOG_TYPE)i, (LogTypes::LOG_LEVELS)(verbosity)); m_LogManager->setLogLevel((LogTypes::LOG_TYPE)i, (LogTypes::LOG_LEVELS)(verbosity));
} }
UpdateChecks(); UpdateChecks();
} }
void CLogWindow::OnSubmit(wxCommandEvent& WXUNUSED (event)) void CLogWindow::OnSubmit(wxCommandEvent& WXUNUSED (event))
{ {
if (!m_cmdline) return;
Console_Submit(m_cmdline->GetValue().To8BitData()); Console_Submit(m_cmdline->GetValue().To8BitData());
m_cmdline->SetValue(wxEmptyString); m_cmdline->SetValue(wxEmptyString);
NotifyUpdate(); NotifyUpdate();
@ -207,13 +221,13 @@ void CLogWindow::OnSubmit(wxCommandEvent& WXUNUSED (event))
void CLogWindow::OnClear(wxCommandEvent& WXUNUSED (event)) void CLogWindow::OnClear(wxCommandEvent& WXUNUSED (event))
{ {
m_log->Clear(); m_Log->Clear();
m_logSection.Enter(); m_LogSection.Enter();
int msgQueueSize = (int)msgQueue.size(); int msgQueueSize = (int)msgQueue.size();
for (int i = 0; i < msgQueueSize; i++) for (int i = 0; i < msgQueueSize; i++)
msgQueue.pop(); msgQueue.pop();
m_logSection.Leave(); m_LogSection.Leave();
m_console->ClearScreen(); m_console->ClearScreen();
NOTICE_LOG(CONSOLE, "Console cleared"); NOTICE_LOG(CONSOLE, "Console cleared");
@ -245,7 +259,7 @@ void CLogWindow::UpdateChecks()
for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++) for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
{ {
m_checks->Append(wxString::FromAscii(m_logManager->getFullName( (LogTypes::LOG_TYPE)i ))); m_checks->Append(wxString::FromAscii(m_LogManager->getFullName( (LogTypes::LOG_TYPE)i )));
} }
m_checks->Thaw(); m_checks->Thaw();
} }
@ -254,16 +268,41 @@ void CLogWindow::UpdateChecks()
for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++) for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
{ {
m_checks->Check(i, m_checks->Check(i,
m_logManager->isListener((LogTypes::LOG_TYPE)i, this) || m_LogManager->isListener((LogTypes::LOG_TYPE)i, this) ||
m_logManager->isListener((LogTypes::LOG_TYPE)i, m_console) || m_LogManager->isListener((LogTypes::LOG_TYPE)i, m_console) ||
m_logManager->isListener((LogTypes::LOG_TYPE)i, m_fileLog)); m_LogManager->isListener((LogTypes::LOG_TYPE)i, m_fileLog));
} }
m_checks->Thaw(); m_checks->Thaw();
} }
void CLogWindow::UnPopulateRight()
{
sRight->Remove(m_Log);
sRight->Remove(sRightBottom);
// Remove() destroys sizers
sRightBottom = new wxBoxSizer(wxHORIZONTAL);
}
void CLogWindow::PopulateRight()
{
sRightBottom->Add(m_cmdline, 1, wxEXPAND);
sRight->Add(m_Log, 1, wxEXPAND | wxSHRINK);
sRight->Add(sRightBottom, 0, wxEXPAND);
this->Layout();
}
wxTextCtrl* CLogWindow::CreateTextCtrl(wxDialog* parent, wxWindowID id, long Style)
{
wxTextCtrl* TC = new wxTextCtrl(parent, id, wxEmptyString, wxDefaultPosition, wxDefaultSize, Style);
TC->SetBackgroundColour(*wxBLACK);
//TC->SetFont(DebuggerFont);
return TC;
}
// When an option is changed, save the change // When an option is changed, save the change
void CLogWindow::OnOptionsCheck(wxCommandEvent& event) void CLogWindow::OnOptionsCheck(wxCommandEvent& event)
{ {
wxString Text;
switch (event.GetId()) switch (event.GetId())
{ {
case IDM_VERBOSITY: case IDM_VERBOSITY:
@ -272,11 +311,42 @@ void CLogWindow::OnOptionsCheck(wxCommandEvent& event)
int v = m_verbosity->GetSelection() + 1; int v = m_verbosity->GetSelection() + 1;
for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++) for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
{ {
m_logManager->setLogLevel((LogTypes::LOG_TYPE)i, (LogTypes::LOG_LEVELS)v); m_LogManager->setLogLevel((LogTypes::LOG_TYPE)i, (LogTypes::LOG_LEVELS)v);
} }
} }
break; break;
case IDM_WRAPLINE:
// SetWindowStyleFlag doesn't fully work, we need to redraw the window
//m_Log->SetWindowStyleFlag(m_Log->GetWindowStyleFlag() ^ wxTE_DONTWRAP);
/* Notice: To retain the colors when changing word wrapping we need to
loop through every letter with GetStyle and then reapply them letter by letter */
// Prevent m_Log access while it's being destroyed
m_LogAccess = false;
UnPopulateRight();
Text = m_Log->GetValue();
m_Log->Destroy();
switch (event.IsChecked())
{
case 0: m_Log = CreateTextCtrl(this, IDM_LOG, wxTE_RICH | wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP); break;
case 1: m_Log = CreateTextCtrl(this, IDM_LOG, wxTE_RICH | wxTE_MULTILINE | wxTE_READONLY | wxTE_WORDWRAP); break;
}
m_Log->SetDefaultStyle(wxTextAttr(*wxWHITE));
m_Log->AppendText(Text);
PopulateRight();
m_LogAccess = true;
break;
case IDM_FONT:
switch (event.GetSelection())
{
case 0: m_Log->SetDefaultStyle(wxTextAttr(wxNullColour, wxNullColour, DefaultFont)); break;
case 1: m_Log->SetDefaultStyle(wxTextAttr(wxNullColour, wxNullColour, DebuggerFont)); break;
}
break;
case IDM_WRITEFILE: case IDM_WRITEFILE:
for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i) for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
{ {
@ -284,9 +354,9 @@ void CLogWindow::OnOptionsCheck(wxCommandEvent& event)
if (m_checks->IsChecked(i)) if (m_checks->IsChecked(i))
{ {
if (m_writeFile) if (m_writeFile)
m_logManager->addListener((LogTypes::LOG_TYPE)i, m_fileLog); m_LogManager->addListener((LogTypes::LOG_TYPE)i, m_fileLog);
else else
m_logManager->removeListener((LogTypes::LOG_TYPE)i, m_fileLog); m_LogManager->removeListener((LogTypes::LOG_TYPE)i, m_fileLog);
} }
} }
break; break;
@ -298,9 +368,9 @@ void CLogWindow::OnOptionsCheck(wxCommandEvent& event)
if (m_checks->IsChecked(i)) if (m_checks->IsChecked(i))
{ {
if (m_writeWindow) if (m_writeWindow)
m_logManager->addListener((LogTypes::LOG_TYPE)i, this); m_LogManager->addListener((LogTypes::LOG_TYPE)i, this);
else else
m_logManager->removeListener((LogTypes::LOG_TYPE)i, this); m_LogManager->removeListener((LogTypes::LOG_TYPE)i, this);
} }
} }
break; break;
@ -312,9 +382,9 @@ void CLogWindow::OnOptionsCheck(wxCommandEvent& event)
if (m_checks->IsChecked(i)) if (m_checks->IsChecked(i))
{ {
if (m_writeConsole) if (m_writeConsole)
m_logManager->addListener((LogTypes::LOG_TYPE)i, m_console); m_LogManager->addListener((LogTypes::LOG_TYPE)i, m_console);
else else
m_logManager->removeListener((LogTypes::LOG_TYPE)i, m_console); m_LogManager->removeListener((LogTypes::LOG_TYPE)i, m_console);
} }
} }
if (m_writeConsole && !m_console->IsOpen()) if (m_writeConsole && !m_console->IsOpen())
@ -341,28 +411,35 @@ void CLogWindow::ToggleLog(int _logType, bool enable)
m_checks->Check(_logType, enable); m_checks->Check(_logType, enable);
m_logManager->setEnable(logType, enable); m_LogManager->setEnable(logType, enable);
if (enable) if (enable)
{ {
if (m_writeWindow) if (m_writeWindow)
m_logManager->addListener(logType, this); m_LogManager->addListener(logType, this);
if (m_writeFile) if (m_writeFile)
m_logManager->addListener(logType, m_fileLog); m_LogManager->addListener(logType, m_fileLog);
if (m_writeConsole) if (m_writeConsole)
m_logManager->addListener(logType, m_console); m_LogManager->addListener(logType, m_console);
} }
else else
{ {
m_logManager->removeListener(logType, this); m_LogManager->removeListener(logType, this);
m_logManager->removeListener(logType, m_fileLog); m_LogManager->removeListener(logType, m_fileLog);
m_logManager->removeListener(logType, m_console); m_LogManager->removeListener(logType, m_console);
} }
} }
void CLogWindow::OnLogTimer(wxTimerEvent& WXUNUSED(event)) void CLogWindow::OnLogTimer(wxTimerEvent& WXUNUSED(event))
{ {
if (!m_LogAccess) return;
//m_Log->Freeze();
UpdateLog(); UpdateLog();
// Better auto scroll
m_Log->ScrollLines(1);
m_Log->ShowPosition( m_Log->GetLastPosition() );
//m_Log->Thaw();
} }
void CLogWindow::NotifyUpdate() void CLogWindow::NotifyUpdate()
@ -373,62 +450,67 @@ void CLogWindow::NotifyUpdate()
void CLogWindow::UpdateLog() void CLogWindow::UpdateLog()
{ {
m_logTimer->Stop(); if (!m_LogAccess) return;
if (!m_Log) return;
m_LogTimer->Stop();
wxString collected_text; wxString collected_text;
m_logSection.Enter(); m_LogSection.Enter();
// rough estimate // 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++)
{ {
#ifndef _WIN32
// FIXME This looks horrible on windows: SetForegroundColour changes
// ALL text in the control, and SetDefaultStyle doesn't work at all
switch (msgQueue.front().first) switch (msgQueue.front().first)
{ {
// red // red
case ERROR_LEVEL: case ERROR_LEVEL:
m_log->SetForegroundColour(*wxRED); m_Log->SetDefaultStyle(wxTextAttr(*wxRED));
break; break;
// yellow // yellow
case WARNING_LEVEL: case WARNING_LEVEL:
m_log->SetForegroundColour(wxColour(255, 255, 0)); m_Log->SetDefaultStyle(wxTextAttr(wxColour(255, 255, 0)));
break; break;
// green // green
case NOTICE_LEVEL: case NOTICE_LEVEL:
m_log->SetForegroundColour(*wxGREEN); m_Log->SetDefaultStyle(wxTextAttr(*wxGREEN));
break; break;
// cyan // cyan
case INFO_LEVEL: case INFO_LEVEL:
m_log->SetForegroundColour(*wxCYAN); m_Log->SetDefaultStyle(wxTextAttr(*wxCYAN));
break; break;
// light gray // light gray
case DEBUG_LEVEL: case DEBUG_LEVEL:
m_log->SetForegroundColour(wxColour(211, 211, 211)); m_Log->SetDefaultStyle(wxTextAttr(wxColour(211, 211, 211)));
break; break;
// white // white
default: default:
m_log->SetForegroundColour(*wxWHITE); m_Log->SetDefaultStyle(wxTextAttr(*wxWHITE));
break; break;
} }
#endif if (msgQueue.front().second.size())
{
int j = m_Log->GetLastPosition();
m_Log->AppendText(msgQueue.front().second);
// White timestamp
m_Log->SetStyle(j, j + 9, wxTextAttr(*wxWHITE));
}
collected_text.Append(msgQueue.front().second); collected_text.Append(msgQueue.front().second);
msgQueue.pop(); msgQueue.pop();
} }
m_logSection.Leave(); m_LogSection.Leave();
// Write all text at once, needs multiple SetStyle, may not be better
if (collected_text.size()) { //if (collected_text.size()) m_Log->AppendText(collected_text);
m_log->AppendText(collected_text); // Return in 0.2 seconds
} m_LogTimer->Start(UPDATETIME);
m_logTimer->Start(UPDATETIME);
} }
void CLogWindow::Log(LogTypes::LOG_LEVELS level, const char *text) void CLogWindow::Log(LogTypes::LOG_LEVELS level, const char *text)
{ {
m_logSection.Enter(); m_LogSection.Enter();
if (msgQueue.size() >= 100) if (msgQueue.size() >= 100)
msgQueue.pop(); msgQueue.pop();
msgQueue.push(std::pair<u8, wxString>((u8)level, wxString::FromAscii(text))); msgQueue.push(std::pair<u8, wxString>((u8)level, wxString::FromAscii(text)));
m_logSection.Leave(); m_LogSection.Leave();
} }

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

@ -19,7 +19,10 @@
#define LOGWINDOW_H_ #define LOGWINDOW_H_
#include "Main.h" // for wxGetApp #include "Main.h" // for wxGetApp
#include "LogManager.h" #include "LogManager.h"
#include "IniFile.h" #include "Frame.h"
#include "DebuggerUIUtil.h"
#include "IniFile.h" // Common
#include "Thread.h" #include "Thread.h"
#include <queue> #include <queue>
@ -30,23 +33,26 @@ enum
IDM_LOGCHECKS, IDM_LOGCHECKS,
IDM_OPTIONS, IDM_OPTIONS,
IDM_TOGGLEALL, IDM_TOGGLEALL,
IDM_WRAPLINE,
IDM_WRITEFILE, IDM_WRITEFILE,
IDM_WRITECONSOLE, IDM_WRITECONSOLE,
IDM_WRITEWINDOW, IDM_WRITEWINDOW,
IDTM_UPDATELOG, IDTM_UPDATELOG,
IDM_VERBOSITY, IDM_VERBOSITY,
IDM_FONT,
IDM_SUBMITCMD IDM_SUBMITCMD
}; };
class wxTextCtrl; class wxTextCtrl;
class wxCheckListBox; class wxCheckListBox;
class wxString; class wxString;
class CFrame;
// Uses multiple inheritance - only sane because LogListener is a pure virtual interface. // Uses multiple inheritance - only sane because LogListener is a pure virtual interface.
class CLogWindow : public wxDialog, LogListener class CLogWindow : public wxDialog, LogListener
{ {
public: public:
CLogWindow(wxWindow* parent, CLogWindow(CFrame *parent,
wxWindowID id = wxID_ANY, wxWindowID id = wxID_ANY,
const wxString& title = wxT("Log"), const wxString& title = wxT("Log"),
const wxPoint& pos = wxPoint(100, 700), const wxPoint& pos = wxPoint(100, 700),
@ -64,22 +70,27 @@ public:
void Log(LogTypes::LOG_LEVELS, const char *text); void Log(LogTypes::LOG_LEVELS, const char *text);
private: private:
wxTextCtrl *m_log, *m_cmdline; CFrame *Parent;
bool m_writeFile, m_writeConsole, m_writeWindow; wxBoxSizer *sUber, *sLeft, *sRight, *sRightBottom;
wxTextCtrl *m_Log, *m_cmdline;
wxFont DefaultFont;
bool m_writeFile, m_writeConsole, m_writeWindow, m_LogAccess;
wxCheckBox *m_writeFileCB, *m_writeConsoleCB, *m_writeWindowCB; wxCheckBox *m_writeFileCB, *m_writeConsoleCB, *m_writeWindowCB;
wxTimer *m_logTimer; wxTimer *m_LogTimer;
wxCheckListBox* m_checks; wxCheckListBox* m_checks;
wxRadioBox *m_verbosity; wxRadioBox *m_verbosity;
FileLogListener *m_fileLog; FileLogListener *m_fileLog;
ConsoleListener *m_console; ConsoleListener *m_console;
LogManager *m_logManager; LogManager *m_LogManager;
std::queue<std::pair<u8, wxString> > msgQueue; std::queue<std::pair<u8, wxString> > msgQueue;
Common::CriticalSection m_logSection; Common::CriticalSection m_LogSection;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
wxTextCtrl * CreateTextCtrl(wxDialog* parent, wxWindowID id, long Style);
void CreateGUIControls(); void CreateGUIControls();
void PopulateRight(); void UnPopulateRight();
void OnClose(wxCloseEvent& event); void OnClose(wxCloseEvent& event);
void OnSubmit(wxCommandEvent& event); void OnSubmit(wxCommandEvent& event);
void OnOptionsCheck(wxCommandEvent& event); void OnOptionsCheck(wxCommandEvent& event);