diff options
| author | Glenn Rice <glennricster@gmail.com> | 2011-02-18 12:34:24 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2011-02-18 12:34:24 +0000 |
| commit | c2bc463fe7cdec7ea00338a58922bdb1a3864b3d (patch) | |
| tree | 57510a3de946c32cd483450773090ccfecd16890 /Source/Core/DolphinWX/Src/FrameTools.cpp | |
| parent | 21835880306c1a4557aaea258eb56dbb45e72029 (diff) | |
Move the log window options from the log window into a separate dialog openned from an item in the options menu. This gives the log window room to show logs.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7191 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DolphinWX/Src/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/FrameTools.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 2f9aa2ebdf..8ca91deefc 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -50,6 +50,7 @@ Core::GetWindowHandle(). #include "GameListCtrl.h" #include "BootManager.h" #include "LogWindow.h" +#include "LogConfigDiag.h" #include "WxUtils.h" #include "ConfigManager.h" // Core @@ -188,9 +189,10 @@ void CFrame::CreateMenu() pOptionsMenu->AppendSeparator(); pOptionsMenu->Append(IDM_CONFIG_GFX_BACKEND, _("&Graphics Settings")); pOptionsMenu->Append(IDM_CONFIG_DSP_EMULATOR, _("&DSP Settings")); - pOptionsMenu->Append(IDM_CONFIG_PAD_PLUGIN, _("&Gamecube Pad Settings")); + 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(); @@ -1227,6 +1229,13 @@ void CFrame::OnConfigHotkey(wxCommandEvent& WXUNUSED (event)) UpdateGUI(); } +void CFrame::OnConfigLogger(wxCommandEvent& WXUNUSED (event)) +{ + LogConfigDiag m_LogConfigDiag(this, m_LogWindow); + m_LogConfigDiag.ShowModal(); + m_LogConfigDiag.Destroy(); +} + void CFrame::OnHelp(wxCommandEvent& event) { switch (event.GetId()) |