InfoWindow is now actually functional (Yay!). We got rid of the Action Replay stuff and added the core settings. OGL and D3D stuff still to come.

But it has a bunch of 0s before the actual setting (a 1 or a 0, normally), so someone needs to fix that.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3075 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/DolphinWX/Src/InfoWindow.cpp

@@ -17,15 +17,11 @@
 
 #include "Globals.h"
 #include "InfoWindow.h"
-#include "ActionReplay.h"
 #include "CPUDetect.h"
 #include "Core.h"
 #include "ConfigManager.h"
 #include "CDUtils.h"
 
-using namespace ActionReplay;
-
-
 BEGIN_EVENT_TABLE(wxInfoWindow, wxWindow)
 	EVT_SIZE(                                            wxInfoWindow::OnEvent_Window_Resize)
 	EVT_CLOSE(                                           wxInfoWindow::OnEvent_Window_Close)
@@ -42,9 +38,6 @@ wxInfoWindow::wxInfoWindow(wxFrame* parent, const wxPoint& pos, const wxSize& si
 	SetBackgroundColour(wxColour(COLOR_GRAY));
 	SetSize(size);
 	SetPosition(pos);
-
-
-
 	Layout();
 	Show();
 }
@@ -54,6 +47,46 @@ wxInfoWindow::~wxInfoWindow()
 	// On Disposal
 }
 
+std::string Summarize_Plug()
+{
+	std::string sum;
+		sum = StringFromFormat("","");
+	sum += "Default GFX Plugin: " +  SConfig::GetInstance().m_DefaultGFXPlugin +"\n";
+	sum += "Default DSP Plugin: " + SConfig::GetInstance().m_DefaultDSPPlugin +"\n";
+	sum += "Default PAD Plugin: " + SConfig::GetInstance().m_DefaultPADPlugin +"\n";
+	sum += "Default WiiMote Plugin: " +  SConfig::GetInstance().m_DefaultWiiMotePlugin +"\n";
+	return sum;
+}
+
+std::string Summarize_Settings()
+{
+	std::string sum;
+	sum = StringFromFormat("","");
+	sum += "\nDolphin Settings\n\n";
+	sum += wxString::Format("Always HLE Bios: %08x\n",Core::GetStartupParameter().bHLEBios); 
+	sum += wxString::Format("Use Dynarec: %08x\n",Core::GetStartupParameter().bUseJIT); 
+	sum += wxString::Format("Use Dual Core: %08x\n",Core::GetStartupParameter().bUseDualCore); 
+	sum += wxString::Format("DSP Thread: %08x\n",Core::GetStartupParameter().bDSPThread); 
+	sum += wxString::Format("Skip Idle: %08x\n",Core::GetStartupParameter().bSkipIdle); 
+	sum += wxString::Format("Lock Threads: %08x\n",Core::GetStartupParameter().bLockThreads); 
+	sum += wxString::Format("Use Dual Core: %08x\n",Core::GetStartupParameter().bUseDualCore); 
+	sum += wxString::Format("Default GCM: %08x\n",Core::GetStartupParameter().m_strDefaultGCM); 
+	sum += wxString::Format("DVD Root: %08x\n",Core::GetStartupParameter().m_strDVDRoot); 
+	sum += wxString::Format("Optimize Quantizers: %08x\n",Core::GetStartupParameter().bOptimizeQuantizers); 
+	sum += wxString::Format("Enable Cheats: %08x\n",Core::GetStartupParameter().bEnableCheats); 
+	sum += wxString::Format("Selected Language: %08x\n",Core::GetStartupParameter().SelectedLanguage); 
+	sum += wxString::Format("Memcard A: %08x\n",SConfig::GetInstance().m_strMemoryCardA); 
+	sum += wxString::Format("Memcard B: %08x\n",SConfig::GetInstance().m_strMemoryCardB); 
+	sum += wxString::Format("Slot A: %08x\n",SConfig::GetInstance().m_EXIDevice[0]); 
+	sum += wxString::Format("Slot B: %08x\n",SConfig::GetInstance().m_EXIDevice[1]); 
+	sum += wxString::Format("Serial Port 1: %08x\n",SConfig::GetInstance().m_EXIDevice[2]); 
+	sum += wxString::Format("Widescreen: %08x\n",Core::GetStartupParameter().bWidescreen);
+	sum += wxString::Format("Progressive Scan: %08x\n",Core::GetStartupParameter().bProgressiveScan);
+
+	return sum;
+}
+
+
 void wxInfoWindow::Init_ChildControls()
 {
 
@@ -70,13 +103,11 @@ void wxInfoWindow::Init_ChildControls()
 											
 											std::string("Dolphin Revision: ") + SVN_REV_STR +"\n"+
 											std::string("CD/DVD Drive: ") + **cdio_get_devices() +"\n"+
+											
 											//Plugin Information
 											"Plugin Information\n\n"+
-											std::string("Default GFX plugin: ") + SConfig::GetInstance().m_DefaultGFXPlugin +"\n"+
+											Summarize_Plug() +"\n"+
-											std::string("Default DSP plugin: ") + SConfig::GetInstance().m_DefaultDSPPlugin +"\n"+
+											Summarize_Settings() +"\n"+
-											std::string("Default PAD plugin: ") + SConfig::GetInstance().m_DefaultPADPlugin +"\n"+
-											std::string("Default WiiMote plugin: ") + SConfig::GetInstance().m_DefaultWiiMotePlugin +"\n\n"+
-											
 											//CPU Info
 											std::string("Processor Information:\n")+cpu_info.Summarize()+"\n\n"
 
@@ -108,6 +139,9 @@ void wxInfoWindow::Init_ChildControls()
 
 	Fit();
 }
+
+
+
 void wxInfoWindow::OnEvent_Window_Resize(wxSizeEvent& WXUNUSED (event))
 {
 	Layout();

Source/Core/DolphinWX/Src/InfoWindow.h

@@ -31,8 +31,6 @@
 #include <wx/listbox.h>
 #include <string>
 
-#include "ActionReplay.h"
-
 #include "Filesystem.h"
 #include "IniFile.h"
 
@@ -46,16 +44,11 @@ class wxInfoWindow : public wxFrame
 
 	protected:
 
-		struct ARCodeIndex {
-			u32 uiIndex;
-			size_t index;
-		};
 
 		// Event Table
 		DECLARE_EVENT_TABLE();
 
 		// --- GUI Controls ---
-		wxGridBagSizer* m_Sizer_TabCheats;
 
 		wxNotebook *m_Notebook_Main;
 
@@ -65,26 +58,17 @@ class wxInfoWindow : public wxFrame
 
 		wxTextCtrl *m_TextCtrl_Log;
 
-		std::vector<ARCodeIndex> indexList;
-
 		// GUI IDs
 		enum
 		{
 			ID_NOTEBOOK_MAIN,
-			ID_TAB_CHEATS,
 			ID_TAB_LOG,
 			ID_BUTTON_CLOSE,
-			ID_LABEL_CODENAME,
-			ID_GROUPBOX_INFO,
-			ID_BUTTON_APPLYCODES,
-			ID_LABEL_NUMCODES,
-			ID_CHECKBOX_LOGAR,
 			ID_TEXTCTRL_LOG
 		};
 
 		void Init_ChildControls();
 
-		void Load_ARCodes();
 
 		// --- Wx Events Handlers ---
 		// $ Window