X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmMain.cpp;h=4c3755597925d9f4a3083fa51405d1b3c4918453;hb=f204cf9df7db6a3f097e4d013b47d19577db09a7;hp=c062c153d3262218244a8e36471c5cb55dabef43;hpb=b85066836998d2e8834dc224e61e9855381671e4;p=xestiaab%2F.git

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index c062c15..4c37555 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,8 @@ DEFINE_EVENT_TYPE(CONNSTAT_UPDATE);
 DEFINE_EVENT_TYPE(INVALIDSSLCERT);
 DEFINE_EVENT_TYPE(GETSELECTEDLIST);
 DEFINE_EVENT_TYPE(SYNCACCOUNT);
+DEFINE_EVENT_TYPE(IMPORT_RESULTSSHOW);
+DEFINE_EVENT_TYPE(RELOADCONTACTLIST);
 
 BEGIN_EVENT_TABLE(frmMain, wxFrame)
 EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, frmMain::ConflictResolution)
@@ -89,6 +92,8 @@ 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)
+EVT_COMMAND(wxID_ANY, RELOADCONTACTLIST, frmMain::ReloadContactList)
 END_EVENT_TABLE()
 
 frmMain::frmMain( wxWindow* parent )
@@ -322,13 +327,34 @@ frmMainADT( parent )
     
 }
 
+void frmMain::QuitApp( wxCloseEvent& event )
+{
+
+    QuitApp();
+
+}
+
 void frmMain::QuitApp( wxCommandEvent& event )
+{
+    
+    QuitApp();
+    
+}
+
+void frmMain::QuitApp()
 {
     //-------------------------------------------------------------------
     // frmMain::QuitApp: Quits the application by simply closing this
     // window which causes the exit as frmMain is the main window.
     //
     // wxCommandEvent 	Accepts a referenced event command.
+    //-------------------------------------------------------------------
+ 
+     //-------------------------------------------------------------------
+    // frmMain::QuitApp: Quits the application by simply closing this
+    // window which causes the exit as frmMain is the main window.
+    //
+    // wxCommandEvent 	Accepts a referenced event command.
     //-------------------------------------------------------------------
     
     //Go through the windows and close each one (be it search
@@ -393,17 +419,6 @@ void frmMain::QuitApp( wxCommandEvent& event )
     
     std::exit(0);
     
-}
-
-void frmMain::QuitApp()
-{
-    //-------------------------------------------------------------------
-    // frmMain::QuitApp: Quits the application by simply closing this
-    // window which causes the exit as frmMain is the main window.
-    //
-    // wxCommandEvent 	Accepts a referenced event command.
-    //-------------------------------------------------------------------
-    
     Close();
     
 }
@@ -757,7 +772,6 @@ void frmMain::LoadContactList( wxTreeEvent& event )
                 vCard Person;
                 
                 vCardFilenameFull.Append(AccountDirFinal);
-                vCardFilenameFull.Append(wxT("/"));
                 vCardFilenameFull.Append(vCardFilename);
                 
                 Person.LoadFile(vCardFilenameFull);
@@ -1881,15 +1895,17 @@ void frmMain::RevealContact(wxCommandEvent& event){
         // If they match then select it.
         
         if (ContactsFileIndex[intSelectedData] == uc->ContactFilename){
-            
+	    
             // Select.
             
             lstContacts->SetItemState(longSelected, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
             lstContacts->EnsureVisible(longSelected);
             
-            break;
-            
-        }
+	} else {
+	
+	    lstContacts->SetItemState(longSelected, 0, wxLIST_STATE_SELECTED);
+	
+	}
         
     }
     
@@ -2757,10 +2773,10 @@ void frmMain::GetSelectedList( wxCommandEvent& event ){
 
 void frmMain::SyncAccount( wxCommandEvent& event ){
     
-    wxString *AccNameInc = (wxString*)event.GetClientData();
+    wxString AccNameInc = event.GetString();
     
     frmActivityMgr *frameActMgr = static_cast<frmActivityMgr*>(ActMgrPtr);
-    frameActMgr->AddTask(3, wxT(""), *AccNameInc, 
+    frameActMgr->AddTask(3, wxT(""), AccNameInc, 
                          wxT(""), wxT(""), wxT(""), wxT(""));
     
 }
@@ -2808,4 +2824,34 @@ 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;
+
+}
+
+void frmMain::ReloadContactList( wxCommandEvent &event ){
+
+	// Check if the account name given is the current
+	// account selected.
+
+	if (ActiveAccount == event.GetString()){
+	
+		wxTreeEvent NullEvent;
+		LoadContactList(NullEvent);
+	
+	}
+
 }
\ No newline at end of file