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

Merge pull request #1337 from turtleli/autodock 

Console: Add AutoDock option to menu
This commit is contained in:
Jonathan Li 2016-05-09 00:13:21 +01:00
parent 5ecbc2889b 7435e6e7b3
commit 23782b5c24
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcsx2/gui/ConsoleLogger.cpp
View File

@ -244,6 +244,8 @@ enum MenuIDs_t
MenuId_ColorScheme_Light = 0x20, MenuId_ColorScheme_Light = 0x20,
MenuId_ColorScheme_Dark, MenuId_ColorScheme_Dark,
MenuId_AutoDock,
MenuId_LogSource_EnableAll = 0x30, MenuId_LogSource_EnableAll = 0x30,
MenuId_LogSource_DisableAll, MenuId_LogSource_DisableAll,
MenuId_LogSource_Devel, MenuId_LogSource_Devel,
@ -406,6 +408,7 @@ ConsoleLogFrame::ConsoleLogFrame( MainEmuFrame *parent, const wxString& title, A
menuLog.Append(wxID_SAVE, _("&Save..."), _("Save log contents to file")); menuLog.Append(wxID_SAVE, _("&Save..."), _("Save log contents to file"));
menuLog.Append(wxID_CLEAR, _("C&lear"), _("Clear the log window contents")); menuLog.Append(wxID_CLEAR, _("C&lear"), _("Clear the log window contents"));
menuLog.AppendSeparator(); menuLog.AppendSeparator();
menuLog.AppendCheckItem(MenuId_AutoDock, _("Autodock"), _("Dock log window to main PCSX2 window"))->Check(m_conf.AutoDock);
menuLog.AppendSubMenu( &menuAppear, _("Appearance") ); menuLog.AppendSubMenu( &menuAppear, _("Appearance") );
menuLog.AppendSeparator(); menuLog.AppendSeparator();
menuLog.Append(wxID_CLOSE, _("&Close"), _("Close this log window; contents are preserved")); menuLog.Append(wxID_CLOSE, _("&Close"), _("Close this log window; contents are preserved"));
@ -453,6 +456,8 @@ ConsoleLogFrame::ConsoleLogFrame( MainEmuFrame *parent, const wxString& title, A
Bind(wxEVT_MENU, &ConsoleLogFrame::OnFontSize, this, MenuId_FontSize_Small, MenuId_FontSize_Huge); Bind(wxEVT_MENU, &ConsoleLogFrame::OnFontSize, this, MenuId_FontSize_Small, MenuId_FontSize_Huge);
Bind(wxEVT_MENU, &ConsoleLogFrame::OnToggleTheme, this, MenuId_ColorScheme_Light, MenuId_ColorScheme_Dark); Bind(wxEVT_MENU, &ConsoleLogFrame::OnToggleTheme, this, MenuId_ColorScheme_Light, MenuId_ColorScheme_Dark);
Bind(wxEVT_MENU, &ConsoleLogFrame::OnAutoDock, this, MenuId_AutoDock);
Bind(wxEVT_MENU, &ConsoleLogFrame::OnToggleSource, this, MenuId_LogSource_Devel); Bind(wxEVT_MENU, &ConsoleLogFrame::OnToggleSource, this, MenuId_LogSource_Devel);
Bind(wxEVT_MENU, &ConsoleLogFrame::OnToggleCDVDInfo, this, MenuId_LogSource_CDVD_Info); Bind(wxEVT_MENU, &ConsoleLogFrame::OnToggleCDVDInfo, this, MenuId_LogSource_CDVD_Info);
Bind(wxEVT_MENU, &ConsoleLogFrame::OnEnableAllLogging, this, MenuId_LogSource_EnableAll); Bind(wxEVT_MENU, &ConsoleLogFrame::OnEnableAllLogging, this, MenuId_LogSource_EnableAll);
@ -862,6 +867,13 @@ void ConsoleLogFrame::OnFontSize( wxCommandEvent& evt )
// it hardly matters being a once-in-a-bluemoon action). // it hardly matters being a once-in-a-bluemoon action).
} }
void ConsoleLogFrame::OnAutoDock(wxCommandEvent& evt)
{
if (auto menuBar = GetMenuBar())
m_conf.AutoDock = menuBar->IsChecked(MenuId_AutoDock);
evt.Skip();
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Logging Events (typically received from Console class interfaces) // Logging Events (typically received from Console class interfaces)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

1
pcsx2/gui/ConsoleLogger.h
View File

@ -222,6 +222,7 @@ protected:
void OnToggleTheme(wxCommandEvent& event); void OnToggleTheme(wxCommandEvent& event);
void OnFontSize(wxCommandEvent& event); void OnFontSize(wxCommandEvent& event);
void OnAutoDock(wxCommandEvent& event);
void OnToggleSource(wxCommandEvent& event); void OnToggleSource(wxCommandEvent& event);
void OnToggleCDVDInfo(wxCommandEvent& event); void OnToggleCDVDInfo(wxCommandEvent& event);