X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FfrmMain.h;h=dd4273bba8d92090d309019638e6ca674dc4a571;hp=6ae03eab1b1218b733328f53538e0f0c164e467c;hb=60610b9783dc136d455389227c1b71627f47aba5;hpb=77b9956953d1e3abb804d6c266c2c64e7b50d9d2

diff --git a/source/frmMain.h b/source/frmMain.h
index 6ae03ea..dd4273b 100644
--- a/source/frmMain.h
+++ b/source/frmMain.h
@@ -37,9 +37,17 @@ Subclass of frmMainADT, which is generated by wxFormBuilder.
 #include <wx/mstream.h>
 #include <wx/tooltip.h>
 
+#if defined(__APPLE__)
+#import <Foundation/Foundation.h>
+#import <SecurityInterface/SFCertificateTrustPanel.h>
+#elif defined(__WIN32__)
+#include "common/win32ssl.h"
+#endif
+
 #include "common/timers.h"
 #include "common/events.h"
 #include "common/etag.h"
+#include "common/structs.h"
 #include "bitmaps.h"
 #include "common/sslcertstructs.h"
 #include "widgets/XABContactMenu.h"
@@ -68,12 +76,17 @@ DECLARE_EVENT_TYPE(WINDOW_EDIT, wxID_ANY);
 DECLARE_EVENT_TYPE(WINDOW_CLOSE, wxID_ANY);
 DECLARE_EVENT_TYPE(CONNSTAT_UPDATE, wxID_ANY);
 DECLARE_EVENT_TYPE(INVALIDSSLCERT, wxID_ANY);
+DECLARE_EVENT_TYPE(INVALIDSSLCERTSTRING, wxID_ANY);
 DECLARE_EVENT_TYPE(GETSELECTEDLIST, wxID_ANY);
 DECLARE_EVENT_TYPE(SYNCACCOUNT, wxID_ANY);
 DECLARE_EVENT_TYPE(IMPORT_RESULTSSHOW, wxID_ANY);
 DECLARE_EVENT_TYPE(RELOADCONTACTLIST, wxID_ANY);
 DECLARE_EVENT_TYPE(REFRESHADDRESSBOOK, wxID_ANY);
 
