X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FfrmMain.cpp;h=4dc43f6d90f1837155cf24e5886edaece88f4da9;hp=b8a80cf47170b37ffa08cb1f8271e98f376d6af6;hb=25716f74ecdac6cd5879b659ebc8aaa668261880;hpb=2b8ca7c8528a738a40d099e2cce5b974bc741699

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index b8a80cf..4dc43f6 100644
--- a/source/frmMain.cpp
+++ b/source/frmMain.cpp
@@ -54,7 +54,6 @@
 #include "common/events.h"
 #include "common/dirs.h"
 #include "vcard/vcard.h"
-#include "carddav/carddav.h"
 #include "contacteditor/frmContactEditor.h"
 #include "import/import.h"
 #include "export/export.h"
@@ -85,6 +84,7 @@ DEFINE_EVENT_TYPE(WINDOW_EDIT);
 DEFINE_EVENT_TYPE(WINDOW_CLOSE);
 DEFINE_EVENT_TYPE(CONNSTAT_UPDATE);
 DEFINE_EVENT_TYPE(INVALIDSSLCERT);
+DEFINE_EVENT_TYPE(INVALIDSSLCERTSTRING);
 DEFINE_EVENT_TYPE(GETSELECTEDLIST);
 DEFINE_EVENT_TYPE(SYNCACCOUNT);
 DEFINE_EVENT_TYPE(IMPORT_RESULTSSHOW);
@@ -117,6 +117,7 @@ EVT_COMMAND(wxID_ANY, WINDOW_EDIT, frmMain::WindowEdit)
 EVT_COMMAND(wxID_ANY, WINDOW_CLOSE, frmMain::WindowDelete)
 EVT_COMMAND(wxID_ANY, CONNSTAT_UPDATE, frmMain::UpdateConnectionStatus)
 EVT_COMMAND(wxID_ANY, INVALIDSSLCERT, frmMain::InvalidSSLCertificate)
+EVT_COMMAND(wxID_ANY, INVALIDSSLCERTSTRING, frmMain::InvalidSSLCertificateString)
 EVT_COMMAND(wxID_ANY, GETSELECTEDLIST, frmMain::GetSelectedList)
 EVT_COMMAND(wxID_ANY, SYNCACCOUNT, frmMain::SyncAccount)
 EVT_COMMAND(wxID_ANY, IMPORT_RESULTSSHOW, frmMain::ShowImportResults)
@@ -189,7 +190,40 @@ frmMainADT( parent )
     
 	wxImage icons_nossl_png(nosslstream, wxBITMAP_TYPE_PNG);
 	imgNoSSL = new wxBitmap(icons_nossl_png, -1);
-    
+ 
+	// Toolbar icons.
+
+	wxMemoryInputStream addaddressbook(toolbar_addaddressbook_png, sizeof(toolbar_addaddressbook_png));
+	wxMemoryInputStream preferences(toolbar_preferences_png, sizeof(toolbar_preferences_png));
+	wxMemoryInputStream searchcontacts(toolbar_searchcontacts_png, sizeof(toolbar_searchcontacts_png));
+	wxMemoryInputStream addcontact(toolbar_addcontact_png, sizeof(toolbar_addcontact_png));
+	wxMemoryInputStream editcontact(toolbar_editcontact_png, sizeof(toolbar_editcontact_png));
+	wxMemoryInputStream deletecontact(toolbar_deletecontact_png, sizeof(toolbar_deletecontact_png));
+
+	wxImage toolbar_addaddressbook_png(addaddressbook, wxBITMAP_TYPE_PNG);
+	imgAddAddressBook = new wxBitmap (toolbar_addaddressbook_png, -1);
+	tblMain->SetToolNormalBitmap(tbtNewAccount->GetId(), *imgAddAddressBook);
+
+	wxImage toolbar_preferences_png(preferences, wxBITMAP_TYPE_PNG);
+	imgPreferences = new wxBitmap (toolbar_preferences_png, -1);
+	tblMain->SetToolNormalBitmap(tbtPreferences->GetId(), *imgPreferences);
+
+	wxImage toolbar_searchcontacts_png(searchcontacts, wxBITMAP_TYPE_PNG);
+	imgSearchContacts = new wxBitmap (toolbar_searchcontacts_png, -1);
+	tblMain->SetToolNormalBitmap(tbtSearch->GetId(), *imgSearchContacts);
+
+	wxImage toolbar_addcontact_png(addcontact, wxBITMAP_TYPE_PNG);
+	imgAddContact = new wxBitmap (toolbar_addcontact_png, -1);
+	tblMain->SetToolNormalBitmap(tbtAddContact->GetId(), *imgAddContact);
+	
+	wxImage toolbar_editcontact_png(editcontact, wxBITMAP_TYPE_PNG);
+	imgEditContact = new wxBitmap (toolbar_editcontact_png, -1);
+	tblMain->SetToolNormalBitmap(tbtEditContact->GetId(), *imgEditContact);
+	
+	wxImage toolbar_deletecontact_png(deletecontact, wxBITMAP_TYPE_PNG);
+	imgDeleteContact = new wxBitmap (toolbar_deletecontact_png, -1);
+	tblMain->SetToolNormalBitmap(tbtDeleteContact->GetId(), *imgDeleteContact);
+
 	// Activity Icon.
     
 	wxMemoryInputStream act1(icons_act1_png, sizeof(icons_act1_png));
