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

Merge pull request #1142 from PCSX2-Alpha/Consolelog_stuffs 

console: don't remember size when maximised
console: make enable/disable/restore defaults affect all items
This commit is contained in:
Jonathan Li 2016-01-28 12:52:45 +00:00
parent 3544b84632 fea95c2951
commit e983be4060
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pcsx2/gui/ConsoleLogger.cpp
View File

@ -510,6 +510,8 @@ void ConsoleLogFrame::OnEnableAllLogging(wxCommandEvent& evt)
if (ConsoleLogSource* log = ConLogSources[i]) if (ConsoleLogSource* log = ConLogSources[i])
log->Enabled = true; log->Enabled = true;
} }
DevConWriterEnabled = true;
g_Conf->EmuOptions.CdvdVerboseReads = true;
OnLoggingChanged(); OnLoggingChanged();
evt.Skip(); evt.Skip();
@ -523,6 +525,8 @@ void ConsoleLogFrame::OnDisableAllLogging(wxCommandEvent& evt)
if (ConsoleLogSource* log = ConLogSources[i]) if (ConsoleLogSource* log = ConLogSources[i])
log->Enabled = false; log->Enabled = false;
} }
DevConWriterEnabled = false;
g_Conf->EmuOptions.CdvdVerboseReads = false;
OnLoggingChanged(); OnLoggingChanged();
evt.Skip(); evt.Skip();
@ -536,6 +540,8 @@ void ConsoleLogFrame::OnSetDefaultLogging(wxCommandEvent& evt)
if (ConsoleLogSource* log = ConLogSources[i]) if (ConsoleLogSource* log = ConLogSources[i])
log->Enabled = ConLogDefaults[i]; log->Enabled = ConLogDefaults[i];
} }
DevConWriterEnabled = false;
g_Conf->EmuOptions.CdvdVerboseReads = false;
OnLoggingChanged(); OnLoggingChanged();
evt.Skip(); evt.Skip();
@ -691,6 +697,7 @@ void ConsoleLogFrame::OnMoveAround( wxMoveEvent& evt )
void ConsoleLogFrame::OnResize( wxSizeEvent& evt ) void ConsoleLogFrame::OnResize( wxSizeEvent& evt )
{ {
if (!ConsoleLogFrame::IsMaximized())
m_conf.DisplaySize = GetSize(); m_conf.DisplaySize = GetSize();
evt.Skip(); evt.Skip();
} }