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

Make log options an AUI window instead of a dialog.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7217 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2011-02-21 15:01:00 +00:00
parent f9ccd6dfa1
commit 3b6f7644fd
15 changed files with 111 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@ Core::GetWindowHandle().
#include "GameListCtrl.h"
#include "BootManager.h"
#include "LogWindow.h"
#include "LogConfigDiag.h"
#include "LogConfigWindow.h"
#include "WxUtils.h"
#include "ConfigManager.h" // Core
@ -192,7 +192,6 @@ void CFrame::CreateMenu()
pOptionsMenu->Append(IDM_CONFIG_PAD_PLUGIN, _("Gamecube &Pad Settings"));
pOptionsMenu->Append(IDM_CONFIG_WIIMOTE_PLUGIN, _("&Wiimote Settings"));
pOptionsMenu->Append(IDM_CONFIG_HOTKEYS, _("&Hotkey Settings"));
pOptionsMenu->Append(IDM_CONFIG_LOGGER, _("&Logger Settings"));
if (g_pCodeWindow)
{
pOptionsMenu->AppendSeparator();
@ -234,6 +233,7 @@ void CFrame::CreateMenu()
viewMenu->Check(IDM_TOGGLE_STATUSBAR, SConfig::GetInstance().m_InterfaceStatusbar);
viewMenu->AppendSeparator();
viewMenu->AppendCheckItem(IDM_LOGWINDOW, _("Show &Log"));
viewMenu->AppendCheckItem(IDM_LOGCONFIGWINDOW, _("Show Log &Configuration"));
viewMenu->AppendCheckItem(IDM_CONSOLEWINDOW, _("Show &Console"));
viewMenu->AppendSeparator();
@ -266,6 +266,7 @@ void CFrame::CreateMenu()
else
{
viewMenu->Check(IDM_LOGWINDOW, SConfig::GetInstance().m_InterfaceLogWindow);
viewMenu->Check(IDM_LOGCONFIGWINDOW, SConfig::GetInstance().m_InterfaceLogConfigWindow);
viewMenu->Check(IDM_CONSOLEWINDOW, SConfig::GetInstance().m_InterfaceConsole);
}
@ -1229,12 +1230,6 @@ void CFrame::OnConfigHotkey(wxCommandEvent& WXUNUSED (event))
UpdateGUI();
}
void CFrame::OnConfigLogger(wxCommandEvent& WXUNUSED (event))
{
LogConfigDiag *m_LogConfigDiag = new LogConfigDiag(this, m_LogWindow);
m_LogConfigDiag->Show();
}
void CFrame::OnHelp(wxCommandEvent& event)
{
switch (event.GetId())