X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fimport%2FfrmImportResults.cpp;h=1129ab6e62556a87a48b52aff4f5b45802a35b2e;hb=78a23a10b1ff0a041ab18891290a160b41d94530;hp=3dc09d49d00bbf2e5a6a72cb262f7ef6e5470600;hpb=45729fca56479bd9158486e0cda0c4a94b4dd1dc;p=xestiaab%2F.git

diff --git a/source/import/frmImportResults.cpp b/source/import/frmImportResults.cpp
index 3dc09d4..1129ab6 100644
--- a/source/import/frmImportResults.cpp
+++ b/source/import/frmImportResults.cpp
@@ -1,3 +1,21 @@
+// frmImportResults.h - frmImportResults form.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Address Book is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
+
 #include <map>
 #include <wx/wx.h>
 #include <wx/clipbrd.h>
@@ -20,9 +38,11 @@ void frmImportResults::CopyClipboard( wxCommandEvent& event )
 		wxTextDataObject ResultData;
 	
 		ResultData.SetText(txtResults->GetValue());
-	
-		wxTheClipboard->SetData(&ResultData);
+		
+		wxTheClipboard->Clear();	
+		wxTheClipboard->AddData(&ResultData);
 		wxTheClipboard->Close();
+		wxTheClipboard->Flush();
 	
 		wxMessageBox(_("The results have been copied to the clipboard."), _("Results copied to clipboard"));
 	
@@ -39,7 +59,7 @@ void frmImportResults::CloseWindow( wxCommandEvent& event )
 	this->Close();
 }
 
-void frmImportResults::LoadData(std::map<int,wxString> *ResultDataInc)
+void frmImportResults::LoadData(std::map<int,wxString> *ResultDataInc, int ImportCount, int ImportErrorCount)
 {
 
 	wxString ResultDataText;
@@ -50,5 +70,11 @@ void frmImportResults::LoadData(std::map<int,wxString> *ResultDataInc)
 		ResultDataText.Append(iter->second + wxT("\n"));
 	
 	}
+	
+	// Display the results in the form.
+	
+	txtResults->SetValue(ResultDataText);
+	lblText->SetLabel(wxString::Format(_("%i contacts imported. %i contacts had errors and could not be imported."), ImportCount, ImportErrorCount));
+
+}
 
-}
\ No newline at end of file