put the handy items on the first page of ConfigMain. Fix for plugins not loading on first boot. We should figure out how to get a pointer to the main app (see OGL main.cpp line 118)

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

Source/Core/Common/Src/StringUtil.cpp

@@ -355,9 +355,9 @@ void BuildCompleteFilename(std::string& _CompleteFilename, const std::string& _P
 	_CompleteFilename = _Path;
 
 	// check for seperator
-	if (_CompleteFilename[_CompleteFilename.size() - 1] != '\\')
+	if (_CompleteFilename[_CompleteFilename.size() - 1] != DIR_SEP_CHR)
 	{
-		_CompleteFilename += "\\";
+		_CompleteFilename += DIR_SEP_CHR;
 	}
 
 	// add the filename

Source/Core/DolphinWX/Src/Config.cpp

@@ -49,7 +49,7 @@ void SConfig::SaveSettings()
 	IniFile ini;
 	ini.Load(CONFIG_FILE); // yes we must load first to not kill unknown stuff
 
-	// misc
+	// General
 	{
 		ini.Set("General", "LastFilename",	m_LastFilename);
 
@@ -66,11 +66,13 @@ void SConfig::SaveSettings()
 
 	
 	{
-		// General		
+		// Interface		
 		ini.Set("Interface", "ConfirmStop", m_LocalCoreStartupParameter.bConfirmStop);
 		ini.Set("Interface", "HideCursor", m_LocalCoreStartupParameter.bHideCursor);
 		ini.Set("Interface", "AutoHideCursor", m_LocalCoreStartupParameter.bAutoHideCursor);
 		ini.Set("Interface", "Theme", m_LocalCoreStartupParameter.iTheme);
+		ini.Set("Interface", "ShowWiimoteLeds", m_LocalCoreStartupParameter.bWiiLeds);
+		ini.Set("Interface", "ShowWiimoteSpeakers", m_LocalCoreStartupParameter.bWiiSpeakers);
 
 		// Core
 		ini.Set("Core", "HLEBios",        m_LocalCoreStartupParameter.bHLEBios);
@@ -87,10 +89,6 @@ void SConfig::SaveSettings()
 		ini.Set("Core", "RunCompareServer", m_LocalCoreStartupParameter.bRunCompareServer);
 		ini.Set("Core", "RunCompareClient", m_LocalCoreStartupParameter.bRunCompareClient);
 
-		// Wii
-		ini.Set("Wii", "ShowWiimoteLeds", m_LocalCoreStartupParameter.bWiiLeds);
-		ini.Set("Wii", "ShowWiimoteSpeakers", m_LocalCoreStartupParameter.bWiiSpeakers);
-
 		// Plugins
 		ini.Set("Core", "GFXPlugin",  m_LocalCoreStartupParameter.m_strVideoPlugin);
 		ini.Set("Core", "DSPPlugin",  m_LocalCoreStartupParameter.m_strDSPPlugin);
@@ -141,7 +139,7 @@ void SConfig::LoadSettings()
 		m_DefaultWiiMotePlugin = PLUGINS_DIR DIR_SEP DEFAULT_WIIMOTE_PLUGIN;  
 	}
 #endif
-	// Misc
+	// General
 	{
 		ini.Get("General", "LastFilename",	&m_LastFilename);
 
@@ -162,11 +160,13 @@ void SConfig::LoadSettings()
 	}
 
 	{
-		// General interfance
+		// Interface
 		ini.Get("Interface", "ConfirmStop", &m_LocalCoreStartupParameter.bConfirmStop, false);
 		ini.Get("Interface", "HideCursor", &m_LocalCoreStartupParameter.bHideCursor, false);
 		ini.Get("Interface", "AutoHideCursor", &m_LocalCoreStartupParameter.bAutoHideCursor, false);
 		ini.Get("Interface", "Theme", &m_LocalCoreStartupParameter.iTheme, 0);
+		ini.Get("Interface", "ShowWiimoteLeds", &m_LocalCoreStartupParameter.bWiiLeds, false);
+		ini.Get("Interface", "ShowWiimoteSpeakers", &m_LocalCoreStartupParameter.bWiiSpeakers, false);
 
 		// Core
 		ini.Get("Core", "HLEBios",     &m_LocalCoreStartupParameter.bHLEBios,		true);
@@ -183,10 +183,6 @@ void SConfig::LoadSettings()
 		ini.Get("Core", "RunCompareServer", &m_LocalCoreStartupParameter.bRunCompareServer, false);
 		ini.Get("Core", "RunCompareClient", &m_LocalCoreStartupParameter.bRunCompareClient, false);
 
-		// Wii
-		ini.Get("Wii", "ShowWiimoteLeds", &m_LocalCoreStartupParameter.bWiiLeds, false);
-		ini.Get("Wii", "ShowWiimoteSpeakers", &m_LocalCoreStartupParameter.bWiiSpeakers, false);
-
 		// Plugins
 		ini.Get("Core", "GFXPlugin",  &m_LocalCoreStartupParameter.m_strVideoPlugin, m_DefaultGFXPlugin.c_str());
 		ini.Get("Core", "DSPPlugin",  &m_LocalCoreStartupParameter.m_strDSPPlugin, m_DefaultDSPPlugin.c_str());

Source/Core/DolphinWX/Src/ConfigMain.cpp

@@ -49,6 +49,8 @@ EVT_CHECKBOX(ID_INTERFACE_CONFIRMSTOP, CConfigMain::CoreSettingsChanged)
 EVT_CHECKBOX(ID_INTERFACE_HIDECURSOR, CConfigMain::CoreSettingsChanged)
 EVT_CHECKBOX(ID_INTERFACE_AUTOHIDECURSOR, CConfigMain::CoreSettingsChanged)
 EVT_RADIOBOX(ID_INTERFACE_THEME, CConfigMain::CoreSettingsChanged)
+EVT_CHECKBOX(ID_INTERFACE_WIIMOTE_LEDS, CConfigMain::CoreSettingsChanged)
+EVT_CHECKBOX(ID_INTERFACE_WIIMOTE_SPEAKERS, CConfigMain::CoreSettingsChanged)
 
 EVT_CHECKBOX(ID_ALLWAYS_HLEBIOS, CConfigMain::CoreSettingsChanged)
 EVT_CHECKBOX(ID_USEDYNAREC, CConfigMain::CoreSettingsChanged)
@@ -57,11 +59,10 @@ EVT_CHECKBOX(ID_LOCKTHREADS, CConfigMain::CoreSettingsChanged)
 EVT_CHECKBOX(ID_OPTIMIZEQUANTIZERS, CConfigMain::CoreSettingsChanged)
 EVT_CHECKBOX(ID_IDLESKIP, CConfigMain::CoreSettingsChanged)
 EVT_CHECKBOX(ID_ENABLECHEATS, CConfigMain::CoreSettingsChanged)
+
 EVT_CHOICE(ID_GC_SRAM_LNG, CConfigMain::GCSettingsChanged)
 
 EVT_CHOICE(ID_WII_BT_BAR, CConfigMain::WiiSettingsChanged)
-EVT_CHECKBOX(ID_WII_BT_LEDS, CConfigMain::WiiSettingsChanged)
-EVT_CHECKBOX(ID_WII_BT_SPEAKERS, CConfigMain::WiiSettingsChanged)
 EVT_CHECKBOX(ID_WII_IPL_SSV, CConfigMain::WiiSettingsChanged)
 EVT_CHECKBOX(ID_WII_IPL_PGS, CConfigMain::WiiSettingsChanged)
 EVT_CHECKBOX(ID_WII_IPL_E60, CConfigMain::WiiSettingsChanged)
@@ -73,6 +74,7 @@ EVT_BUTTON(ID_ADDISOPATH, CConfigMain::AddRemoveISOPaths)
 EVT_BUTTON(ID_REMOVEISOPATH, CConfigMain::AddRemoveISOPaths)
 EVT_FILEPICKER_CHANGED(ID_DEFAULTISO, CConfigMain::DefaultISOChanged)
 EVT_DIRPICKER_CHANGED(ID_DVDROOT, CConfigMain::DVDRootChanged)
+
 EVT_CHOICE(ID_GRAPHIC_CB, CConfigMain::OnSelectionChanged)
 EVT_BUTTON(ID_GRAPHIC_CONFIG, CConfigMain::OnConfig)
 EVT_CHOICE(ID_DSP_CB, CConfigMain::OnSelectionChanged)
@@ -146,14 +148,12 @@ void CConfigMain::CreateGUIControls()
 {
 	Notebook = new wxNotebook(this, ID_NOTEBOOK, wxDefaultPosition, wxDefaultSize);
 	GeneralPage = new wxPanel(Notebook, ID_GENERALPAGE, wxDefaultPosition, wxDefaultSize);
-	CorePage = new wxPanel(Notebook, ID_COREPAGE, wxDefaultPosition, wxDefaultSize);
 	GamecubePage = new wxPanel(Notebook, ID_GAMECUBEPAGE, wxDefaultPosition, wxDefaultSize);
 	WiiPage = new wxPanel(Notebook, ID_WIIPAGE, wxDefaultPosition, wxDefaultSize);
 	PathsPage = new wxPanel(Notebook, ID_PATHSPAGE, wxDefaultPosition, wxDefaultSize);
 	PluginPage = new wxPanel(Notebook, ID_PLUGINPAGE, wxDefaultPosition, wxDefaultSize);
 
 	Notebook->AddPage(GeneralPage, wxT("General"));
-	Notebook->AddPage(CorePage, wxT("Core"));
 	Notebook->AddPage(GamecubePage, wxT("Gamecube"));
 	Notebook->AddPage(WiiPage, wxT("Wii"));
 	Notebook->AddPage(PathsPage, wxT("Paths"));
@@ -164,99 +164,106 @@ void CConfigMain::CreateGUIControls()
 	// General page
 	// --------
 
+	// -----------------------------------
+	// Core Settings
+	// -----------
+	// Basic Settings
+	UseDualCore = new wxCheckBox(GeneralPage, ID_USEDUALCORE, wxT("Enable Dual Core"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	UseDualCore->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bUseDualCore);
+	SkipIdle = new wxCheckBox(GeneralPage, ID_IDLESKIP, wxT("Enable Idle Skipping"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	SkipIdle->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle);
+	EnableCheats = new wxCheckBox(GeneralPage, ID_ENABLECHEATS, wxT("Enable Cheats"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	EnableCheats->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats);
+	// Advanced Settings
+	AllwaysHLEBIOS = new wxCheckBox(GeneralPage, ID_ALLWAYS_HLEBIOS, wxT("HLE the BIOS all the time"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	AllwaysHLEBIOS->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bHLEBios);
+	UseDynaRec = new wxCheckBox(GeneralPage, ID_USEDYNAREC, wxT("Enable the JIT dynarec"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	UseDynaRec->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bUseJIT);
+	LockThreads = new wxCheckBox(GeneralPage, ID_LOCKTHREADS, wxT("Lock threads to cores"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	LockThreads->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bLockThreads);
+	OptimizeQuantizers = new wxCheckBox(GeneralPage, ID_OPTIMIZEQUANTIZERS, wxT("Optimize Quantizers"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	OptimizeQuantizers->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bOptimizeQuantizers);
+
+	// -----------------------------------
+	// Interface settings
+	// -----------
 	// Confirm on stop
 	ConfirmStop = new wxCheckBox(GeneralPage, ID_INTERFACE_CONFIRMSTOP, wxT("Confirm On Stop"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 	ConfirmStop->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bConfirmStop);
-	
+	// Hide Cursor
-	AutoHideCursor = new wxCheckBox(GeneralPage, ID_INTERFACE_AUTOHIDECURSOR, wxT("Auto Hide Cursor"));
+	wxStaticText *HideCursorText = new wxStaticText(GeneralPage, ID_INTERFACE_HIDECURSOR_TEXT, wxT("Hide Cursor:"), wxDefaultPosition, wxDefaultSize);
+	AutoHideCursor = new wxCheckBox(GeneralPage, ID_INTERFACE_AUTOHIDECURSOR, wxT("Auto"));
 	AutoHideCursor->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bAutoHideCursor);
-	
+	HideCursor = new wxCheckBox(GeneralPage, ID_INTERFACE_HIDECURSOR, wxT("Always"));
-	HideCursor = new wxCheckBox(GeneralPage, ID_INTERFACE_HIDECURSOR, wxT("Always Hide Cursor"));
 	HideCursor->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor);
-
+	// Wiimote status in statusbar
-	// Populate the settings
+	wxStaticText *WiimoteStatusText = new wxStaticText(GeneralPage, ID_INTERFACE_WIIMOTE_TEXT, wxT("Show wiimote status:"), wxDefaultPosition, wxDefaultSize);
-	sbInterface = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, wxT("Interface Settings"));
+	WiimoteStatusLEDs = new wxCheckBox(GeneralPage, ID_INTERFACE_WIIMOTE_LEDS, wxT("LEDs"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	sbInterface->Add(ConfirmStop, 0, wxALL, 5);
+	WiimoteStatusLEDs->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bWiiLeds);
-	sbInterface->Add(AutoHideCursor, 0, wxALL, 5);
+	WiimoteStatusSpeakers = new wxCheckBox(GeneralPage, ID_INTERFACE_WIIMOTE_SPEAKERS, wxT("Speakers"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	sbInterface->Add(HideCursor, 0, wxALL, 5);	
+	WiimoteStatusSpeakers->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bWiiSpeakers);
-	
-	// ToolTips
-	ConfirmStop->SetToolTip(wxT("Show a confirmation box before stopping a game."));
-	AutoHideCursor->SetToolTip(wxT("This will auto hide the cursor in fullscreen mode."));
-	HideCursor->SetToolTip(wxT("This will always hide the cursor when it's over the rendering window."
-		" It can be convenient in a Wii game that already has a cursor."
-		));
-
-
-	// -----------------------------------
 	// Themes
-	// -----------
 	wxArrayString ThemeChoices;
 	ThemeChoices.Add(wxT("Boomy"));
 	ThemeChoices.Add(wxT("Vista"));
 	ThemeChoices.Add(wxT("X-Plastik"));
 	ThemeChoices.Add(wxT("KDE"));
-	Theme = new wxRadioBox(GeneralPage, ID_INTERFACE_THEME, wxT("Theme"),
+	Theme = new wxRadioBox(GeneralPage, ID_INTERFACE_THEME, wxT("Theme"),wxDefaultPosition, wxDefaultSize, ThemeChoices, 1, wxRA_SPECIFY_ROWS);
-		wxDefaultPosition, wxDefaultSize, ThemeChoices, 1, wxRA_SPECIFY_COLS);
-
 	// Set selected
 	Theme->SetSelection(SConfig::GetInstance().m_LocalCoreStartupParameter.iTheme);
 
+	// ToolTips
+	UseDynaRec->SetToolTip(wxT("Disabling this will cause Dolphin to run in interpreter mode,"
+		"\nwhich can be more accurate, but is MUCH slower"));
+	ConfirmStop->SetToolTip(wxT("Show a confirmation box before stopping a game."));
+	AutoHideCursor->SetToolTip(wxT("This will auto hide the cursor in fullscreen mode."));
+	HideCursor->SetToolTip(wxT("This will always hide the cursor when it's over the rendering window."
+		"\nIt can be convenient in a Wii game that already has a cursor."));
+	WiimoteStatusLEDs->SetToolTip(wxT("Show which wiimotes are connected in the statusbar."));
+	WiimoteStatusSpeakers->SetToolTip(wxT("Show wiimote speaker status in the statusbar."));
+
 	// Copyright notice
 	Theme->SetItemToolTip(0, wxT("Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]"));
 	Theme->SetItemToolTip(1, wxT("Created by VistaIcons.com"));
 	Theme->SetItemToolTip(2, wxT("Created by black_rider and published on ForumW.org > Web Developments"));
 	Theme->SetItemToolTip(3, wxT("Created by KDE-Look.org"));
 
-	// Populate the entire page
+	// Populate the settings
-	sGeneralPage = new wxBoxSizer(wxVERTICAL);
+	sCore = new wxBoxSizer(wxHORIZONTAL);
-	sGeneralPage->Add(sbInterface, 0, wxEXPAND | wxALL, 5);
+	sbBasic = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, wxT("Basic Settings"));
-	sGeneralPage->Add(Theme, 0, wxEXPAND | (wxLEFT | wxRIGHT | wxBOTTOM), 5);
-
-	GeneralPage->SetSizer(sGeneralPage);
-	sGeneralPage->Layout();
-
-
-	//////////////////////////////////
-	// Core page
-	// --------
-	sCore = new wxBoxSizer(wxVERTICAL);
-
-	// Basic Settings
-	sbBasic = new wxStaticBoxSizer(wxVERTICAL, CorePage, wxT("Basic Settings"));
-	UseDualCore = new wxCheckBox(CorePage, ID_USEDUALCORE, wxT("Enable Dual Core"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	UseDualCore->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bUseDualCore);
-	SkipIdle = new wxCheckBox(CorePage, ID_IDLESKIP, wxT("Enable Idle Skipping"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	SkipIdle->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle);
-	EnableCheats = new wxCheckBox(CorePage, ID_ENABLECHEATS, wxT("Enable Cheats"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	EnableCheats->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats);
-
 	sbBasic->Add(UseDualCore, 0, wxALL, 5);
 	sbBasic->Add(SkipIdle, 0, wxALL, 5);
 	sbBasic->Add(EnableCheats, 0, wxALL, 5);
-
+	sbAdvanced = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, wxT("Advanced Settings"));
-	// Advanced Settings
-	sbAdvanced = new wxStaticBoxSizer(wxVERTICAL, CorePage, wxT("Advanced Settings"));
-	AllwaysHLEBIOS = new wxCheckBox(CorePage, ID_ALLWAYS_HLEBIOS, wxT("HLE the BIOS all the time"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	AllwaysHLEBIOS->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bHLEBios);
-	UseDynaRec = new wxCheckBox(CorePage, ID_USEDYNAREC, wxT("Enable Dynamic Recompilation"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	UseDynaRec->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bUseJIT);
-	LockThreads = new wxCheckBox(CorePage, ID_LOCKTHREADS, wxT("Lock threads to cores"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	LockThreads->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bLockThreads);
-	OptimizeQuantizers = new wxCheckBox(CorePage, ID_OPTIMIZEQUANTIZERS, wxT("Optimize Quantizers"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	OptimizeQuantizers->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bOptimizeQuantizers);
-
 	sbAdvanced->Add(AllwaysHLEBIOS, 0, wxALL, 5);
 	sbAdvanced->Add(UseDynaRec, 0, wxALL, 5);
 	sbAdvanced->Add(LockThreads, 0, wxALL, 5);
 	sbAdvanced->Add(OptimizeQuantizers, 0, wxALL, 5);
-	
+	sCore->Add(sbBasic, 0, wxEXPAND);
-	// Populate sCore
+	sCore->AddStretchSpacer();
-	sCore->Add(sbBasic, 0, wxEXPAND|wxALL, 5);
+	sCore->Add(sbAdvanced, 0, wxEXPAND);
-	//sCore->AddStretchSpacer();
+
-	sCore->Add(sbAdvanced, 0, wxEXPAND|wxALL, 5);
+	sbInterface = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, wxT("Interface Settings"));
-	CorePage->SetSizer(sCore);
+	sbInterface->Add(ConfirmStop, 0, wxALL, 5);
-	sCore->Layout();
+	wxBoxSizer *sHideCursor = new wxBoxSizer(wxHORIZONTAL);
+	sHideCursor->Add(HideCursorText);
+	sHideCursor->Add(AutoHideCursor, 0, wxLEFT, 5);
+	sHideCursor->Add(HideCursor, 0, wxLEFT, 5);
+	sbInterface->Add(sHideCursor, 0, wxALL, 5);
+	wxBoxSizer *sWiimoteStatus = new wxBoxSizer(wxHORIZONTAL);
+	sWiimoteStatus->Add(WiimoteStatusText);
+	sWiimoteStatus->Add(WiimoteStatusLEDs, 0, wxLEFT, 5);
+	sWiimoteStatus->Add(WiimoteStatusSpeakers, 0, wxLEFT, 5);
+	sbInterface->Add(sWiimoteStatus, 0, wxALL, 5);
+	sbInterface->Add(Theme, 0, wxEXPAND | wxALL, 5);
+
+	// Populate the entire page
+	sGeneralPage = new wxBoxSizer(wxVERTICAL);
+	sGeneralPage->Add(sCore, 0, wxEXPAND | wxALL, 5);
+	sGeneralPage->Add(sbInterface, 0, wxEXPAND | wxALL, 5);
+
+	GeneralPage->SetSizer(sGeneralPage);
+	sGeneralPage->Layout();
 
 
 	//////////////////////////////////
@@ -291,10 +298,6 @@ void CConfigMain::CreateGUIControls()
 	WiiSensBarPosText = new wxStaticText(WiiPage, ID_WII_BT_BAR_TEXT, wxT("Sensor Bar Position:"), wxDefaultPosition, wxDefaultSize);
 	WiiSensBarPos = new wxChoice(WiiPage, ID_WII_BT_BAR, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiSensBarPos, 0, wxDefaultValidator);
 	WiiSensBarPos->SetSelection(m_SYSCONF[BT_BAR]);
-	WiiLeds = new wxCheckBox(WiiPage, ID_WII_BT_LEDS, wxT("Show Wiimote Leds in status bar"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	WiiLeds->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bWiiLeds);
-	WiiSpeakers = new wxCheckBox(WiiPage, ID_WII_BT_SPEAKERS, wxT("Show Wiimote Speaker status in status bar"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	WiiSpeakers->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bWiiSpeakers);
 
 	sbWiiIPLSettings = new wxStaticBoxSizer(wxVERTICAL, WiiPage, wxT("IPL Settings"));
 	WiiScreenSaver = new wxCheckBox(WiiPage, ID_WII_IPL_SSV, wxT("Enable Screen Saver (burn-in reduction)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
@@ -318,8 +321,6 @@ void CConfigMain::CreateGUIControls()
 	sWiimoteSettings = new wxGridBagSizer(0, 0);
 	sWiimoteSettings->Add(WiiSensBarPosText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
 	sWiimoteSettings->Add(WiiSensBarPos, wxGBPosition(0, 1), wxGBSpan(1, 1), wxALL, 5);
-	sWiimoteSettings->Add(WiiLeds, wxGBPosition(1, 0), wxGBSpan(1, 2), wxALL, 5);
-	sWiimoteSettings->Add(WiiSpeakers, wxGBPosition(2, 0), wxGBSpan(1, 2), wxALL, 5);
 	sbWiimoteSettings->Add(sWiimoteSettings);
 	sWii->Add(sbWiimoteSettings, 0, wxEXPAND|wxALL, 5);
 
@@ -497,6 +498,12 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event)
 		SConfig::GetInstance().m_LocalCoreStartupParameter.iTheme = Theme->GetSelection();
 		main_frame->InitBitmaps();
 		break;
+	case ID_INTERFACE_WIIMOTE_LEDS:
+		SConfig::GetInstance().m_LocalCoreStartupParameter.bWiiLeds = WiimoteStatusLEDs->IsChecked();
+		break;
+	case ID_INTERFACE_WIIMOTE_SPEAKERS:
+		SConfig::GetInstance().m_LocalCoreStartupParameter.bWiiSpeakers = WiimoteStatusSpeakers->IsChecked();
+		break;
 
 	case ID_ALLWAYS_HLEBIOS: // Core
 		SConfig::GetInstance().m_LocalCoreStartupParameter.bHLEBios = AllwaysHLEBIOS->IsChecked();
@@ -545,12 +552,6 @@ void CConfigMain::WiiSettingsChanged(wxCommandEvent& event)
 	case ID_WII_BT_BAR: // Wiimote settings
 		m_SYSCONF[BT_BAR] = WiiSensBarPos->GetSelection();
 		break;
-	case ID_WII_BT_LEDS:
-		SConfig::GetInstance().m_LocalCoreStartupParameter.bWiiLeds = WiiLeds->IsChecked();
-		break;
-	case ID_WII_BT_SPEAKERS:
-		SConfig::GetInstance().m_LocalCoreStartupParameter.bWiiSpeakers = WiiSpeakers->IsChecked();
-		break;
 
 	case ID_WII_IPL_AR: // IPL settings
 		m_SYSCONF[IPL_AR] = WiiAspectRatio->GetSelection();

Source/Core/DolphinWX/Src/ConfigMain.h

@@ -49,9 +49,10 @@ class CConfigMain
 
 		wxBoxSizer* sGeneralPage; // General Settings
 		wxCheckBox* ConfirmStop, * AutoHideCursor, *HideCursor;
+		wxCheckBox* WiimoteStatusLEDs, * WiimoteStatusSpeakers;
 		wxRadioBox* Theme;
 		
-		wxBoxSizer* sCore; // Core settings
+		wxBoxSizer* sCore;
 		wxStaticBoxSizer* sbBasic, *sbAdvanced, *sbInterface;
 		wxCheckBox* AllwaysHLEBIOS;
 		wxCheckBox* UseDynaRec;
@@ -159,7 +160,6 @@ class CConfigMain
 		wxArrayString arrayStringFor_WiiSensBarPos; // Wiimote Settings
 		wxStaticText* WiiSensBarPosText;
 		wxChoice* WiiSensBarPos;
-		wxCheckBox* WiiLeds, * WiiSpeakers;
 
 		wxCheckBox* WiiScreenSaver; // IPL settings
 		wxCheckBox* WiiProgressiveScan;
@@ -214,12 +214,13 @@ class CConfigMain
 			ID_GC_SRAM_LNG_TEXT,
 			ID_GC_SRAM_LNG,
 
-			ID_INTERFACE_CONFIRMSTOP, ID_INTERFACE_HIDECURSOR, ID_INTERFACE_AUTOHIDECURSOR,
+			ID_INTERFACE_CONFIRMSTOP, // Interface settings
-			ID_INTERFACE_THEME, // Interface settings
+			ID_INTERFACE_HIDECURSOR_TEXT, ID_INTERFACE_HIDECURSOR, ID_INTERFACE_AUTOHIDECURSOR,
+			ID_INTERFACE_WIIMOTE_TEXT, ID_INTERFACE_WIIMOTE_LEDS, ID_INTERFACE_WIIMOTE_SPEAKERS,
+			ID_INTERFACE_THEME,
 
 			ID_WII_BT_BAR_TEXT,
 			ID_WII_BT_BAR,
-			ID_WII_BT_LEDS, ID_WII_BT_SPEAKERS,
 
 			ID_WII_IPL_SSV,
 			ID_WII_IPL_PGS,

Source/Core/DolphinWX/Src/Frame.cpp

@@ -18,7 +18,7 @@
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
-// Windowses
+// Windows
 /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 
 CFrame is the main parent window. Inside CFrame there is an m_Panel that is the parent for

Source/Core/DolphinWX/Src/FrameTools.cpp

@@ -18,10 +18,10 @@
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
-// Windowses
+// Windows
 /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 
-CFrame is the main parent window. Inside CFrame there is an m_Panel that is the parent for
+CFrame is the main parent window. Inside CFrame there is m_Panel which is the parent for
 the rendering window (when we render to the main window). In Windows the rendering window is
 created by giving CreateWindow() m_Panel->GetHandle() as parent window and creating a new
 child window to m_Panel. The new child window handle that is returned by CreateWindow() can

Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h

@@ -35,8 +35,11 @@
 class ConfigDialog : public wxDialog
 {
 	public:
-		ConfigDialog(wxWindow *parent, wxWindowID id = 1, const wxString &title = wxT("OpenGL Plugin Configuration"),
+		ConfigDialog(wxWindow *parent, wxWindowID id = 1,
-			const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE);
+			const wxString &title = wxT("OpenGL Plugin Configuration"),
+			const wxPoint& pos = wxDefaultPosition,
+			const wxSize& size = wxDefaultSize,
+			long style = wxDEFAULT_DIALOG_STYLE);
 		virtual ~ConfigDialog();
 		void CloseClick(wxCommandEvent& event);
 

Source/Plugins/Plugin_VideoOGL/Src/main.cpp

@@ -112,13 +112,12 @@ void SetDllGlobals(PLUGIN_GLOBALS* _pPluginGlobals) {
 void DllConfig(HWND _hParent)
 {
 #if defined(_WIN32)
-	//wxWindow win;
+	wxWindow * win = new wxWindow();
-	//win.SetHWND(_hParent);
+	win->SetHWND((WXHWND)_hParent);
-	//ConfigDialog frame(&win);
+	win->AdoptAttributesFromHWND();
-	//ConfigDialog frame(NULL);
+//	win->Reparent(wxGetApp().GetTopWindow());
 
-	ConfigDialog *frame;
+	ConfigDialog *frame = new ConfigDialog(win);
-	frame = new ConfigDialog(NULL);
 
 	DWORD iModeNum = 0;
 	DEVMODE dmi;
@@ -131,32 +130,27 @@ void DllConfig(HWND _hParent)
 	{	
 		char szBuffer[100];
 		sprintf(szBuffer,"%dx%d", dmi.dmPelsWidth, dmi.dmPelsHeight);
-		//making a string cause char*[] to char was a baaad idea
 		std::string strBuffer(szBuffer);
-		//create a check loop to check every pointer of resos to see if the res is added or not
+		// Create a check loop to check every pointer of resos to see if the res is added or not
 		int b = 0;
 		bool resFound = false;
 		while (b < i && !resFound)
 		{
-			//is the res already added?
+			// Is the res already added?
 			resFound = (resos[b] == strBuffer);
 			b++;
 		}
 		if (!resFound)
-		//and add the res
+		// Add the res
 		{
 			resos[i] = strBuffer;
 			i++;
-			//frame.AddFSReso(szBuffer);			
+			frame->AddFSReso(szBuffer);
-			//frame.AddWindowReso(szBuffer);
-			frame->AddFSReso(szBuffer);			
 			frame->AddWindowReso(szBuffer);
 		}
         ZeroMemory(&dmi, sizeof(dmi));
 	}
-	//frame.ShowModal();
 	frame->ShowModal();
-	//win.SetHWND(0);
 #elif defined(USE_WX) && USE_WX
 
 	ConfigDialog frame(NULL);