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

* PCSX2 paths save to ini correctly now (sometimes they'd save as blanks). 

* Added some comments for the Dialogs::ExtensibleConfirmation class.
 * Removed a redundant call to PADupdate in the MTGS (not needed anymore in the single-PAD plugin design added in pcsx2wx)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2083 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-10-26 08:57:30 +00:00
parent 16be400a71
commit f016eca844
5 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcsx2/MTGS.cpp
View File

@ -325,10 +325,7 @@ void mtgsThreadObject::ExecuteTaskInThread()
//Console.Status( " << Frame Removed!" );
if( PADupdate != NULL )
{
PADupdate(0);
PADupdate(1);
}
}
break;

17
pcsx2/gui/AppConfig.cpp
View File

@ -159,7 +159,7 @@ namespace PathDefs
}
};
const wxDirName& AppConfig::FolderOptions::operator[]( FoldersEnum_t folderidx ) const
wxDirName& AppConfig::FolderOptions::operator[]( FoldersEnum_t folderidx )
{
switch( folderidx )
{
@ -176,6 +176,11 @@ const wxDirName& AppConfig::FolderOptions::operator[]( FoldersEnum_t folderidx )
return Plugins; // unreachable, but suppresses warnings.
}
const wxDirName& AppConfig::FolderOptions::operator[]( FoldersEnum_t folderidx ) const
{
return const_cast<FolderOptions*>( this )->operator[]( folderidx );
}
const bool AppConfig::FolderOptions::IsDefault( FoldersEnum_t folderidx ) const
{
switch( folderidx )
@ -463,7 +468,9 @@ void AppConfig::FolderOptions::LoadSave( IniInterface& ini )
IniScopedGroup path( ini, L"Folders" );
if( ini.IsSaving() )
{
ApplyDefaults();
}
IniBitBool( UseDefaultPlugins );
IniBitBool( UseDefaultSettings );
@ -483,7 +490,15 @@ void AppConfig::FolderOptions::LoadSave( IniInterface& ini )
IniEntry( RunIso );
if( ini.IsLoading() )
{
ApplyDefaults();
if( !UseAdminMode )
{
for( int i=0; i<FolderId_COUNT; ++i )
operator[]( (FoldersEnum_t)i ).Normalize();
}
}
}
// ------------------------------------------------------------------------

1
pcsx2/gui/AppConfig.h
View File

@ -84,6 +84,7 @@ public:
void Set( FoldersEnum_t folderidx, const wxString& src, bool useDefault );
const wxDirName& operator[]( FoldersEnum_t folderidx ) const;
wxDirName& operator[]( FoldersEnum_t folderidx );
const bool IsDefault( FoldersEnum_t folderidx ) const;
};

14
pcsx2/gui/Dialogs/ModalPopups.h
View File

@ -159,6 +159,20 @@ namespace Dialogs
};
// --------------------------------------------------------------------------------------
// ExtensibleConfirmation Dialog
// --------------------------------------------------------------------------------------
// Purpose: This dialog is a simple framework for providing common popups that have three
// main sections of content:
//
// [Upper Paragraph]
// [Optional Interior Content]
// [OK] [CANCEL] [ETC]
//
// The Upper Paragraph and buttons are specified in the constructor. The Interior Content
// can be added by fetching the ExtensibleSizer provided by th created dialog. Add your
// content, dance around a bit, call Fit(), and then ShowModal. :)
class ExtensibleConfirmation : public wxDialogWithHelpers
{
protected:

4
pcsx2/gui/IniInterface.cpp
View File

@ -200,9 +200,9 @@ void IniSaver::Entry( const wxString& var, wxString& value, const wxString& defv
void IniSaver::Entry( const wxString& var, wxDirName& value, const wxDirName& defvalue )
{
if( value == defvalue )
/*if( value == defvalue )
m_Config.Write( var, wxString() );
else
else*/
m_Config.Write( var, value.ToString() );
}