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

Fix decision memory for a few dialogs including disc swapping and drag and drop loading. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3099 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
sudonim1 2010-05-28 15:55:32 +00:00
parent bed2664465
commit 4a2c5737c0
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pcsx2/gui/Dialogs/ConfirmationDialogs.cpp
View File

@ -39,11 +39,18 @@ bool MsgButtons::Allows( wxWindowID id ) const
// [TODO] : maybe add in an Ignore All? // [TODO] : maybe add in an Ignore All?
case wxID_IGNORE: return HasIgnore(); case wxID_IGNORE: return HasIgnore();
case wxID_RESET: return HasReset();
case wxID_CLOSE: return HasClose();
} }
if (id <= wxID_LOWEST)
return HasCustom();
return false; return false;
} }
static wxString ResultToString( int result ) static wxString ResultToString( int result, const MsgButtons& buttons )
{ {
switch( result ) switch( result )
{ {
@ -60,8 +67,14 @@ static wxString ResultToString( int result )
// [TODO] : maybe add in an Ignore All? // [TODO] : maybe add in an Ignore All?
case wxID_IGNORE: return L"ignore"; case wxID_IGNORE: return L"ignore";
case wxID_RESET: return L"reset";
case wxID_CLOSE: return L"close";
} }
if (result <= wxID_LOWEST)
return buttons.GetCustomLabel();
return wxEmptyString; return wxEmptyString;
} }
@ -76,15 +89,18 @@ static wxWindowID ParseThatResult( const wxString& src, const MsgButtons& validT
wxID_YESTOALL, wxID_NOTOALL, wxID_YESTOALL, wxID_NOTOALL,
wxID_ABORT, wxID_RETRY, wxID_IGNORE, wxID_ABORT, wxID_RETRY, wxID_IGNORE,
wxID_RESET,
wxID_ANY,
}; };
for( int i=0; i<ArraySize( retvals ); ++i ) for( int i=0; i<ArraySize( retvals ); ++i )
{ {
if( (validTypes.Allows( retvals[i] )) && (src == ResultToString(retvals[i])) ) if( (validTypes.Allows( retvals[i] )) && (src == ResultToString(retvals[i], validTypes)) )
return retvals[i]; return retvals[i];
} }
return wxID_ANY; return wxID_NONE;
} }
static bool pxTrySetFocus( wxWindow& parent, wxWindowID id ) static bool pxTrySetFocus( wxWindow& parent, wxWindowID id )
@ -188,7 +204,7 @@ wxWindowID pxIssueConfirmation( wxDialogWithHelpers& confirmDlg, const MsgButton
if( cfg != NULL ) if( cfg != NULL )
{ {
wxString cfgResult = ResultToString( modalResult ); wxString cfgResult = ResultToString( modalResult, buttons );
if( DisablerCtrl->IsChecked() && !cfgResult.IsEmpty() ) if( DisablerCtrl->IsChecked() && !cfgResult.IsEmpty() )
{ {
cfg->SetPath( L"/PopupDisablers" ); cfg->SetPath( L"/PopupDisablers" );