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

Diff of /trunk/pcsx2/gui/AppConfig.cpp

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

--- trunk/pcsx2/gui/AppConfig.cpp	2010/12/23 11:48:33	279
+++ trunk/pcsx2/gui/AppConfig.cpp	2010/12/23 12:02:12	280
@@ -97,26 +97,7 @@
     // Specifies the main configuration folder.
     wxDirName GetUserLocalDataDir()
     {
-#ifdef __LINUX__
-        // Note: GetUserLocalDataDir() on linux return $HOME/.pcsx2 unfortunately it does not follow the XDG standard
-        // So we re-implement it, to follow the standard.
-        wxDirName user_local_dir;
-        wxString xdg_home_value;
-        if( wxGetEnv(L"XDG_CONFIG_HOME", &xdg_home_value) ) {
-            if ( xdg_home_value.IsEmpty() ) {
-                // variable exist but it is empty. So use the default value
-                user_local_dir = (wxDirName)Path::Combine( wxStandardPaths::Get().GetUserConfigDir() , wxDirName( L".config/pcsx2" ));
-            } else {
-                user_local_dir = (wxDirName)Path::Combine( xdg_home_value, pxGetAppName());
-            }
-        } else {
-            // variable do not exist
-            user_local_dir = (wxDirName)Path::Combine( wxStandardPaths::Get().GetUserConfigDir() , wxDirName( L".config/pcsx2" ));
-        }
-        return user_local_dir;
-#else
         return wxDirName(wxStandardPaths::Get().GetUserLocalDataDir());
-#endif
     }
 
 	// Fetches the path location for user-consumable documents -- stuff users are likely to want to
@@ -379,11 +360,13 @@
 	: MainGuiPosition( wxDefaultPosition )
 	, SysSettingsTabName( L"Cpu" )
 	, McdSettingsTabName( L"none" )
-	, AppSettingsTabName( L"Plugins" )
+	, ComponentsTabName( L"Plugins" )
+	, AppSettingsTabName( L"Appearance" )
 	, GameDatabaseTabName( L"none" )
 	, DeskTheme( L"default" )
 {
 	LanguageId			= wxLANGUAGE_DEFAULT;
+	LanguageCode		= L"default";
 	RecentIsoCount		= 12;
 	Listbook_ImageSize	= 32;
 	Toolbar_ImageSize	= 24;
@@ -484,9 +467,11 @@
 	IniEntry( MainGuiPosition );
 	IniEntry( SysSettingsTabName );
 	IniEntry( McdSettingsTabName );
+	IniEntry( ComponentsTabName );
 	IniEntry( AppSettingsTabName );
 	IniEntry( GameDatabaseTabName );
 	ini.EnumEntry( L"LanguageId", LanguageId, NULL, defaults.LanguageId );
+	IniEntry( LanguageCode );
 	IniEntry( RecentIsoCount );
 	IniEntry( DeskTheme );
 	IniEntry( Listbook_ImageSize );

 

  ViewVC Help
Powered by ViewVC 1.1.22