Memcard Manager:

- Fixed drag and drop not updating the "Enabled" flag. This meant some changes to the oop design choice (removal of some const qualifiers). Hope you don't mind, Jake :p
- Added abort query for overwriting memcards when in copy mode (drag and drop with ctrl pressed on Windows).
- Changed the sizing a bit so the table fits into the dialog here.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4351 96395faa-99c1-11dd-bbfe-3dabce05a288

pcsx2/gui/Panels/MemoryCardListPanel.cpp

@@ -346,7 +346,7 @@ public:
 		return result;
 	}
 	
-	virtual wxDragResult OnDropMcd( const McdListItem& src, const McdListItem& dest, wxDragResult def )
+	virtual wxDragResult OnDropMcd( McdListItem& src, McdListItem& dest, wxDragResult def )
 	{
 		if( src.Slot == dest.Slot ) return wxDragNone;
 		if( !pxAssert( (src.Slot >= 0) && (dest.Slot >= 0) ) ) return wxDragNone;
@@ -355,21 +355,26 @@ public:
 		wxFileName srcfile( basepath + g_Conf->Mcd[src.Slot].Filename );
 		wxFileName destfile( basepath + g_Conf->Mcd[dest.Slot].Filename );
 
+		bool result = true;
+
 		if( wxDragCopy == def )
 		{
 			// user is force invoking copy mode, which means we need to check the destination
 			// and prompt if it looks valuable (formatted).
-
 			if( dest.IsPresent && dest.IsFormatted )
 			{
-				pxsFmt( pxE( "!Notice:Mcd:Overwrite", 
+				wxString content;
+				content.Printf(
+					pxE( "!Notice:Mcd:Overwrite", 
 					L"This will copy the entire contents of the memory card in slot %u to the memory card in slot %u. "
 					L"All data on the memory card in slot %u will be lost.  Are you sure?" ), 
 					src.Slot, dest.Slot, dest.Slot
 				);
 
-				//if( !Msgbox::OkCancel(  ) )
-				//	return wxDragNone;
+				result = Msgbox::YesNo( content, _("Overwrite memory card?") );
+				
+				if (!result)
+					return wxDragNone;
 			}
 			
 			ScopedBusyCursor doh( Cursor_ReallyBusy );
@@ -386,6 +391,9 @@ public:
 				Msgbox::Alert( heading + L"\n\n" + content, _("Copy failed!") );
 				return wxDragNone;
 			}
+
+			// Destination memcard isEnabled state is the same now as the source's
+			dest.IsEnabled = src.IsEnabled;
 		}
 		else if( wxDragMove == def )
 		{
@@ -394,13 +402,11 @@ public:
 			const bool srcExists( srcfile.FileExists() );
 			const bool destExists( destfile.FileExists() );
 
-			bool result = true;
-
 			if( destExists && srcExists) 
 			{
 				wxFileName tempname;
 				tempname.AssignTempFileName( basepath.ToString() ); 
-				//Console.Warning( "srcExists && destExists" );
+				
 				// Neat trick to handle errors.
 				result = result && wxRenameFile( srcfile.GetFullPath(), tempname.GetFullPath(), true );
 				result = result && wxRenameFile( destfile.GetFullPath(), srcfile.GetFullPath(), false );
@@ -408,15 +414,18 @@ public:
 			}
 			else if( destExists )
 			{
-				//Console.Warning( "destExists" );
 				result = wxRenameFile( destfile.GetFullPath(), srcfile.GetFullPath() );
 			}
 			else if( srcExists )
 			{
-				//Console.Warning( "srcExists" );
 				result = wxRenameFile( srcfile.GetFullPath(), destfile.GetFullPath() );
 			}
 			
+			// Swap isEnabled state since both files got exchanged
+			bool temp = dest.IsEnabled;
+			dest.IsEnabled = src.IsEnabled;
+			src.IsEnabled = temp;
+
 			if( !result )
 			{
 				// TODO : Popup an error to the user.
@@ -449,7 +458,7 @@ Panels::MemoryCardListPanel_Simple::MemoryCardListPanel_Simple( wxWindow* parent
 	m_MultitapEnabled[1] = false;
 
 	m_listview = new MemoryCardListView_Simple(this);
-	m_listview->SetMinSize(wxSize(m_listview->GetMinWidth(), m_listview->GetCharHeight() * 8));
+	m_listview->SetMinSize(wxSize(m_listview->GetMinWidth(), m_listview->GetCharHeight() * 10));
 	m_listview->SetDropTarget( new McdDropTarget(m_listview) );
 
 	m_button_Create	= new wxButton(this, wxID_ANY, _("Create"));
@@ -595,7 +604,6 @@ void Panels::MemoryCardListPanel_Simple::OnCreateCard(wxCommandEvent& evt)
 
 		if( result )
 		{
-			//Console.Warning( "Overwriting whatever was here" );
 			wxFileName fullpath( m_FolderPicker->GetPath() + g_Conf->Mcd[slot].Filename.GetFullName() );
 			wxRemoveFile( fullpath.GetFullPath() );
 		}
@@ -693,11 +701,6 @@ int Panels::MemoryCardListPanel_Simple::GetLength() const
 	return baselen;
 }
 
-const McdListItem& Panels::MemoryCardListPanel_Simple::GetCard( int idx ) const
-{
-	return m_Cards[idx];
-}
-
 McdListItem& Panels::MemoryCardListPanel_Simple::GetCard( int idx )
 {
 	return m_Cards[idx];

pcsx2/gui/Panels/MemoryCardListView.cpp

@@ -34,7 +34,7 @@ void BaseMcdListView::SetMcdProvider( IMcdList* face )
 	SetCardCount( m_CardProvider ? m_CardProvider->GetLength() : 0 );
 }
 
-const IMcdList& BaseMcdListView::GetMcdProvider() const
+IMcdList& BaseMcdListView::GetMcdProvider()
 {
 	pxAssume( m_CardProvider );
 	return *m_CardProvider;
@@ -106,9 +106,9 @@ const ListViewColumnInfo& MemoryCardListView_Simple::GetDefaultColumnInfo( uint
 		{ L"Status",		96,		wxLIST_FORMAT_CENTER	},
 		{ L"Size",			72,		wxLIST_FORMAT_LEFT		},
 		{ L"Formatted",		96,		wxLIST_FORMAT_CENTER	},
-		{ L"Modified",		120,	wxLIST_FORMAT_LEFT		},
-		{ L"Created",		120,	wxLIST_FORMAT_LEFT		},
-		{ L"Filename",		256,	wxLIST_FORMAT_LEFT		},
+		{ L"Modified",		96,		wxLIST_FORMAT_LEFT		},
+		{ L"Created",		96,		wxLIST_FORMAT_LEFT		},
+		{ L"Filename",		216,	wxLIST_FORMAT_LEFT		},
 	};
 
 	pxAssumeDev( idx < ArraySize(columns), "ListView column index is out of bounds." );

pcsx2/gui/Panels/MemoryCardPanels.h

@@ -68,9 +68,7 @@ class IMcdList
 public:
 	virtual void RefreshMcds() const=0;
 	virtual int GetLength() const=0;
-	virtual const McdListItem& GetCard( int idx ) const=0;
 	virtual McdListItem& GetCard( int idx )=0;
-
 	virtual wxDirName GetMcdPath() const=0;
 };
 
@@ -82,7 +80,7 @@ class BaseMcdListView : public wxListView
 	typedef wxListView _parent;
 
 protected:
-	const IMcdList*		m_CardProvider;
+	IMcdList*		m_CardProvider;
 
 	// specifies the target of a drag&drop operation
 	int					m_TargetedItem;
@@ -101,7 +99,7 @@ public:
 	virtual void LoadSaveColumns( IniInterface& ini );
 	virtual const ListViewColumnInfo& GetDefaultColumnInfo( uint idx ) const=0;
 
-	virtual const IMcdList& GetMcdProvider() const;
+	virtual IMcdList& GetMcdProvider();
 	virtual void SetTargetedItem( int sel );
 };
 
@@ -201,7 +199,6 @@ namespace Panels
 		// Interface Implementation for IMcdList
 		virtual int GetLength() const;
 
-		virtual const McdListItem& GetCard( int idx ) const;
 		virtual McdListItem& GetCard( int idx );
 
 	protected: