/[pcsx2_0.9.7]/trunk/pcsx2/gui/Dialogs/SysConfigDialog.cpp
ViewVC logotype

Diff of /trunk/pcsx2/gui/Dialogs/SysConfigDialog.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

--- trunk/pcsx2/gui/Dialogs/SysConfigDialog.cpp	2010/12/23 11:48:33	279
+++ trunk/pcsx2/gui/Dialogs/SysConfigDialog.cpp	2010/12/23 12:02:12	280
@@ -23,6 +23,7 @@
 #include "Panels/ConfigurationPanels.h"
 
 using namespace Panels;
+using namespace pxSizerFlags;
 
 static void CheckHacksOverrides()
 {
@@ -33,7 +34,7 @@
 
 	wxDialogWithHelpers dialog( wxFindWindowByName( L"Dialog:" + Dialogs::SysConfigDialog::GetNameStatic() ), _("Config Overrides Warning") );
 	
-	dialog += dialog.Text( pxE(".Panel:HasHacksOverrides",
+	dialog += dialog.Text( pxE("!Panel:HasHacksOverrides",
 		L"Warning!  You are running PCSX2 with command line options that override your configured settings.  "
 		L"These command line options will not be reflected in the Settings dialog, and will be disabled "
 		L"if you apply any changes here."
@@ -53,7 +54,7 @@
 
 	wxDialogWithHelpers dialog( NULL, _("Components Overrides Warning") );
 	
-	dialog += dialog.Text( pxE(".Panel:HasPluginsOverrides",
+	dialog += dialog.Text( pxE("!Panel:HasPluginsOverrides",
 		L"Warning!  You are running PCSX2 with command line options that override your configured plugin and/or folder settings.  "
 		L"These command line options will not be reflected in the settings dialog, and will be disabled "
 		L"when you apply settings changes here."
@@ -97,7 +98,6 @@
 
 	AddPage<PluginSelectorPanel>	( wxLt("Plugins"),		cfgid.Plugins );
 	AddPage<BiosSelectorPanel>		( wxLt("BIOS"),			cfgid.Cpu );
-	AddPage<StandardPathsPanel>		( wxLt("Folders"),		cfgid.Paths );
 
 	AddListbook();
 	AddOkCancel();
@@ -105,3 +105,21 @@
 	if( wxGetApp().Overrides.HasPluginsOverride() )
 		wxGetApp().PostMethod( CheckPluginsOverrides );
 }
+
+Dialogs::InterfaceConfigDialog::InterfaceConfigDialog(wxWindow *parent)
+	: BaseConfigurationDialog( parent, AddAppName(_("Language Selector - %s")), 400 )
+{
+	ScopedBusyCursor busy( Cursor_ReallyBusy );
+
+	CreateListbook( wxGetApp().GetImgList_Config() );
+	const AppImageIds::ConfigIds& cfgid( wxGetApp().GetImgId().Config );
+
+	AddPage<StandardPathsPanel>		( wxLt("Appearance"),	cfgid.Appearance );
+	AddPage<StandardPathsPanel>		( wxLt("Folders"),		cfgid.Paths );
+
+	AddListbook();
+	AddOkCancel();
+
+	//*this += new Panels::LanguageSelectionPanel( this ) | pxCenter;
+	//wxDialogWithHelpers::AddOkCancel( NULL, false );
+}

 

  ViewVC Help
Powered by ViewVC 1.1.22