diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj
index 44b5fd08a5..fa39cb8e9f 100644
--- a/Source/Core/DolphinWX/DolphinWX.vcproj
+++ b/Source/Core/DolphinWX/DolphinWX.vcproj
@@ -1145,14 +1145,6 @@
RelativePath=".\src\Globals.h"
>
-
-
-
-
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index 683c58baef..b233dd306f 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -231,7 +231,6 @@ EVT_MENU(IDM_NETPLAY, CFrame::OnNetPlay)
EVT_MENU(IDM_BROWSE, CFrame::OnBrowse)
EVT_MENU(IDM_MEMCARD, CFrame::OnMemcard)
EVT_MENU(IDM_CHEATS, CFrame::OnShow_CheatsWindow)
-EVT_MENU(IDM_INFO, CFrame::OnShow_InfoWindow)
EVT_MENU(IDM_CHANGEDISC, CFrame::OnChangeDisc)
EVT_MENU(IDM_LOAD_WII_MENU, CFrame::OnLoadWiiMenu)
EVT_MENU(IDM_TOGGLE_FULLSCREEN, CFrame::OnToggleFullscreen)
diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h
index e63189c227..aeb0b330d4 100644
--- a/Source/Core/DolphinWX/Src/Frame.h
+++ b/Source/Core/DolphinWX/Src/Frame.h
@@ -310,7 +310,6 @@ class CFrame : public wxFrame
void OnNetPlay(wxCommandEvent& event);
void OnShow_CheatsWindow(wxCommandEvent& event);
- void OnShow_InfoWindow(wxCommandEvent& event);
void OnLoadWiiMenu(wxCommandEvent& event);
void GameListChanged(wxCommandEvent& event);
diff --git a/Source/Core/DolphinWX/Src/FrameAui.cpp b/Source/Core/DolphinWX/Src/FrameAui.cpp
index 466e62ac7b..9ecd24471f 100644
--- a/Source/Core/DolphinWX/Src/FrameAui.cpp
+++ b/Source/Core/DolphinWX/Src/FrameAui.cpp
@@ -38,7 +38,6 @@
#include "PluginManager.h"
#include "MemcardManager.h"
#include "CheatsWindow.h"
-#include "InfoWindow.h"
#include "AboutDolphin.h"
#include "GameListCtrl.h"
#include "BootManager.h"
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index 970888c825..83bc5a7746 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -50,7 +50,6 @@ Core::GetWindowHandle().
#include "PluginManager.h"
#include "MemcardManager.h"
#include "CheatsWindow.h"
-#include "InfoWindow.h"
#include "LuaWindow.h"
#include "AboutDolphin.h"
#include "GameListCtrl.h"
@@ -93,7 +92,6 @@ extern "C" {
// Other Windows
wxCheatsWindow* CheatsWindow;
-wxInfoWindow* InfoWindow;
// Create menu items
@@ -187,7 +185,6 @@ void CFrame::CreateMenu()
toolsMenu->Append(IDM_LUA, _T("New &Lua Console"));
toolsMenu->Append(IDM_MEMCARD, _T("&Memcard Manager"));
toolsMenu->Append(IDM_CHEATS, _T("Action &Replay Manager"));
- toolsMenu->Append(IDM_INFO, _T("System Information"));
#if defined(HAVE_SFML) && HAVE_SFML
toolsMenu->Append(IDM_NETPLAY, _T("Start &NetPlay"));
@@ -778,12 +775,6 @@ void CFrame::OnShow_CheatsWindow(wxCommandEvent& WXUNUSED (event))
CheatsWindow = new wxCheatsWindow(this, wxDefaultPosition, wxSize(600, 390));
}
-void CFrame::OnShow_InfoWindow(wxCommandEvent& WXUNUSED (event))
-{
- InfoWindow = new wxInfoWindow(this, wxDefaultPosition, wxSize(600, 390));
-}
-
-
void CFrame::OnLoadWiiMenu(wxCommandEvent& WXUNUSED (event))
{
BootManager::BootCore(FULL_WII_MENU_DIR);
diff --git a/Source/Core/DolphinWX/Src/Globals.h b/Source/Core/DolphinWX/Src/Globals.h
index 8d03f35531..50e24ce31a 100644
--- a/Source/Core/DolphinWX/Src/Globals.h
+++ b/Source/Core/DolphinWX/Src/Globals.h
@@ -90,7 +90,6 @@ enum
IDM_MEMCARD, // Misc menu
IDM_CHEATS,
IDM_NETPLAY,
- IDM_INFO,
IDM_RESTART,
IDM_CHANGEDISC,
IDM_PROPERTIES,
diff --git a/Source/Core/DolphinWX/Src/InfoWindow.cpp b/Source/Core/DolphinWX/Src/InfoWindow.cpp
deleted file mode 100644
index 7b2d4e56f0..0000000000
--- a/Source/Core/DolphinWX/Src/InfoWindow.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "svnrev.h"
-#include "Globals.h"
-#include "InfoWindow.h"
-#include "CPUDetect.h"
-#include "Core.h"
-#include "ConfigManager.h"
-#include "CDUtils.h"
-#include "Summarize.h"//This holds all the summarize functions
-
-BEGIN_EVENT_TABLE(wxInfoWindow, wxWindow)
- EVT_SIZE( wxInfoWindow::OnEvent_Window_Resize)
- EVT_CLOSE( wxInfoWindow::OnEvent_Window_Close)
- EVT_BUTTON(ID_BUTTON_CLOSE, wxInfoWindow::OnEvent_ButtonClose_Press)
-END_EVENT_TABLE()
-
-wxInfoWindow::wxInfoWindow(wxFrame* parent, const wxPoint& pos, const wxSize& size) :
- wxFrame(parent, wxID_ANY, _T("System Information"), pos, size, wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
-{
- // Create the GUI controls
- Init_ChildControls();
-
- // Setup Window
- SetBackgroundColour(wxColour(COLOR_GRAY));
- SetSize(size);
- SetPosition(pos);
- Layout();
- Show();
-}
-
-wxInfoWindow::~wxInfoWindow()
-{
- // On Disposal
-}
-
-void wxInfoWindow::Init_ChildControls()
-{
- std::string Info;
- Info = StringFromFormat("Dolphin Revision: %s", SVN_REV_STR);
-
-
-
- Info.append(StringFromFormat(
- "\n\n%s\n%s\n%s\n\n%s\n\n",
- Summarize_Drives().c_str(),
- Summarize_CPU().c_str(),
- Summarize_Plug().c_str(),
- Summarize_Settings().c_str()
- ));
-
- // Main Notebook
- m_Notebook_Main = new wxNotebook(this, ID_NOTEBOOK_MAIN, wxDefaultPosition, wxDefaultSize);
- // --- Tabs ---
-
- // $ Log Tab
- m_Tab_Log = new wxPanel(m_Notebook_Main, ID_TAB_LOG, wxDefaultPosition, wxDefaultSize);
- m_TextCtrl_Log = new wxTextCtrl(m_Tab_Log, ID_TEXTCTRL_LOG, wxString::FromAscii(Info.c_str()), wxDefaultPosition, wxSize(100, 600),
- wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP);
- wxBoxSizer *HStrip1 = new wxBoxSizer(wxHORIZONTAL);
- wxBoxSizer *sTabLog = new wxBoxSizer(wxVERTICAL);
- sTabLog->Add(HStrip1, 0, wxALL, 5);
- sTabLog->Add(m_TextCtrl_Log, 1, wxALL|wxEXPAND, 5);
-
- m_Tab_Log->SetSizer(sTabLog);
- m_Tab_Log->Layout();
-
- // Add Tabs to Notebook
- m_Notebook_Main->AddPage(m_Tab_Log, _T("System Information"));
-
- // Button Strip
- m_Button_Close = new wxButton(this, ID_BUTTON_CLOSE, _T("Close"), wxDefaultPosition, wxDefaultSize);
- wxBoxSizer* sButtons = new wxBoxSizer(wxHORIZONTAL);
- sButtons->Add(m_Button_Close, 0, wxALL, 5);
-
- wxBoxSizer* sMain = new wxBoxSizer(wxVERTICAL);
- sMain->Add(m_Notebook_Main, 1, wxEXPAND|wxALL, 5);
- sMain->Add(sButtons, 0, wxALL, 5);
- SetSizer(sMain);
- Layout();
-
- Fit();
-}
-
-
-
-void wxInfoWindow::OnEvent_Window_Resize(wxSizeEvent& WXUNUSED (event))
-{
- Layout();
-}
-void wxInfoWindow::OnEvent_ButtonClose_Press(wxCommandEvent& WXUNUSED (event))
-{
- Destroy();
-}
-void wxInfoWindow::OnEvent_Window_Close(wxCloseEvent& WXUNUSED (event))
-{
- Destroy();
-}
-
diff --git a/Source/Core/DolphinWX/Src/InfoWindow.h b/Source/Core/DolphinWX/Src/InfoWindow.h
deleted file mode 100644
index 76ef396794..0000000000
--- a/Source/Core/DolphinWX/Src/InfoWindow.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef __INFOWINDOW_H__
-#define __INFOWINDOW_H__
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "Filesystem.h"
-#include "IniFile.h"
-
-class wxInfoWindow : public wxFrame
-{
- public:
-
- wxInfoWindow(wxFrame* parent, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize);
-
- virtual ~wxInfoWindow();
-
- protected:
-
-
- // Event Table
- DECLARE_EVENT_TABLE();
-
- // --- GUI Controls ---
-
- wxNotebook *m_Notebook_Main;
-
- wxPanel *m_Tab_Log;
-
- wxButton *m_Button_Close;
-
- wxTextCtrl *m_TextCtrl_Log;
-
- // GUI IDs
- enum
- {
- ID_NOTEBOOK_MAIN,
- ID_TAB_LOG,
- ID_BUTTON_CLOSE,
- ID_TEXTCTRL_LOG
- };
-
- void Init_ChildControls();
-
-
- // --- Wx Events Handlers ---
- // $ Window
- void OnEvent_Window_Resize(wxSizeEvent& event);
- void OnEvent_Window_Close(wxCloseEvent& event);
-
- // $ Close Button
- void OnEvent_ButtonClose_Press(wxCommandEvent& event);
-
-
-};
-
-#endif
-
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index 60bdf0a8ae..f18971f18e 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -34,7 +34,6 @@ if wxenv['HAVE_WX']:
'MemoryCards/GCMemcard.cpp',
'PatchAddEdit.cpp',
'CheatsWindow.cpp',
- 'InfoWindow.cpp',
'stdafx.cpp',
'WxUtils.cpp',
]
diff --git a/Source/Core/DolphinWX/Src/Summarize.h b/Source/Core/DolphinWX/Src/Summarize.h
deleted file mode 100644
index 71fc925fd4..0000000000
--- a/Source/Core/DolphinWX/Src/Summarize.h
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef __SUMMARIZE_H__
-#define __SUMMARIZE_H__
-
-std::string Summarize_Plug()
-{
- return StringFromFormat(
- "Plugin Information\n\n"
- "Default GFX Plugin: %s\n"
- "Default DSP Plugin: %s\n"
- "Default PAD Plugin: %s\n"
- "Default WiiMote Plugin: %s\n\n"
- "Current GFX Plugin: %s\n"
- "Current DSP Plugin: %s\n"
- "Current PAD Plugin[0]: %s\n"
- "Current PAD Plugin[1]: %s\n"
- "Current PAD Plugin[2]: %s\n"
- "Current PAD Plugin[3]: %s\n"
- "Current WiiMote Plugin[0]: %s\n",
- SConfig::GetInstance().m_DefaultGFXPlugin.c_str(),
- SConfig::GetInstance().m_DefaultDSPPlugin.c_str(),
- SConfig::GetInstance().m_DefaultPADPlugin.c_str(),
- SConfig::GetInstance().m_DefaultWiiMotePlugin.c_str(),
- Core::GetStartupParameter().m_strVideoPlugin.c_str(),
- Core::GetStartupParameter().m_strDSPPlugin.c_str(),
- Core::GetStartupParameter().m_strPadPlugin[0].c_str(),
- Core::GetStartupParameter().m_strPadPlugin[1].c_str(),
- Core::GetStartupParameter().m_strPadPlugin[2].c_str(),
- Core::GetStartupParameter().m_strPadPlugin[3].c_str(),
- Core::GetStartupParameter().m_strWiimotePlugin[0].c_str()
- );
-}
-
-std::string Summarize_Settings()
-{
- return StringFromFormat(
- "Dolphin Settings\n\n"
- "HLE the IPL: %s\n"
- "Use Dynarec: %s\n"
- "Use Dual Core: %s\n"
- "DSP Thread: %s\n"
- "Skip Idle: %s\n"
- "Lock Threads: %s\n"
- "Use Dual Core: %s\n"
- "Default GCM: %s\n"
- "DVD Root: %s\n"
- "Optimize Quantizers: %s\n"
- "Enable Cheats: %s\n"
- "Selected Language: %d\n"
- "Memcard A: %s\n"
- "Memcard B: %s\n"
- "Slot A: %d\n"
- "Slot B: %d\n"
- "Serial Port 1: %d\n"
- "Run Compare Server: %s\n"
- "Run Compare Client: %s\n"
- "TLB Hack: %s\n"
- "Frame Limit: %d\n"
- "[Wii]Widescreen: %s\n"
- "[Wii]Progressive Scan: %s\n",
- Core::GetStartupParameter().bHLE_BS2?"True":"False",
- Core::GetStartupParameter().bUseJIT?"True":"False",
- Core::GetStartupParameter().bCPUThread?"True":"False",
- Core::GetStartupParameter().bDSPThread?"True":"False",
- Core::GetStartupParameter().bSkipIdle?"True":"False",
- Core::GetStartupParameter().bLockThreads?"True":"False",
- Core::GetStartupParameter().bCPUThread?"True":"False",
- Core::GetStartupParameter().m_strDefaultGCM.c_str(),
- Core::GetStartupParameter().m_strDVDRoot.c_str(),
- Core::GetStartupParameter().bOptimizeQuantizers?"True":"False",
- Core::GetStartupParameter().bEnableCheats?"True":"False",
- Core::GetStartupParameter().SelectedLanguage, //FIXME show language based on index
- SConfig::GetInstance().m_strMemoryCardA.c_str(),
- SConfig::GetInstance().m_strMemoryCardB.c_str(),
- SConfig::GetInstance().m_EXIDevice[0], //FIXME
- SConfig::GetInstance().m_EXIDevice[1], //FIXME
- SConfig::GetInstance().m_EXIDevice[2], //FIXME
- Core::GetStartupParameter().bRunCompareServer?"True":"False",
- Core::GetStartupParameter().bRunCompareClient?"True":"False",
- Core::GetStartupParameter().iTLBHack?"True":"False",
- SConfig::GetInstance().m_Framelimit*5,
- SConfig::GetInstance().m_SYSCONF->GetData("IPL.AR")?"True":"False",
- SConfig::GetInstance().m_SYSCONF->GetData("IPL.PGS")?"True":"False"
- );
-}
-
-std::string Summarize_CPU()
-{
- return StringFromFormat(
- "Processor Information: \n%s\n",
- cpu_info.Summarize().c_str()
- );
-}
-
-std::string Summarize_Drives()
-{
- char ** drives = cdio_get_devices();
- std::string drive;
- for (int i = 0; drives[i] != NULL && i < 24; i++)
- {
-
- drive += StringFromFormat(
- "CD/DVD Drive%d: %s\n",
- i+1,
- drives[i]
- );
- }
- return drive;
-}
-
-#endif //__SUMMARIZE_H__
\ No newline at end of file