ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pcsx2 gui: 

* Fix log folder path selection.
* half fix the plugin folder path selection. Ie the use default selection.
  However the register setting must be saved after the path updates.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4391 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut@gmail.com 2011-03-05 19:02:57 +00:00
parent 1d25812100
commit 7e62a13131
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/gui/AppConfig.cpp
View File

@ -376,7 +376,7 @@ bool AppConfig::FullpathMatchTest( PluginsEnum_t pluginId, const wxString& cmpto
wxDirName GetLogFolder() wxDirName GetLogFolder()
{ {
return UseDefaultLogFolder ? PathDefs::GetLogs() : LogFolder; return g_Conf->Folders.IsDefault( FolderId_Logs ) ? PathDefs::Get(FolderId_Logs) : g_Conf->Folders[FolderId_Logs];
} }
wxDirName GetSettingsFolder() wxDirName GetSettingsFolder()
@ -594,6 +594,7 @@ void AppConfig::FolderOptions::ApplyDefaults()
if( UseDefaultMemoryCards ) MemoryCards = PathDefs::GetMemoryCards(); if( UseDefaultMemoryCards ) MemoryCards = PathDefs::GetMemoryCards();
if( UseDefaultLogs ) Logs = PathDefs::GetLogs(); if( UseDefaultLogs ) Logs = PathDefs::GetLogs();
if( UseDefaultLangs ) Langs = PathDefs::GetLangs(); if( UseDefaultLangs ) Langs = PathDefs::GetLangs();
if( UseDefaultPluginsFolder)PluginsFolder = PathDefs::GetPlugins();
} }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@ -626,6 +627,7 @@ void AppConfig::FolderOptions::LoadSave( IniInterface& ini )
IniBitBool( UseDefaultMemoryCards ); IniBitBool( UseDefaultMemoryCards );
IniBitBool( UseDefaultLogs ); IniBitBool( UseDefaultLogs );
IniBitBool( UseDefaultLangs ); IniBitBool( UseDefaultLangs );
IniBitBool( UseDefaultPluginsFolder );
IniEntry( Bios ); IniEntry( Bios );
IniEntry( Snapshots ); IniEntry( Snapshots );

2
pcsx2/gui/AppConfig.h
View File

@ -50,13 +50,11 @@ namespace PathDefs
extern DocsModeType DocsFolderMode; // extern DocsModeType DocsFolderMode; //
extern bool UseDefaultSettingsFolder; // when TRUE, pcsx2 derives the settings folder from the DocsFolderMode extern bool UseDefaultSettingsFolder; // when TRUE, pcsx2 derives the settings folder from the DocsFolderMode
extern bool UseDefaultLogFolder;
extern bool UseDefaultPluginsFolder; extern bool UseDefaultPluginsFolder;
extern bool UseDefaultThemesFolder; extern bool UseDefaultThemesFolder;
extern wxDirName CustomDocumentsFolder; // allows the specification of a custom home folder for PCSX2 documents files. extern wxDirName CustomDocumentsFolder; // allows the specification of a custom home folder for PCSX2 documents files.
extern wxDirName SettingsFolder; // dictates where the settings folder comes from, *if* UseDefaultSettingsFolder is FALSE. extern wxDirName SettingsFolder; // dictates where the settings folder comes from, *if* UseDefaultSettingsFolder is FALSE.
extern wxDirName LogFolder;
extern wxDirName InstallFolder; extern wxDirName InstallFolder;
extern wxDirName PluginsFolder; extern wxDirName PluginsFolder;

2
pcsx2/gui/AppUserMode.cpp
View File

@ -27,14 +27,12 @@
DocsModeType DocsFolderMode = DocsFolder_User; DocsModeType DocsFolderMode = DocsFolder_User;
bool UseDefaultSettingsFolder = true; bool UseDefaultSettingsFolder = true;
bool UseDefaultLogFolder = true;
bool UseDefaultPluginsFolder = true; bool UseDefaultPluginsFolder = true;
bool UseDefaultThemesFolder = true; bool UseDefaultThemesFolder = true;
wxDirName CustomDocumentsFolder; wxDirName CustomDocumentsFolder;
wxDirName SettingsFolder; wxDirName SettingsFolder;
wxDirName LogFolder;
wxDirName InstallFolder; wxDirName InstallFolder;
wxDirName PluginsFolder; wxDirName PluginsFolder;