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

Improve behavior of the console window on windows. Remove coloring from logwindow for the time being. Now you can use wxGetApp if you #include Main.h, and GetCFrame, etc...

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2694 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
2009-03-20 18:25:36 +00:00
parent 7d910a5e4a
commit eacb9ccd80
15 changed files with 231 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -152,12 +152,14 @@ void CFrame::CreateMenu()
// Tools menu
wxMenu* toolsMenu = new wxMenu;
toolsMenu->AppendCheckItem(IDM_TOGGLE_TOOLBAR, _T("View &Toolbar"));
toolsMenu->AppendCheckItem(IDM_TOGGLE_TOOLBAR, _T("Show &Toolbar"));
toolsMenu->Check(IDM_TOGGLE_TOOLBAR, SConfig::GetInstance().m_InterfaceToolbar);
toolsMenu->AppendCheckItem(IDM_TOGGLE_STATUSBAR, _T("View &Statusbar"));
toolsMenu->AppendCheckItem(IDM_TOGGLE_STATUSBAR, _T("Show &Statusbar"));
toolsMenu->Check(IDM_TOGGLE_STATUSBAR, SConfig::GetInstance().m_InterfaceStatusbar);
toolsMenu->AppendCheckItem(IDM_TOGGLE_LOGWINDOW, _T("View &Logwindow"));
toolsMenu->AppendCheckItem(IDM_TOGGLE_LOGWINDOW, _T("Show &Logwindow"));
toolsMenu->Check(IDM_TOGGLE_LOGWINDOW, m_bLogWindow);
toolsMenu->AppendCheckItem(IDM_TOGGLE_CONSOLE, _T("Show &Console"));
toolsMenu->Check(IDM_TOGGLE_CONSOLE, SConfig::GetInstance().m_InterfaceConsole);
toolsMenu->AppendSeparator();
toolsMenu->Append(IDM_MEMCARD, _T("&Memcard Manager"));
toolsMenu->Append(IDM_CHEATS, _T("Action &Replay Manager"));
@ -731,7 +733,7 @@ void CFrame::OnSaveState(wxCommandEvent& event)
}
// Let us enable and disable the toolbar
// Enable and disable the toolbar
void CFrame::OnToggleToolbar(wxCommandEvent& event)
{
wxToolBarBase* toolBar = GetToolBar();
@ -749,7 +751,7 @@ void CFrame::OnToggleToolbar(wxCommandEvent& event)
this->SendSizeEvent();
}
// Let us enable and disable the status bar
// Enable and disable the status bar
void CFrame::OnToggleStatusbar(wxCommandEvent& event)
{
if (SConfig::GetInstance().m_InterfaceStatusbar = event.IsChecked() == true)
@ -760,17 +762,40 @@ void CFrame::OnToggleStatusbar(wxCommandEvent& event)
this->SendSizeEvent();
}
// Let us enable and disable the log window
// Enable and disable the log window
void CFrame::OnToggleLogWindow(wxCommandEvent& event)
{
if (SConfig::GetInstance().m_InterfaceLogWindow = event.IsChecked() == true)
ToggleLogWindow(event.IsChecked());
}
void CFrame::ToggleLogWindow(bool check)
{
if (SConfig::GetInstance().m_InterfaceLogWindow = check == true)
m_LogWindow->Show();
else
m_LogWindow->Hide();
this->SendSizeEvent();
// Make sure the check is updated (if wxw isn't calling this func)
GetMenuBar()->FindItem(IDM_TOGGLE_LOGWINDOW)->Check(check);
}
// Enable and disable the console
void CFrame::OnToggleConsole(wxCommandEvent& event)
{
ToggleConsole(event.IsChecked());
}
void CFrame::ToggleConsole(bool check)
{
ConsoleListener *console = LogManager::GetInstance()->getConsoleListener();
if (SConfig::GetInstance().m_InterfaceConsole = check == true)
console->Open();
else
console->Close();
// Make sure the check is updated (if wxw isn't calling this func)
GetMenuBar()->FindItem(IDM_TOGGLE_CONSOLE)->Check(check);
}
// Update the enabled/disabled status
void CFrame::UpdateGUI()