From 8d57f38be7af319cfecc450bd183d9c7932664c8 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 23 Feb 2014 02:38:46 -0500 Subject: [PATCH] Purge wx elements of the console. --- Source/Core/Core/CMakeLists.txt | 1 - Source/Core/Core/ConfigManager.cpp | 2 - Source/Core/Core/ConfigManager.h | 1 - .../Debugger/CodeWindowFunctions.cpp | 2 - Source/Core/DolphinWX/Frame.cpp | 14 +-- Source/Core/DolphinWX/Frame.h | 2 - Source/Core/DolphinWX/FrameAui.cpp | 107 +----------------- Source/Core/DolphinWX/FrameTools.cpp | 7 -- Source/Core/DolphinWX/Globals.h | 3 - Source/Core/DolphinWX/LogWindow.cpp | 6 - Source/Core/DolphinWX/LogWindow.h | 2 +- 11 files changed, 10 insertions(+), 137 deletions(-) diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 71f9a8eb7b..0b9c774897 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -2,7 +2,6 @@ set(SRCS ActionReplay.cpp ARDecrypt.cpp BootManager.cpp ConfigManager.cpp - Console.cpp Core.cpp CoreParameter.cpp CoreTiming.cpp diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 7e2d333534..156892972c 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -184,7 +184,6 @@ void SConfig::SaveSettings() ini.Set("Interface", "ShowStatusbar", m_InterfaceStatusbar); ini.Set("Interface", "ShowLogWindow", m_InterfaceLogWindow); ini.Set("Interface", "ShowLogConfigWindow", m_InterfaceLogConfigWindow); - ini.Set("Interface", "ShowConsole", m_InterfaceConsole); ini.Set("Interface", "ThemeName40", m_LocalCoreStartupParameter.theme_name); // Hotkeys @@ -332,7 +331,6 @@ void SConfig::LoadSettings() ini.Get("Interface", "ShowStatusbar", &m_InterfaceStatusbar, true); ini.Get("Interface", "ShowLogWindow", &m_InterfaceLogWindow, false); ini.Get("Interface", "ShowLogConfigWindow", &m_InterfaceLogConfigWindow, false); - ini.Get("Interface", "ShowConsole", &m_InterfaceConsole, false); ini.Get("Interface", "ThemeName40", &m_LocalCoreStartupParameter.theme_name, "Clean"); // Hotkeys diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h index 53bf2f592a..b3c1f4a3f1 100644 --- a/Source/Core/Core/ConfigManager.h +++ b/Source/Core/Core/ConfigManager.h @@ -55,7 +55,6 @@ struct SConfig : NonCopyable bool m_InterfaceStatusbar; bool m_InterfaceLogWindow; bool m_InterfaceLogConfigWindow; - bool m_InterfaceConsole; bool m_ListDrives; bool m_ListWad; diff --git a/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp index f7b6006534..d42d227c94 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp @@ -418,8 +418,6 @@ void CCodeWindow::OpenPages() Parent->ToggleLogWindow(true); if (bShowOnStart[IDM_LOGCONFIGWINDOW - IDM_LOGWINDOW]) Parent->ToggleLogConfigWindow(true); - if (bShowOnStart[IDM_CONSOLEWINDOW - IDM_LOGWINDOW]) - Parent->ToggleConsole(true); if (bShowOnStart[IDM_REGISTERWINDOW - IDM_LOGWINDOW]) ToggleRegisterWindow(true); if (bShowOnStart[IDM_BREAKPOINTWINDOW - IDM_LOGWINDOW]) diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index d348c5617f..abb35f390f 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -310,14 +310,13 @@ CFrame::CFrame(wxFrame* parent, for (int i = 0; i <= IDM_CODEWINDOW - IDM_LOGWINDOW; i++) bFloatWindow[i] = false; - if (ShowLogWindow) SConfig::GetInstance().m_InterfaceLogWindow = true; - - // Give it a console early to show potential messages from this onward - ConsoleListener *Console = LogManager::GetInstance()->GetConsoleListener(); - if (SConfig::GetInstance().m_InterfaceConsole) Console->Open(); + if (ShowLogWindow) + SConfig::GetInstance().m_InterfaceLogWindow = true; // Start debugging maximized - if (UseDebugger) this->Maximize(true); + if (UseDebugger) + this->Maximize(true); + // Debugger class if (UseDebugger) { @@ -392,8 +391,6 @@ CFrame::CFrame(wxFrame* parent, ToggleLogWindow(true); if (SConfig::GetInstance().m_InterfaceLogConfigWindow) ToggleLogConfigWindow(true); - if (SConfig::GetInstance().m_InterfaceConsole) - ToggleConsole(true); } // Show window @@ -681,7 +678,6 @@ void CFrame::OnRenderWindowSizeRequest(int width, int height) // Add space for the log/console/debugger window if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain && (SConfig::GetInstance().m_InterfaceLogWindow || - SConfig::GetInstance().m_InterfaceConsole || SConfig::GetInstance().m_InterfaceLogConfigWindow) && !m_Mgr->GetPane(wxT("Pane 1")).IsFloating()) { diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h index c6fbcb51e1..9cfbdb6e7b 100644 --- a/Source/Core/DolphinWX/Frame.h +++ b/Source/Core/DolphinWX/Frame.h @@ -127,7 +127,6 @@ public: void UpdateGameList(); void ToggleLogWindow(bool bShow); void ToggleLogConfigWindow(bool bShow); - void ToggleConsole(bool bShow); void PostEvent(wxCommandEvent& event); void StatusBarMessage(const char * Text, ...); void ClearStatusBar(); @@ -238,7 +237,6 @@ private: void ResetToolbarStyle(); void TogglePaneStyle(bool On, int EventId); void ToggleNotebookStyle(bool On, long Style); - void ResizeConsole(); // Float window void DoUnfloatPage(int Id); void OnFloatingPageClosed(wxCloseEvent& event); diff --git a/Source/Core/DolphinWX/FrameAui.cpp b/Source/Core/DolphinWX/FrameAui.cpp index 55190dd51b..72f1135053 100644 --- a/Source/Core/DolphinWX/FrameAui.cpp +++ b/Source/Core/DolphinWX/FrameAui.cpp @@ -57,7 +57,6 @@ void CFrame::OnManagerResize(wxAuiManagerEvent& event) m_LogWindow->winpos = m_Mgr->GetPane(_T("Pane 1")).dock_direction; } event.Skip(); - ResizeConsole(); } void CFrame::OnPaneClose(wxAuiManagerEvent& event) @@ -70,14 +69,11 @@ void CFrame::OnPaneClose(wxAuiManagerEvent& event) if (!g_pCodeWindow) { if (nb->GetPage(0)->GetId() == IDM_LOGWINDOW || - nb->GetPage(0)->GetId() == IDM_LOGCONFIGWINDOW || - nb->GetPage(0)->GetId() == IDM_CONSOLEWINDOW) + nb->GetPage(0)->GetId() == IDM_LOGCONFIGWINDOW) { - // Closing a pane containing the logwindow or a console closes both - SConfig::GetInstance().m_InterfaceConsole = false; + SConfig::GetInstance().m_InterfaceLogWindow = false; SConfig::GetInstance().m_InterfaceLogConfigWindow = false; - ToggleConsole(false); ToggleLogWindow(false); ToggleLogConfigWindow(false); } @@ -163,59 +159,6 @@ void CFrame::ToggleLogConfigWindow(bool bShow) TogglePane(); } -void CFrame::ToggleConsole(bool bShow) -{ -#ifdef _WIN32 - GetMenuBar()->FindItem(IDM_CONSOLEWINDOW)->Check(bShow); - - if (bShow) - { - // If the console doesn't exist, we create it - if (!GetConsoleWindow()) - { - ConsoleListener *Console = LogManager::GetInstance()->GetConsoleListener(); - Console->Open(); - } - else - { - ShowWindow(GetConsoleWindow(), SW_SHOW); - } - - // Create the parent window if it doesn't exist - wxPanel *ConsoleParent = (wxPanel*)FindWindowById(IDM_CONSOLEWINDOW); - if (!ConsoleParent) ConsoleParent = new wxPanel(this, IDM_CONSOLEWINDOW, - wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, _("Console")); - - wxWindow *ConsoleWin = new wxWindow(); - ConsoleWin->SetHWND((WXHWND)GetConsoleWindow()); - ConsoleWin->AdoptAttributesFromHWND(); - ConsoleWin->Reparent(ConsoleParent); - - ConsoleParent->Enable(); - const int nbIndex = IDM_CONSOLEWINDOW - IDM_LOGWINDOW; - DoAddPage(ConsoleParent, - g_pCodeWindow ? g_pCodeWindow->iNbAffiliation[nbIndex] : 0, - g_pCodeWindow ? bFloatWindow[nbIndex] : false); - } - else // Hide - { - if(GetConsoleWindow()) - ShowWindow(GetConsoleWindow(), SW_HIDE); // WIN32 - - wxPanel *ConsoleParent = (wxPanel*)FindWindowById(IDM_CONSOLEWINDOW); - if (ConsoleParent) - ConsoleParent->Disable(); - - // Then close the page - DoRemovePage(ConsoleParent, true); - } - - // Hide or Show the pane - if (!g_pCodeWindow) - TogglePane(); -#endif -} - void CFrame::OnToggleWindow(wxCommandEvent& event) { bool bShow = GetMenuBar()->IsChecked(event.GetId()); @@ -232,11 +175,6 @@ void CFrame::OnToggleWindow(wxCommandEvent& event) SConfig::GetInstance().m_InterfaceLogConfigWindow = bShow; ToggleLogConfigWindow(bShow); break; - case IDM_CONSOLEWINDOW: - if (!g_pCodeWindow) - SConfig::GetInstance().m_InterfaceConsole = bShow; - ToggleConsole(bShow); - break; case IDM_REGISTERWINDOW: g_pCodeWindow->ToggleRegisterWindow(bShow); break; @@ -264,7 +202,7 @@ void CFrame::ClosePages() { ToggleLogWindow(false); ToggleLogConfigWindow(false); - ToggleConsole(false); + if (g_pCodeWindow) { g_pCodeWindow->ToggleCodeWindow(false); @@ -306,8 +244,6 @@ void CFrame::OnNotebookPageClose(wxAuiNotebookEvent& event) ToggleLogWindow(false); if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_LOGCONFIGWINDOW) ToggleLogConfigWindow(false); - if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_CONSOLEWINDOW) - ToggleConsole(false); if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_REGISTERWINDOW) g_pCodeWindow->ToggleRegisterWindow(false); if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_BREAKPOINTWINDOW) @@ -330,7 +266,6 @@ void CFrame::OnFloatingPageClosed(wxCloseEvent& event) void CFrame::OnFloatingPageSize(wxSizeEvent& event) { event.Skip(); - ResizeConsole(); } void CFrame::OnFloatWindow(wxCommandEvent& event) @@ -393,8 +328,7 @@ void CFrame::OnTab(wxAuiNotebookEvent& event) // Create the popup menu wxMenu* MenuPopup = new wxMenu; - wxMenuItem* Item = new wxMenuItem(MenuPopup, wxID_ANY, - _("Select floating windows")); + wxMenuItem* Item = new wxMenuItem(MenuPopup, wxID_ANY, _("Select floating windows")); MenuPopup->Append(Item); Item->Enable(false); MenuPopup->Append(new wxMenuItem(MenuPopup)); @@ -423,7 +357,6 @@ void CFrame::OnAllowNotebookDnD(wxAuiNotebookEvent& event) { event.Skip(); event.Allow(); - ResizeConsole(); } void CFrame::ShowResizePane() @@ -803,33 +736,6 @@ void CFrame::OnSelectPerspective(wxCommandEvent& event) DoLoadPerspective(); } -void CFrame::ResizeConsole() -{ -#ifdef _WIN32 - // Get the console parent window - wxWindow * Win = FindWindowById(IDM_CONSOLEWINDOW); - if (!Win) return; - - const int wxBorder = 2, Border = 4, - MenuBar = 30, ScrollBar = 19; - - // Get the client size - int X = Win->GetSize().GetX(); - int Y = Win->GetSize().GetY(); - int InternalWidth = X - wxBorder*2 - ScrollBar; - int InternalHeight = Y - wxBorder*2; - int WindowWidth = InternalWidth + Border*2 + - /*max out the width in the word wrap mode*/ 100; - int WindowHeight = InternalHeight + MenuBar; - // Resize buffer - ConsoleListener* Console = LogManager::GetInstance()->GetConsoleListener(); - Console->PixelSpace(0,0, InternalWidth, InternalHeight, false); - // Move the window to hide the border - MoveWindow(GetConsoleWindow(), -Border-wxBorder, -MenuBar-wxBorder, - WindowWidth + 100, WindowHeight, true); -#endif -} - static int Limit(int i, int Low, int High) { if (i < Low) return Low; @@ -1094,11 +1000,6 @@ wxFrame * CFrame::CreateParentFrame(wxWindowID Id, const wxString& Title, Frame->Bind(wxEVT_CLOSE_WINDOW, &CFrame::OnFloatingPageClosed, this); - if (Id == IDM_CONSOLEWINDOW_PARENT) - { - Frame->Bind(wxEVT_SIZE, &CFrame::OnFloatingPageSize, this); - } - // Main sizer Frame->SetSizer(m_MainSizer); // Minimum frame size diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index e8eff865b7..06ae7b962b 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -258,17 +258,11 @@ void CFrame::CreateMenu() viewMenu->AppendSeparator(); viewMenu->AppendCheckItem(IDM_LOGWINDOW, _("Show &Log")); viewMenu->AppendCheckItem(IDM_LOGCONFIGWINDOW, _("Show Log &Configuration")); - viewMenu->AppendCheckItem(IDM_CONSOLEWINDOW, _("Show &Console")); viewMenu->AppendSeparator(); -#ifndef _WIN32 - viewMenu->Enable(IDM_CONSOLEWINDOW, false); -#endif - if (g_pCodeWindow) { viewMenu->Check(IDM_LOGWINDOW, g_pCodeWindow->bShowOnStart[0]); - viewMenu->Check(IDM_CONSOLEWINDOW, g_pCodeWindow->bShowOnStart[1]); const wxString MenuText[] = { wxTRANSLATE("&Registers"), @@ -291,7 +285,6 @@ void CFrame::CreateMenu() { viewMenu->Check(IDM_LOGWINDOW, SConfig::GetInstance().m_InterfaceLogWindow); viewMenu->Check(IDM_LOGCONFIGWINDOW, SConfig::GetInstance().m_InterfaceLogConfigWindow); - viewMenu->Check(IDM_CONSOLEWINDOW, SConfig::GetInstance().m_InterfaceConsole); } wxMenu *platformMenu = new wxMenu; diff --git a/Source/Core/DolphinWX/Globals.h b/Source/Core/DolphinWX/Globals.h index 713f8ff0ab..d133d37301 100644 --- a/Source/Core/DolphinWX/Globals.h +++ b/Source/Core/DolphinWX/Globals.h @@ -130,7 +130,6 @@ enum // Views IDM_LOGWINDOW, IDM_LOGCONFIGWINDOW, - IDM_CONSOLEWINDOW, IDM_REGISTERWINDOW, IDM_BREAKPOINTWINDOW, IDM_MEMORYWINDOW, @@ -142,7 +141,6 @@ enum // Float Window IDs IDM_LOGWINDOW_PARENT, IDM_LOGCONFIGWINDOW_PARENT, - IDM_CONSOLEWINDOW_PARENT, IDM_REGISTERWINDOW_PARENT, IDM_BREAKPOINTWINDOW_PARENT, IDM_MEMORYWINDOW_PARENT, @@ -154,7 +152,6 @@ enum // Float popup menu IDs IDM_FLOAT_LOGWINDOW, IDM_FLOAT_LOGCONFIGWINDOW, - IDM_FLOAT_CONSOLEWINDOW, IDM_FLOAT_REGISTERWINDOW, IDM_FLOAT_BREAKPOINTWINDOW, IDM_FLOAT_MEMORYWINDOW, diff --git a/Source/Core/DolphinWX/LogWindow.cpp b/Source/Core/DolphinWX/LogWindow.cpp index ba383e2cdd..7640f39ad0 100644 --- a/Source/Core/DolphinWX/LogWindow.cpp +++ b/Source/Core/DolphinWX/LogWindow.cpp @@ -85,7 +85,6 @@ void CLogWindow::CreateGUIControls() // Get the logger output settings from the config ini file. ini.Get("Options", "WriteToFile", &m_writeFile, false); - ini.Get("Options", "WriteToConsole", &m_writeConsole, true); ini.Get("Options", "WriteToWindow", &m_writeWindow, true); #ifdef _MSC_VER if (IsDebuggerPresent()) @@ -113,11 +112,6 @@ void CLogWindow::CreateGUIControls() else m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, m_LogManager->GetFileListener()); - if (m_writeConsole && enable) - m_LogManager->AddListener((LogTypes::LOG_TYPE)i, m_LogManager->GetConsoleListener()); - else - m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, m_LogManager->GetConsoleListener()); - if (m_writeDebugger && enable) m_LogManager->AddListener((LogTypes::LOG_TYPE)i, m_LogManager->GetDebuggerListener()); else diff --git a/Source/Core/DolphinWX/LogWindow.h b/Source/Core/DolphinWX/LogWindow.h index c49c9516fe..8260668c48 100644 --- a/Source/Core/DolphinWX/LogWindow.h +++ b/Source/Core/DolphinWX/LogWindow.h @@ -65,7 +65,7 @@ private: bool m_ignoreLogTimer; LogManager *m_LogManager; std::queue > msgQueue; - bool m_writeFile, m_writeConsole, m_writeWindow, m_writeDebugger, m_LogAccess; + bool m_writeFile, m_writeWindow, m_writeDebugger, m_LogAccess; // Controls wxBoxSizer *sBottom;