mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 22:29:39 -06:00
nakee's new logmanager. added a console window for windows builds (prints to parent console on non-win32). also fix some random wxw bugs: main window's position is saved when using debugger, disabling windows from the tools menu are saved settings, some other small fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2675 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -44,11 +44,11 @@ be accessed from Core::GetWindowHandle().
|
||||
#include "GameListCtrl.h"
|
||||
#include "BootManager.h"
|
||||
#include "SDCardWindow.h"
|
||||
#include "LogWindow.h"
|
||||
|
||||
#include "Common.h" // Common
|
||||
#include "FileUtil.h"
|
||||
#include "Timer.h"
|
||||
#include "ConsoleWindow.h"
|
||||
#include "Setup.h"
|
||||
|
||||
#include "ConfigManager.h" // Core
|
||||
@ -153,9 +153,11 @@ void CFrame::CreateMenu()
|
||||
// Tools menu
|
||||
wxMenu* toolsMenu = new wxMenu;
|
||||
toolsMenu->AppendCheckItem(IDM_TOGGLE_TOOLBAR, _T("View &Toolbar"));
|
||||
toolsMenu->Check(IDM_TOGGLE_TOOLBAR, true);
|
||||
toolsMenu->Check(IDM_TOGGLE_TOOLBAR, SConfig::GetInstance().m_InterfaceToolbar);
|
||||
toolsMenu->AppendCheckItem(IDM_TOGGLE_STATUSBAR, _T("View &Statusbar"));
|
||||
toolsMenu->Check(IDM_TOGGLE_STATUSBAR, true);
|
||||
toolsMenu->Check(IDM_TOGGLE_STATUSBAR, SConfig::GetInstance().m_InterfaceStatusbar);
|
||||
toolsMenu->AppendCheckItem(IDM_TOGGLE_LOGWINDOW, _T("View &Logwindow"));
|
||||
toolsMenu->Check(IDM_TOGGLE_LOGWINDOW, m_bLogWindow);
|
||||
toolsMenu->AppendSeparator();
|
||||
toolsMenu->Append(IDM_MEMCARD, _T("&Memcard Manager"));
|
||||
toolsMenu->Append(IDM_CHEATS, _T("Action &Replay Manager"));
|
||||
@ -350,7 +352,8 @@ void CFrame::InitBitmaps()
|
||||
//////////////////////////
|
||||
|
||||
// Update in case the bitmap has been updated
|
||||
if (GetToolBar() != NULL) RecreateToolbar();
|
||||
if (GetToolBar() != NULL)
|
||||
RecreateToolbar();
|
||||
}
|
||||
|
||||
|
||||
@ -733,7 +736,7 @@ void CFrame::OnToggleToolbar(wxCommandEvent& event)
|
||||
{
|
||||
wxToolBarBase* toolBar = GetToolBar();
|
||||
|
||||
if (event.IsChecked())
|
||||
if (SConfig::GetInstance().m_InterfaceToolbar = event.IsChecked() == true)
|
||||
{
|
||||
CFrame::RecreateToolbar();
|
||||
}
|
||||
@ -749,7 +752,7 @@ void CFrame::OnToggleToolbar(wxCommandEvent& event)
|
||||
// Let us enable and disable the status bar
|
||||
void CFrame::OnToggleStatusbar(wxCommandEvent& event)
|
||||
{
|
||||
if (event.IsChecked())
|
||||
if (SConfig::GetInstance().m_InterfaceStatusbar = event.IsChecked() == true)
|
||||
m_pStatusBar->Show();
|
||||
else
|
||||
m_pStatusBar->Hide();
|
||||
@ -757,6 +760,17 @@ void CFrame::OnToggleStatusbar(wxCommandEvent& event)
|
||||
this->SendSizeEvent();
|
||||
}
|
||||
|
||||
// Let us enable and disable the log window
|
||||
void CFrame::OnToggleLogWindow(wxCommandEvent& event)
|
||||
{
|
||||
if (SConfig::GetInstance().m_InterfaceLogWindow = event.IsChecked() == true)
|
||||
m_LogWindow->Show();
|
||||
else
|
||||
m_LogWindow->Hide();
|
||||
|
||||
this->SendSizeEvent();
|
||||
}
|
||||
|
||||
|
||||
// Update the enabled/disabled status
|
||||
void CFrame::UpdateGUI()
|
||||
@ -815,7 +829,8 @@ void CFrame::UpdateGUI()
|
||||
m_pMenuItemPlay->SetText(_("&Play"));
|
||||
|
||||
}
|
||||
if (GetToolBar() != NULL) GetToolBar()->Realize();
|
||||
if (GetToolBar() != NULL)
|
||||
GetToolBar()->Realize();
|
||||
|
||||
|
||||
if (!initialized)
|
||||
|
Reference in New Issue
Block a user