From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sun, 20 Sep 2015 12:34:05 +0000 (+0100)
Subject: Added signal for display the import results.
X-Git-Tag: release-0.05~73
X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=a217e7366f768d671fa325ebe8546d57ce9524e6;p=xestiaab%2F.git

Added signal for display the import results.
---

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index c062c15..d49a44d 100644
--- a/source/frmMain.cpp
+++ b/source/frmMain.cpp
@@ -28,6 +28,7 @@
 #include "frmSearch.h"
 #include "frmSSLCertificate.h"
 #include "frmUpdate.h"
+#include "import/frmImportResults.h"
 #include "bitmaps.h"
 
 #include "common/preferences.h"
@@ -68,6 +69,7 @@ DEFINE_EVENT_TYPE(CONNSTAT_UPDATE);
 DEFINE_EVENT_TYPE(INVALIDSSLCERT);
 DEFINE_EVENT_TYPE(GETSELECTEDLIST);
 DEFINE_EVENT_TYPE(SYNCACCOUNT);
+DEFINE_EVENT_TYPE(IMPORT_RESULTSSHOW);
 
 BEGIN_EVENT_TABLE(frmMain, wxFrame)
 EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, frmMain::ConflictResolution)
@@ -89,6 +91,7 @@ EVT_COMMAND(wxID_ANY, CONNSTAT_UPDATE, frmMain::UpdateConnectionStatus)
 EVT_COMMAND(wxID_ANY, INVALIDSSLCERT, frmMain::InvalidSSLCertificate)
 EVT_COMMAND(wxID_ANY, GETSELECTEDLIST, frmMain::GetSelectedList)
 EVT_COMMAND(wxID_ANY, SYNCACCOUNT, frmMain::SyncAccount)
+EVT_COMMAND(wxID_ANY, IMPORT_RESULTSSHOW, frmMain::ShowImportResults)
 END_EVENT_TABLE()
 
 frmMain::frmMain( wxWindow* parent )
@@ -2808,4 +2811,20 @@ void frmMain::ShowHelp( wxCommandEvent& event ){
     
 #endif
     
+}
+
+void frmMain::ShowImportResults( wxCommandEvent &event ){
+
+	std::map<int,wxString> *ResultData = (std::map<int,wxString>*)event.GetClientData();
+
+	frmImportResults *frmIR = new frmImportResults(this);
+	frmIR->LoadData(ResultData, event.GetInt(), (int)event.GetExtraLong());
+	frmIR->ShowModal();
+		
+	delete frmIR;
+	frmIR = NULL;
+	
+	delete ResultData;
+	ResultData = NULL;
+
 }
\ No newline at end of file
diff --git a/source/frmMain.h b/source/frmMain.h
index 1838300..ca571dc 100644
--- a/source/frmMain.h
+++ b/source/frmMain.h
@@ -48,6 +48,7 @@ DECLARE_EVENT_TYPE(CONNSTAT_UPDATE, wxID_ANY);
 DECLARE_EVENT_TYPE(INVALIDSSLCERT, wxID_ANY);
 DECLARE_EVENT_TYPE(GETSELECTEDLIST, wxID_ANY);
 DECLARE_EVENT_TYPE(SYNCACCOUNT, wxID_ANY);
+DECLARE_EVENT_TYPE(IMPORT_RESULTSSHOW, wxID_ANY);
 
 struct UCNotif{
 	wxString ContactAccount;
@@ -223,6 +224,7 @@ class frmMain : public frmMainADT
 		void ResumeAllTimers();
 		void UpdateSSLAccountStatus(int AccountID, int SSLStatus, SSLCertCollection SSLCertInc);
 		void GetListControl(wxListCtrl *lstContactsPtr, wxArrayString *ContactsFileIndexPtr);
+		void ShowImportResults( wxCommandEvent& event );
 		XABViewMode GetViewMode();
 		DECLARE_EVENT_TABLE()