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

log console: Sources menu - add Restore Default item

This commit is contained in:
Avi Halachmi (:avih) 2014-12-30 05:29:39 +02:00
parent 95e00e0edf
commit 1779ee42c2
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pcsx2/gui/ConsoleLogger.cpp
View File

@ -288,6 +288,7 @@ enum MenuIDs_t
MenuId_LogSource_EnableAll = 0x30, MenuId_LogSource_EnableAll = 0x30,
MenuId_LogSource_DisableAll, MenuId_LogSource_DisableAll,
MenuId_LogSource_Devel, MenuId_LogSource_Devel,
MenuId_LogSource_SetDefault,
MenuId_LogSource_CDVD_Info, MenuId_LogSource_CDVD_Info,
MenuId_LogSource_Start = 0x100 MenuId_LogSource_Start = 0x100
@ -460,6 +461,7 @@ ConsoleLogFrame::ConsoleLogFrame( MainEmuFrame *parent, const wxString& title, A
menuSources.AppendSeparator(); menuSources.AppendSeparator();
menuSources.Append( MenuId_LogSource_EnableAll, _("Enable all"), _("Enables all log source filters.") ); menuSources.Append( MenuId_LogSource_EnableAll, _("Enable all"), _("Enables all log source filters.") );
menuSources.Append( MenuId_LogSource_DisableAll, _("Disable all"), _("Disables all log source filters.") ); menuSources.Append( MenuId_LogSource_DisableAll, _("Disable all"), _("Disables all log source filters.") );
menuSources.Append( MenuId_LogSource_SetDefault, _("Restore Default"), _("Restore default source filters.") );
pMenuBar->Append(&menuLog, _("&Log")); pMenuBar->Append(&menuLog, _("&Log"));
pMenuBar->Append(&menuSources, _("&Sources")); pMenuBar->Append(&menuSources, _("&Sources"));
@ -484,6 +486,7 @@ ConsoleLogFrame::ConsoleLogFrame( MainEmuFrame *parent, const wxString& title, A
Connect( MenuId_LogSource_CDVD_Info, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ConsoleLogFrame::OnToggleCDVDInfo ) ); Connect( MenuId_LogSource_CDVD_Info, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ConsoleLogFrame::OnToggleCDVDInfo ) );
Connect( MenuId_LogSource_EnableAll, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ConsoleLogFrame::OnEnableAllLogging ) ); Connect( MenuId_LogSource_EnableAll, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ConsoleLogFrame::OnEnableAllLogging ) );
Connect( MenuId_LogSource_DisableAll, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ConsoleLogFrame::OnDisableAllLogging ) ); Connect( MenuId_LogSource_DisableAll, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ConsoleLogFrame::OnDisableAllLogging ) );
Connect( MenuId_LogSource_SetDefault, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ConsoleLogFrame::OnSetDefaultLogging ) );
Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler (ConsoleLogFrame::OnCloseWindow) ); Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler (ConsoleLogFrame::OnCloseWindow) );
Connect( wxEVT_MOVE, wxMoveEventHandler (ConsoleLogFrame::OnMoveAround) ); Connect( wxEVT_MOVE, wxMoveEventHandler (ConsoleLogFrame::OnMoveAround) );
@ -543,6 +546,19 @@ void ConsoleLogFrame::OnDisableAllLogging(wxCommandEvent& evt)
evt.Skip(); evt.Skip();
} }
void ConsoleLogFrame::OnSetDefaultLogging(wxCommandEvent& evt)
{
uint srcnt = ArraySize(ConLogSources);
for (uint i = 0; i<srcnt; ++i)
{
if (ConsoleLogSource* log = ConLogSources[i])
log->Enabled = ConLogDefaults[i];
}
OnLoggingChanged();
evt.Skip();
}
void ConsoleLogFrame::OnLoggingChanged() void ConsoleLogFrame::OnLoggingChanged()
{ {
if (!GetMenuBar()) return; if (!GetMenuBar()) return;

1
pcsx2/gui/ConsoleLogger.h
View File

@ -242,6 +242,7 @@ protected:
void OnEnableAllLogging(wxCommandEvent& event); void OnEnableAllLogging(wxCommandEvent& event);
void OnDisableAllLogging(wxCommandEvent& event); void OnDisableAllLogging(wxCommandEvent& event);
void OnSetDefaultLogging(wxCommandEvent& event);
void OnToggleTheme(wxCommandEvent& event); void OnToggleTheme(wxCommandEvent& event);
void OnFontSize(wxCommandEvent& event); void OnFontSize(wxCommandEvent& event);