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

Moved the "Print CDVD info" menu item to console logs. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4409 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2 2011-03-10 16:57:14 +00:00
parent 5cd321e6ff
commit f1b8b05043
6 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/gui/App.h
View File

@ -151,7 +151,6 @@ enum MenuIdentifiers
MenuId_Profiler, // Enable profiler MenuId_Profiler, // Enable profiler
MenuId_Console, // Enable console MenuId_Console, // Enable console
MenuId_Console_Stdio, // Enable Stdio MenuId_Console_Stdio, // Enable Stdio
MenuId_CDVD_Info,
// Debug Subsection // Debug Subsection
MenuId_Debug_Open, // opens the debugger window / starts a debug session MenuId_Debug_Open, // opens the debugger window / starts a debug session

23
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_CDVD_Info,
MenuId_LogSource_Start = 0x100 MenuId_LogSource_Start = 0x100
}; };
@ -436,6 +437,8 @@ ConsoleLogFrame::ConsoleLogFrame( MainEmuFrame *parent, const wxString& title, A
// Source Selection/Toggle menu // Source Selection/Toggle menu
menuSources.Append( MenuId_LogSource_Devel, _("Dev/Verbose"), _("Shows PCSX2 developer logs"), wxITEM_CHECK ); menuSources.Append( MenuId_LogSource_Devel, _("Dev/Verbose"), _("Shows PCSX2 developer logs"), wxITEM_CHECK );
menuSources.Append( MenuId_LogSource_CDVD_Info, _("CDVD reads"), _("Shows disk read activity"), wxITEM_CHECK );
menuSources.AppendSeparator(); menuSources.AppendSeparator();
uint srcnt = ArraySize(ConLogSources); uint srcnt = ArraySize(ConLogSources);
@ -474,6 +477,7 @@ ConsoleLogFrame::ConsoleLogFrame( MainEmuFrame *parent, const wxString& title, A
Connect( MenuId_ColorScheme_Light, MenuId_ColorScheme_Dark, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ConsoleLogFrame::OnToggleTheme ) ); Connect( MenuId_ColorScheme_Light, MenuId_ColorScheme_Dark, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ConsoleLogFrame::OnToggleTheme ) );
Connect( MenuId_LogSource_Devel, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ConsoleLogFrame::OnToggleSource ) ); Connect( MenuId_LogSource_Devel, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ConsoleLogFrame::OnToggleSource ) );
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 ) );
@ -542,6 +546,9 @@ void ConsoleLogFrame::OnLoggingChanged()
if( wxMenuItem* item = GetMenuBar()->FindItem(MenuId_LogSource_Devel) ) if( wxMenuItem* item = GetMenuBar()->FindItem(MenuId_LogSource_Devel) )
item->Check( DevConWriterEnabled ); item->Check( DevConWriterEnabled );
if( wxMenuItem* item = GetMenuBar()->FindItem(MenuId_LogSource_CDVD_Info) )
item->Check( g_Conf->EmuOptions.CdvdVerboseReads );
uint srcnt = ArraySize(ConLogSources); uint srcnt = ArraySize(ConLogSources);
for (uint i=0; i<srcnt; ++i) for (uint i=0; i<srcnt; ++i)
{ {
@ -772,6 +779,22 @@ void ConsoleLogFrame::OnClear(wxCommandEvent& WXUNUSED(event))
m_TextCtrl.Clear(); m_TextCtrl.Clear();
} }
void ConsoleLogFrame::OnToggleCDVDInfo( wxCommandEvent& evt )
{
evt.Skip();
if (!GetMenuBar()) return;
if (evt.GetId() == MenuId_LogSource_CDVD_Info)
{
if( wxMenuItem* item = GetMenuBar()->FindItem(evt.GetId()) )
{
g_Conf->EmuOptions.CdvdVerboseReads = item->IsChecked();
const_cast<Pcsx2Config&>(EmuConfig).CdvdVerboseReads = g_Conf->EmuOptions.CdvdVerboseReads; // read-only in core thread, so it's safe to modify.
}
}
}
void ConsoleLogFrame::OnToggleSource( wxCommandEvent& evt ) void ConsoleLogFrame::OnToggleSource( wxCommandEvent& evt )
{ {
evt.Skip(); evt.Skip();

1
pcsx2/gui/ConsoleLogger.h
View File

@ -246,6 +246,7 @@ protected:
void OnToggleTheme(wxCommandEvent& event); void OnToggleTheme(wxCommandEvent& event);
void OnFontSize(wxCommandEvent& event); void OnFontSize(wxCommandEvent& event);
void OnToggleSource(wxCommandEvent& event); void OnToggleSource(wxCommandEvent& event);
void OnToggleCDVDInfo(wxCommandEvent& event);
virtual void OnCloseWindow(wxCloseEvent& event); virtual void OnCloseWindow(wxCloseEvent& event);

3
pcsx2/gui/MainFrame.cpp
View File

@ -224,7 +224,6 @@ void MainEmuFrame::ConnectMenus()
ConnectMenu( MenuId_Console, Menu_ShowConsole ); ConnectMenu( MenuId_Console, Menu_ShowConsole );
ConnectMenu( MenuId_Console_Stdio, Menu_ShowConsole_Stdio ); ConnectMenu( MenuId_Console_Stdio, Menu_ShowConsole_Stdio );
ConnectMenu( MenuId_CDVD_Info, Menu_PrintCDVD_Info );
ConnectMenu( MenuId_About, Menu_ShowAboutBox ); ConnectMenu( MenuId_About, Menu_ShowAboutBox );
} }
@ -484,7 +483,6 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
//m_menuMisc.Append(41, "Patch Browser...", wxEmptyString, wxITEM_NORMAL); //m_menuMisc.Append(41, "Patch Browser...", wxEmptyString, wxITEM_NORMAL);
//m_menuMisc.Append(42, "Patch Finder...", wxEmptyString, wxITEM_NORMAL); //m_menuMisc.Append(42, "Patch Finder...", wxEmptyString, wxITEM_NORMAL);
m_menuMisc.Append(MenuId_CDVD_Info, _("Print CDVD Info"), wxEmptyString, wxITEM_CHECK);
m_menuMisc.AppendSeparator(); m_menuMisc.AppendSeparator();
//Todo: //Todo:
@ -656,7 +654,6 @@ void MainEmuFrame::ApplyConfigToGui(AppConfig& configToApply, int flags)
menubar.Check( MenuId_EnableBackupStates, configToApply.EmuOptions.BackupSavestate ); menubar.Check( MenuId_EnableBackupStates, configToApply.EmuOptions.BackupSavestate );
menubar.Check( MenuId_EnableCheats, configToApply.EmuOptions.EnableCheats ); menubar.Check( MenuId_EnableCheats, configToApply.EmuOptions.EnableCheats );
menubar.Check( MenuId_EnableHostFs, configToApply.EmuOptions.HostFs ); menubar.Check( MenuId_EnableHostFs, configToApply.EmuOptions.HostFs );
menubar.Check( MenuId_CDVD_Info, configToApply.EmuOptions.CdvdVerboseReads );
#ifdef __LINUX__ #ifdef __LINUX__
menubar.Check( MenuId_Console_Stdio, configToApply.EmuOptions.ConsoleToStdio ); menubar.Check( MenuId_Console_Stdio, configToApply.EmuOptions.ConsoleToStdio );
#endif #endif

