ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Purge wx elements of the console.

This commit is contained in:
Lioncash 2014-02-23 02:38:46 -05:00
parent d45351a43f
commit 8d57f38be7
11 changed files with 10 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/CMakeLists.txt
View File

@ -2,7 +2,6 @@ set(SRCS ActionReplay.cpp
ARDecrypt.cpp ARDecrypt.cpp
BootManager.cpp BootManager.cpp
ConfigManager.cpp ConfigManager.cpp
Console.cpp
Core.cpp Core.cpp
CoreParameter.cpp CoreParameter.cpp
CoreTiming.cpp CoreTiming.cpp

2
Source/Core/Core/ConfigManager.cpp
View File

@ -184,7 +184,6 @@ void SConfig::SaveSettings()
ini.Set("Interface", "ShowStatusbar", m_InterfaceStatusbar); ini.Set("Interface", "ShowStatusbar", m_InterfaceStatusbar);
ini.Set("Interface", "ShowLogWindow", m_InterfaceLogWindow); ini.Set("Interface", "ShowLogWindow", m_InterfaceLogWindow);
ini.Set("Interface", "ShowLogConfigWindow", m_InterfaceLogConfigWindow); ini.Set("Interface", "ShowLogConfigWindow", m_InterfaceLogConfigWindow);
ini.Set("Interface", "ShowConsole", m_InterfaceConsole);
ini.Set("Interface", "ThemeName40", m_LocalCoreStartupParameter.theme_name); ini.Set("Interface", "ThemeName40", m_LocalCoreStartupParameter.theme_name);
// Hotkeys // Hotkeys
@ -332,7 +331,6 @@ void SConfig::LoadSettings()
ini.Get("Interface", "ShowStatusbar", &m_InterfaceStatusbar, true); ini.Get("Interface", "ShowStatusbar", &m_InterfaceStatusbar, true);
ini.Get("Interface", "ShowLogWindow", &m_InterfaceLogWindow, false); ini.Get("Interface", "ShowLogWindow", &m_InterfaceLogWindow, false);
ini.Get("Interface", "ShowLogConfigWindow", &m_InterfaceLogConfigWindow, false); ini.Get("Interface", "ShowLogConfigWindow", &m_InterfaceLogConfigWindow, false);
ini.Get("Interface", "ShowConsole", &m_InterfaceConsole, false);
ini.Get("Interface", "ThemeName40", &m_LocalCoreStartupParameter.theme_name, "Clean"); ini.Get("Interface", "ThemeName40", &m_LocalCoreStartupParameter.theme_name, "Clean");
// Hotkeys // Hotkeys

1
Source/Core/Core/ConfigManager.h
View File

@ -55,7 +55,6 @@ struct SConfig : NonCopyable
bool m_InterfaceStatusbar; bool m_InterfaceStatusbar;
bool m_InterfaceLogWindow; bool m_InterfaceLogWindow;
bool m_InterfaceLogConfigWindow; bool m_InterfaceLogConfigWindow;
bool m_InterfaceConsole;
bool m_ListDrives; bool m_ListDrives;
bool m_ListWad; bool m_ListWad;

2
Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp
View File

@ -418,8 +418,6 @@ void CCodeWindow::OpenPages()
Parent->ToggleLogWindow(true); Parent->ToggleLogWindow(true);
if (bShowOnStart[IDM_LOGCONFIGWINDOW - IDM_LOGWINDOW]) if (bShowOnStart[IDM_LOGCONFIGWINDOW - IDM_LOGWINDOW])
Parent->ToggleLogConfigWindow(true); Parent->ToggleLogConfigWindow(true);
if (bShowOnStart[IDM_CONSOLEWINDOW - IDM_LOGWINDOW])
Parent->ToggleConsole(true);
if (bShowOnStart[IDM_REGISTERWINDOW - IDM_LOGWINDOW]) if (bShowOnStart[IDM_REGISTERWINDOW - IDM_LOGWINDOW])
ToggleRegisterWindow(true); ToggleRegisterWindow(true);
if (bShowOnStart[IDM_BREAKPOINTWINDOW - IDM_LOGWINDOW]) if (bShowOnStart[IDM_BREAKPOINTWINDOW - IDM_LOGWINDOW])

14
Source/Core/DolphinWX/Frame.cpp
View File

@ -310,14 +310,13 @@ CFrame::CFrame(wxFrame* parent,
for (int i = 0; i <= IDM_CODEWINDOW - IDM_LOGWINDOW; i++) for (int i = 0; i <= IDM_CODEWINDOW - IDM_LOGWINDOW; i++)
bFloatWindow[i] = false; bFloatWindow[i] = false;
if (ShowLogWindow) SConfig::GetInstance().m_InterfaceLogWindow = true; 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();
// Start debugging maximized // Start debugging maximized
if (UseDebugger) this->Maximize(true); if (UseDebugger)
this->Maximize(true);
// Debugger class // Debugger class
if (UseDebugger) if (UseDebugger)
{ {
@ -392,8 +391,6 @@ CFrame::CFrame(wxFrame* parent,
ToggleLogWindow(true); ToggleLogWindow(true);
if (SConfig::GetInstance().m_InterfaceLogConfigWindow) if (SConfig::GetInstance().m_InterfaceLogConfigWindow)
ToggleLogConfigWindow(true); ToggleLogConfigWindow(true);
if (SConfig::GetInstance().m_InterfaceConsole)
ToggleConsole(true);
} }
// Show window // Show window
@ -681,7 +678,6 @@ void CFrame::OnRenderWindowSizeRequest(int width, int height)
// Add space for the log/console/debugger window // Add space for the log/console/debugger window
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain && if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain &&
(SConfig::GetInstance().m_InterfaceLogWindow || (SConfig::GetInstance().m_InterfaceLogWindow ||
SConfig::GetInstance().m_InterfaceConsole ||
SConfig::GetInstance().m_InterfaceLogConfigWindow) && SConfig::GetInstance().m_InterfaceLogConfigWindow) &&
!m_Mgr->GetPane(wxT("Pane 1")).IsFloating()) !m_Mgr->GetPane(wxT("Pane 1")).IsFloating())
{ {

2
Source/Core/DolphinWX/Frame.h
View File

@ -127,7 +127,6 @@ public:
void UpdateGameList(); void UpdateGameList();
void ToggleLogWindow(bool bShow); void ToggleLogWindow(bool bShow);
void ToggleLogConfigWindow(bool bShow); void ToggleLogConfigWindow(bool bShow);
void ToggleConsole(bool bShow);
void PostEvent(wxCommandEvent& event); void PostEvent(wxCommandEvent& event);
void StatusBarMessage(const char * Text, ...); void StatusBarMessage(const char * Text, ...);
void ClearStatusBar(); void ClearStatusBar();
@ -238,7 +237,6 @@ private:
void ResetToolbarStyle(); void ResetToolbarStyle();
void TogglePaneStyle(bool On, int EventId); void TogglePaneStyle(bool On, int EventId);
void ToggleNotebookStyle(bool On, long Style); void ToggleNotebookStyle(bool On, long Style);
void ResizeConsole();
// Float window // Float window
void DoUnfloatPage(int Id); void DoUnfloatPage(int Id);
void OnFloatingPageClosed(wxCloseEvent& event); void OnFloatingPageClosed(wxCloseEvent& event);

107
Source/Core/DolphinWX/FrameAui.cpp
View File

@ -57,7 +57,6 @@ void CFrame::OnManagerResize(wxAuiManagerEvent& event)
m_LogWindow->winpos = m_Mgr->GetPane(_T("Pane 1")).dock_direction; m_LogWindow->winpos = m_Mgr->GetPane(_T("Pane 1")).dock_direction;
} }
event.Skip(); event.Skip();
ResizeConsole();
} }
void CFrame::OnPaneClose(wxAuiManagerEvent& event) void CFrame::OnPaneClose(wxAuiManagerEvent& event)
@ -70,14 +69,11 @@ void CFrame::OnPaneClose(wxAuiManagerEvent& event)
if (!g_pCodeWindow) if (!g_pCodeWindow)
{ {
if (nb->GetPage(0)->GetId() == IDM_LOGWINDOW || if (nb->GetPage(0)->GetId() == IDM_LOGWINDOW ||
nb->GetPage(0)->GetId() == IDM_LOGCONFIGWINDOW || nb->GetPage(0)->GetId() == IDM_LOGCONFIGWINDOW)
nb->GetPage(0)->GetId() == IDM_CONSOLEWINDOW)
{ {
// Closing a pane containing the logwindow or a console closes both
SConfig::GetInstance().m_InterfaceConsole = false;
SConfig::GetInstance().m_InterfaceLogWindow = false; SConfig::GetInstance().m_InterfaceLogWindow = false;
SConfig::GetInstance().m_InterfaceLogConfigWindow = false; SConfig::GetInstance().m_InterfaceLogConfigWindow = false;
ToggleConsole(false);
ToggleLogWindow(false); ToggleLogWindow(false);
ToggleLogConfigWindow(false); ToggleLogConfigWindow(false);
} }
@ -163,59 +159,6 @@ void CFrame::ToggleLogConfigWindow(bool bShow)
TogglePane(); 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) void CFrame::OnToggleWindow(wxCommandEvent& event)
{ {
bool bShow = GetMenuBar()->IsChecked(event.GetId()); bool bShow = GetMenuBar()->IsChecked(event.GetId());
@ -232,11 +175,6 @@ void CFrame::OnToggleWindow(wxCommandEvent& event)
SConfig::GetInstance().m_InterfaceLogConfigWindow = bShow; SConfig::GetInstance().m_InterfaceLogConfigWindow = bShow;
ToggleLogConfigWindow(bShow); ToggleLogConfigWindow(bShow);
break; break;
case IDM_CONSOLEWINDOW:
if (!g_pCodeWindow)
SConfig::GetInstance().m_InterfaceConsole = bShow;
ToggleConsole(bShow);
break;
case IDM_REGISTERWINDOW: case IDM_REGISTERWINDOW:
g_pCodeWindow->ToggleRegisterWindow(bShow); g_pCodeWindow->ToggleRegisterWindow(bShow);
break; break;
@ -264,7 +202,7 @@ void CFrame::ClosePages()
{ {
ToggleLogWindow(false); ToggleLogWindow(false);
ToggleLogConfigWindow(false); ToggleLogConfigWindow(false);
ToggleConsole(false);
if (g_pCodeWindow) if (g_pCodeWindow)
{ {
g_pCodeWindow->ToggleCodeWindow(false); g_pCodeWindow->ToggleCodeWindow(false);
@ -306,8 +244,6 @@ void CFrame::OnNotebookPageClose(wxAuiNotebookEvent& event)
ToggleLogWindow(false); ToggleLogWindow(false);
if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_LOGCONFIGWINDOW) if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_LOGCONFIGWINDOW)
ToggleLogConfigWindow(false); ToggleLogConfigWindow(false);
if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_CONSOLEWINDOW)
ToggleConsole(false);
if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_REGISTERWINDOW) if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_REGISTERWINDOW)
g_pCodeWindow->ToggleRegisterWindow(false); g_pCodeWindow->ToggleRegisterWindow(false);
if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_BREAKPOINTWINDOW) if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_BREAKPOINTWINDOW)
@ -330,7 +266,6 @@ void CFrame::OnFloatingPageClosed(wxCloseEvent& event)
void CFrame::OnFloatingPageSize(wxSizeEvent& event) void CFrame::OnFloatingPageSize(wxSizeEvent& event)
{ {
event.Skip(); event.Skip();
ResizeConsole();
} }
void CFrame::OnFloatWindow(wxCommandEvent& event) void CFrame::OnFloatWindow(wxCommandEvent& event)
@ -393,8 +328,7 @@ void CFrame::OnTab(wxAuiNotebookEvent& event)
// Create the popup menu // Create the popup menu
wxMenu* MenuPopup = new wxMenu; wxMenu* MenuPopup = new wxMenu;
wxMenuItem* Item = new wxMenuItem(MenuPopup, wxID_ANY, wxMenuItem* Item = new wxMenuItem(MenuPopup, wxID_ANY, _("Select floating windows"));
_("Select floating windows"));
MenuPopup->Append(Item); MenuPopup->Append(Item);
Item->Enable(false); Item->Enable(false);
MenuPopup->Append(new wxMenuItem(MenuPopup)); MenuPopup->Append(new wxMenuItem(MenuPopup));
@ -423,7 +357,6 @@ void CFrame::OnAllowNotebookDnD(wxAuiNotebookEvent& event)
{ {
event.Skip(); event.Skip();
event.Allow(); event.Allow();
ResizeConsole();
} }
void CFrame::ShowResizePane() void CFrame::ShowResizePane()
@ -803,33 +736,6 @@ void CFrame::OnSelectPerspective(wxCommandEvent& event)
DoLoadPerspective(); 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) static int Limit(int i, int Low, int High)
{ {
if (i < Low) return Low; 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); Frame->Bind(wxEVT_CLOSE_WINDOW, &CFrame::OnFloatingPageClosed, this);
if (Id == IDM_CONSOLEWINDOW_PARENT)
{
Frame->Bind(wxEVT_SIZE, &CFrame::OnFloatingPageSize, this);
}
// Main sizer // Main sizer
Frame->SetSizer(m_MainSizer); Frame->SetSizer(m_MainSizer);
// Minimum frame size // Minimum frame size

7
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -258,17 +258,11 @@ void CFrame::CreateMenu()
viewMenu->AppendSeparator(); viewMenu->AppendSeparator();
viewMenu->AppendCheckItem(IDM_LOGWINDOW, _("Show &Log")); viewMenu->AppendCheckItem(IDM_LOGWINDOW, _("Show &Log"));
viewMenu->AppendCheckItem(IDM_LOGCONFIGWINDOW, _("Show Log &Configuration")); viewMenu->AppendCheckItem(IDM_LOGCONFIGWINDOW, _("Show Log &Configuration"));
viewMenu->AppendCheckItem(IDM_CONSOLEWINDOW, _("Show &Console"));
viewMenu->AppendSeparator(); viewMenu->AppendSeparator();
#ifndef _WIN32
viewMenu->Enable(IDM_CONSOLEWINDOW, false);
#endif
if (g_pCodeWindow) if (g_pCodeWindow)
{ {
viewMenu->Check(IDM_LOGWINDOW, g_pCodeWindow->bShowOnStart[0]); viewMenu->Check(IDM_LOGWINDOW, g_pCodeWindow->bShowOnStart[0]);
viewMenu->Check(IDM_CONSOLEWINDOW, g_pCodeWindow->bShowOnStart[1]);
const wxString MenuText[] = { const wxString MenuText[] = {
wxTRANSLATE("&Registers"), wxTRANSLATE("&Registers"),
@ -291,7 +285,6 @@ void CFrame::CreateMenu()
{ {
viewMenu->Check(IDM_LOGWINDOW, SConfig::GetInstance().m_InterfaceLogWindow); viewMenu->Check(IDM_LOGWINDOW, SConfig::GetInstance().m_InterfaceLogWindow);
viewMenu->Check(IDM_LOGCONFIGWINDOW, SConfig::GetInstance().m_InterfaceLogConfigWindow); viewMenu->Check(IDM_LOGCONFIGWINDOW, SConfig::GetInstance().m_InterfaceLogConfigWindow);
viewMenu->Check(IDM_CONSOLEWINDOW, SConfig::GetInstance().m_InterfaceConsole);
} }
wxMenu *platformMenu = new wxMenu; wxMenu *platformMenu = new wxMenu;

3
Source/Core/DolphinWX/Globals.h
View File

@ -130,7 +130,6 @@ enum
// Views // Views
IDM_LOGWINDOW, IDM_LOGWINDOW,
IDM_LOGCONFIGWINDOW, IDM_LOGCONFIGWINDOW,
IDM_CONSOLEWINDOW,
IDM_REGISTERWINDOW, IDM_REGISTERWINDOW,
IDM_BREAKPOINTWINDOW, IDM_BREAKPOINTWINDOW,
IDM_MEMORYWINDOW, IDM_MEMORYWINDOW,
@ -142,7 +141,6 @@ enum
// Float Window IDs // Float Window IDs
IDM_LOGWINDOW_PARENT, IDM_LOGWINDOW_PARENT,
IDM_LOGCONFIGWINDOW_PARENT, IDM_LOGCONFIGWINDOW_PARENT,
IDM_CONSOLEWINDOW_PARENT,
IDM_REGISTERWINDOW_PARENT, IDM_REGISTERWINDOW_PARENT,
IDM_BREAKPOINTWINDOW_PARENT, IDM_BREAKPOINTWINDOW_PARENT,
IDM_MEMORYWINDOW_PARENT, IDM_MEMORYWINDOW_PARENT,
@ -154,7 +152,6 @@ enum
// Float popup menu IDs // Float popup menu IDs
IDM_FLOAT_LOGWINDOW, IDM_FLOAT_LOGWINDOW,
IDM_FLOAT_LOGCONFIGWINDOW, IDM_FLOAT_LOGCONFIGWINDOW,
IDM_FLOAT_CONSOLEWINDOW,
IDM_FLOAT_REGISTERWINDOW, IDM_FLOAT_REGISTERWINDOW,
IDM_FLOAT_BREAKPOINTWINDOW, IDM_FLOAT_BREAKPOINTWINDOW,
IDM_FLOAT_MEMORYWINDOW, IDM_FLOAT_MEMORYWINDOW,

6
Source/Core/DolphinWX/LogWindow.cpp
View File

@ -85,7 +85,6 @@ void CLogWindow::CreateGUIControls()
// Get the logger output settings from the config ini file. // Get the logger output settings from the config ini file.
ini.Get("Options", "WriteToFile", &m_writeFile, false); ini.Get("Options", "WriteToFile", &m_writeFile, false);
ini.Get("Options", "WriteToConsole", &m_writeConsole, true);
ini.Get("Options", "WriteToWindow", &m_writeWindow, true); ini.Get("Options", "WriteToWindow", &m_writeWindow, true);
#ifdef _MSC_VER #ifdef _MSC_VER
if (IsDebuggerPresent()) if (IsDebuggerPresent())
@ -113,11 +112,6 @@ void CLogWindow::CreateGUIControls()
else else
m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, m_LogManager->GetFileListener()); 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) if (m_writeDebugger && enable)
m_LogManager->AddListener((LogTypes::LOG_TYPE)i, m_LogManager->GetDebuggerListener()); m_LogManager->AddListener((LogTypes::LOG_TYPE)i, m_LogManager->GetDebuggerListener());
else else

2
Source/Core/DolphinWX/LogWindow.h
View File

@ -65,7 +65,7 @@ private:
bool m_ignoreLogTimer; bool m_ignoreLogTimer;
LogManager *m_LogManager; LogManager *m_LogManager;
std::queue<std::pair<u8, wxString> > msgQueue; std::queue<std::pair<u8, wxString> > msgQueue;
bool m_writeFile, m_writeConsole, m_writeWindow, m_writeDebugger, m_LogAccess; bool m_writeFile, m_writeWindow, m_writeDebugger, m_LogAccess;
// Controls // Controls
wxBoxSizer *sBottom; wxBoxSizer *sBottom;