@@ -356,17 +390,11 @@ void frmMain::QuitApp()
 {
 
 	// Function to run when quitting.
-    
-	//Go through the windows and close each one (be it search
-	//or contact editor). Abort if user wants to cancel.
-    
-	// Close the contact editor windows.
-    
-	// Close the contact windows.
-    
-	// Close the search windows.
-    
+	
 	// Write out the ETag databases.
+	
+	ETagProcTimer.Stop();
+	ETagProcTimer.Notify();
     
 	// Save Preferences: Save the window position if that option is enabled.
     
@@ -2103,13 +2131,14 @@ void frmMain::DeleteContact(wxCommandEvent& event){
 			if (nextChild == selectedChild){
 			
 				wxSDataURL = prefaccounts.GetAccountDirPrefix(i) + wxT("/") + wxSplitFilename;
+				break;
 
 			}
             
 		}
         
 		// Add task to the activity monitor to delete the contact.
-        
+		
 		frameActMgr->AddTask(2, wxSContactName, ActiveAccount, wxSDataURL, wxSplitFilename, ContactsFileIndex[intContactSeekNum], wxT(""));
         
 	}
@@ -2650,7 +2679,7 @@ void frmMain::ShowSSLCertificates( wxCommandEvent &event ){
 
 #else
     
-	std::map<int, SSLCertCollection>::iterator SSLColIter;
+	std::map<int, SSLCertCollectionString>::iterator SSLColIter;
         
 	for (int i = 0; i < prefaccounts.GetCount(); i++){
         
@@ -2677,11 +2706,11 @@ void frmMain::ShowSSLCertificates( wxCommandEvent &event ){
             
 			SSLColIter = AccountSSLData.find(i);
             
-			SSLCertCollection SSLCertInfo = SSLColIter->second;
-            
+			SSLCertCollectionString SSLCertInfo = SSLColIter->second;
+			
 			frmSSLCertificate *frameSSLCert = new frmSSLCertificate ( this );
 			frameSSLCert->StartCertFrom(0);
-			frameSSLCert->SetupCerts(SSLCertInfo);
+			frameSSLCert->SetupCertsString(SSLCertInfo);
 			frameSSLCert->ShowModal();
             
 			delete frameSSLCert;
@@ -2750,6 +2779,31 @@ void frmMain::InvalidSSLCertificate( wxCommandEvent &event ){
         
 }
 
+void frmMain::InvalidSSLCertificateString( wxCommandEvent &event ){
+    
+	// Display the form for showing an invalid SSL certificate.
+    
+	frmInvalidSSLCertificate *frameISC = new frmInvalidSSLCertificate ( this );
+	SSLInvalidCertNotifObjString *SSLICNObj = (SSLInvalidCertNotifObjString*)event.GetClientData();
+	SSLCertCollectionString SSLCCData = SSLICNObj->CertCollection;
+	wxString AccountName = SSLICNObj->AccountName;
+	frameISC->LoadData(SSLCCData, AccountName);
+	frameISC->ShowModal();
+    
+	int FinalConflictResult = frameISC->GetResult();
+    
+	wxCommandEvent event2(ACTMGR_RESUMEPROC);
+	event2.SetClientData(SSLICNObj->QRNotifData);
+	event2.SetInt(FinalConflictResult);
+    
+	delete frameISC;
+	frameISC = NULL;
+    
+	frmActivityMgr *frameActMgr = static_cast<frmActivityMgr*>(ActMgrPtr);	
+	wxPostEvent(frameActMgr, event2);
+        
+}
+
 void frmMain::PauseAllTimers(){
     
 	// Pause all the account timers.
@@ -2802,7 +2856,7 @@ void frmMain::UpdateSSLAccountStatus(int AccountID, int SSLStatus, PCCERT_CONTEX
 
 #else
 
-void frmMain::UpdateSSLAccountStatus(int AccountID, int SSLStatus, SSLCertCollection SSLCertInc){
+void frmMain::UpdateSSLAccountStatus(int AccountID, int SSLStatus, SSLCertCollectionString SSLCertInc){
     
 	// Delete existing data.