1
pcsx2/gui/MainFrame.h
View File

@ -203,7 +203,6 @@ protected:
void Menu_ShowConsole(wxCommandEvent &event); void Menu_ShowConsole(wxCommandEvent &event);
void Menu_ShowConsole_Stdio(wxCommandEvent &event); void Menu_ShowConsole_Stdio(wxCommandEvent &event);
void Menu_PrintCDVD_Info(wxCommandEvent &event);
void Menu_ShowAboutBox(wxCommandEvent &event); void Menu_ShowAboutBox(wxCommandEvent &event);
void _DoBootCdvd(); void _DoBootCdvd();

7
pcsx2/gui/MainMenuClicks.cpp
View File

@ -563,13 +563,6 @@ void MainEmuFrame::Menu_ShowConsole_Stdio(wxCommandEvent &event)
AppSaveSettings(); AppSaveSettings();
} }
void MainEmuFrame::Menu_PrintCDVD_Info(wxCommandEvent &event)
{
g_Conf->EmuOptions.CdvdVerboseReads = GetMenuBar()->IsChecked( MenuId_CDVD_Info );
const_cast<Pcsx2Config&>(EmuConfig).CdvdVerboseReads = g_Conf->EmuOptions.CdvdVerboseReads; // read-only in core thread, so it's safe to modify.
AppSaveSettings();
}
void MainEmuFrame::Menu_ShowAboutBox(wxCommandEvent &event) void MainEmuFrame::Menu_ShowAboutBox(wxCommandEvent &event)
{ {
AppOpenDialog<AboutBoxDialog>( this ); AppOpenDialog<AboutBoxDialog>( this );