X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;ds=sidebyside;f=source%2FfrmMain.h;h=744bf32b8881fa6ffe7b2eec4ef58a6ef78dc102;hb=2c8998278759b5bf6fc3bcf75afd289c214b6c84;hp=d4661df213ab2eee0081f4f0431aa29f503291bf;hpb=e0521275eee34ef6feb06612512c611bb3c3b518;p=xestiaab%2F.git
diff --git a/source/frmMain.h b/source/frmMain.h
index d4661df..744bf32 100644
--- a/source/frmMain.h
+++ b/source/frmMain.h
@@ -1,3 +1,21 @@
+// frmMain.h - Main window header 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
+
#ifndef __frmMain__
#define __frmMain__
@@ -19,6 +37,13 @@ Subclass of frmMainADT, which is generated by wxFormBuilder.
#include
#include
+#if defined(__APPLE__)
+#import
+#import
+#elif defined(__WIN32__)
+#include "common/win32ssl.h"
+#endif
+
#include "common/timers.h"
#include "common/events.h"
#include "common/etag.h"
@@ -50,12 +75,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;
@@ -98,7 +128,13 @@ class frmMain : public frmMainADT
std::map WindowList;
std::map AccountRefreshList;
std::map AccountAccDirList;
- std::map AccountSSLData;
+#if defined(__APPLE__)
+ std::map AccountTrustData;
+#elif defined(__WIN32__)
+ std::map AccountCertificateData;
+#else
+ std::map AccountSSLData;
+#endif
std::map AccountSSLResult;
std::multimap AccountGroupList;
std::multimap AccountGroupFilename;
@@ -136,6 +172,7 @@ class frmMain : public frmMainADT
int AccountID;
int AccountNetID;
int AccountGrpID;
+ int AccountUnsupportedID;
int AccountNoneID;
bool ReloadAccounts = FALSE;
bool AscendingMode = FALSE;
@@ -159,6 +196,11 @@ class frmMain : public frmMainADT
int ContactEditorUID = 0;
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 );
@@ -188,7 +230,6 @@ class frmMain : public frmMainADT
void RevealContact( wxCommandEvent& event );
void RemoveContactsWindowPointer(wxCommandEvent& event);
void RemoveContactEditorWindowPointer(wxCommandEvent& event);
- void UpdateWindowList(wxCommandEvent& event);
void RemoveContactSearchWindows(wxCommandEvent& event);
void DeleteContact(wxCommandEvent& event);
void EmptyServerDialog(wxCommandEvent& event);
@@ -214,6 +255,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 );
@@ -233,11 +275,17 @@ 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
DECLARE_EVENT_TABLE()
//// end generated class members