+#if defined(__APPLE__)
+DECLARE_EVENT_TYPE(INVALIDSSLTRUST, wxID_ANY);
+#endif
+
 struct UCNotif{
 	wxString ContactAccount;
 	wxString ContactFilename;
@@ -87,11 +100,6 @@ struct SWCloseNotif{
 	void *SCHWinPtr;
 };
 
-struct QRNotif{
-	int *QResponse;
-	bool *PausePtr;
-};
-
 struct XABViewMode{
 
 	int SortMode;
@@ -116,7 +124,13 @@ class frmMain : public frmMainADT
 		std::map<wxString, bool> WindowList;
 		std::map<int, wxTimer> AccountRefreshList;
 		std::map<int, wxString> AccountAccDirList;
-		std::map<int, SSLCertCollection> AccountSSLData;
+#if defined(__APPLE__)
+		std::map<int, SecTrustRef> AccountTrustData;
+#elif defined(__WIN32__)
+		std::map<int, PCCERT_CONTEXT> AccountCertificateData;
+#else
+		std::map<int, SSLCertCollectionString> AccountSSLData;
+#endif
 		std::map<int, int> AccountSSLResult;
 		std::multimap<int, int> AccountGroupList;
 		std::multimap<int, wxString> AccountGroupFilename;
@@ -134,7 +148,6 @@ class frmMain : public frmMainADT
 		std::map<int,wxMenuItem*> WindowListPointersMenu;
 		std::map<int,void*> WindowListPointers;
 		std::map<int,int> WindowListType;
-		//std::map<int,int> WindowListType;
 		wxMenuItem *mnuContactWindows;
 		wxMenuItem *mnuContactEditorWindows;
 		wxMenuItem *mnuSearchWindows;
@@ -142,18 +155,15 @@ class frmMain : public frmMainADT
 		bool RevealWait = FALSE;
 		wxString SessionID;
 		wxString OldSessionID;
+		wxColour ContactBackgroundColour;
 		wxIcon IconEmp;
-		//wxIcon Emp;
-		//wxComboCtrl* AccControl = new wxGenericComboCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize);
-		//wxComboCtrl* AccControl = new wxComboCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCB_READONLY|wxEXPAND|wxCC_STD_BUTTON);
-		//wxStaticBitmap* AccIcon = new wxStaticBitmap(this, wxID_ANY, IconEmp, wxDefaultPosition, wxSize(16,16), wxALL|wxEXPAND, wxStaticBitmapNameStr);
 		XABAccountView* treAccounts = new XABAccountView();
 		wxImageList *AccImgList =  new wxImageList(16,16,true);
 		wxImageList *ActMgrImgList = new wxImageList(16,16,true);
-		//wxIcon wxIAccInet;
 		int AccountID;
 		int AccountNetID;
 		int AccountGrpID;
+		int AccountUnsupportedID;
 		int AccountNoneID;
 		bool ReloadAccounts = FALSE;
 		bool AscendingMode = FALSE;
@@ -171,6 +181,12 @@ class frmMain : public frmMainADT
 		wxBitmap *imgSSLWarning = NULL;
 		wxBitmap *imgOnline = NULL;
 		wxBitmap *imgOffline = NULL;
+		wxBitmap *imgAddAddressBook = NULL;
+		wxBitmap *imgPreferences = NULL;
+		wxBitmap *imgSearchContacts = NULL;
+		wxBitmap *imgAddContact = NULL;
+		wxBitmap *imgEditContact = NULL;
+		wxBitmap *imgDeleteContact = NULL;
 		int ActivityIconStatus = 0;
 		int SearchUID = 0;
 		int ContactUID = 0;
@@ -178,6 +194,10 @@ class frmMain : public frmMainADT
 		int WindowMenuItemID = 0;
 		XABContactMenu *ContactMenu = new XABContactMenu(XABCONTACTMENU_MAIN); 
 		void ResetContactInfo();
+#if defined(__APPLE__)
+		void DisplayCertificate(SecTrustRef SecurityTrustObject);
+		void DisplayTrustPanel( wxCommandEvent& event );
+#endif
 	protected:
 		// Handlers for frmMainADT events.
 		void QuitApp( wxCloseEvent& event );
@@ -232,6 +252,7 @@ class frmMain : public frmMainADT
 		void UpdateConnectionStatus( wxCommandEvent& event );
 		void SetupSSLStatus( int AccountID );
 		void InvalidSSLCertificate( wxCommandEvent& event );
+		void InvalidSSLCertificateString( wxCommandEvent& event );
 		void CheckUpdates( wxCommandEvent& event );
 		void OpenImportDialog( wxCommandEvent& event );
 		void OpenExportDialog( wxCommandEvent& event );
@@ -251,11 +272,18 @@ class frmMain : public frmMainADT
 		void ActivityIconStop( wxCommandEvent& event );
 		void PauseAllTimers();
 		void ResumeAllTimers();
-		void UpdateSSLAccountStatus(int AccountID, int SSLStatus, SSLCertCollection SSLCertInc);
 		void GetListControl(wxListCtrl *lstContactsPtr, wxArrayString *ContactsFileIndexPtr);
 		void ShowImportResults( wxCommandEvent& event );
 		void ReloadContactList( wxCommandEvent& event );
 		XABViewMode GetViewMode();
+#if defined(__APPLE__)
+		void UpdateSSLAccountStatus(int AccountID, int SSLStatus, SecTrustRef SecurityTrustObject);
+#elif defined(__WIN32__)
+		void UpdateSSLAccountStatus(int AccountID, int SSLStatus, PCCERT_CONTEXT CertificateContext);
+#else
+		void UpdateSSLAccountStatus(int AccountID, int SSLStatus, SSLCertCollectionString SSLCertInc);
+#endif
+		bool CloseAllWindows();
 		DECLARE_EVENT_TABLE()
 
 	//// end generated class members