Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added code to setup toolbar in frmMain
[xestiaab/.git]
/
source
/
frmMain.h
diff --git
a/source/frmMain.h
b/source/frmMain.h
index
e3844af
..
24f4032
100644
(file)
--- a/
source/frmMain.h
+++ b/
source/frmMain.h
@@
-40,6
+40,8
@@
Subclass of frmMainADT, which is generated by wxFormBuilder.
#if defined(__APPLE__)
#import <Foundation/Foundation.h>
#import <SecurityInterface/SFCertificateTrustPanel.h>
#if defined(__APPLE__)
#import <Foundation/Foundation.h>
#import <SecurityInterface/SFCertificateTrustPanel.h>
+#elif defined(__WIN32__)
+#include "common/win32ssl.h"
#endif
#include "common/timers.h"
#endif
#include "common/timers.h"
@@
-73,6
+75,7
@@
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(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(GETSELECTEDLIST, wxID_ANY);
DECLARE_EVENT_TYPE(SYNCACCOUNT, wxID_ANY);
DECLARE_EVENT_TYPE(IMPORT_RESULTSSHOW, wxID_ANY);
@@
-127,8
+130,10
@@
class frmMain : public frmMainADT
std::map<int, wxString> AccountAccDirList;
#if defined(__APPLE__)
std::map<int, SecTrustRef> AccountTrustData;
std::map<int, wxString> AccountAccDirList;
#if defined(__APPLE__)
std::map<int, SecTrustRef> AccountTrustData;
+#elif defined(__WIN32__)
+ std::map<int, PCCERT_CONTEXT> AccountCertificateData;
#else
#else
- std::map<int, SSLCertCollection> AccountSSLData;
+ std::map<int, SSLCertCollection
String
> AccountSSLData;
#endif
std::map<int, int> AccountSSLResult;
std::multimap<int, int> AccountGroupList;
#endif
std::map<int, int> AccountSSLResult;
std::multimap<int, int> AccountGroupList;
@@
-167,6
+172,7
@@
class frmMain : public frmMainADT
int AccountID;
int AccountNetID;
int AccountGrpID;
int AccountID;
int AccountNetID;
int AccountGrpID;
+ int AccountUnsupportedID;
int AccountNoneID;
bool ReloadAccounts = FALSE;
bool AscendingMode = FALSE;
int AccountNoneID;
bool ReloadAccounts = FALSE;
bool AscendingMode = FALSE;
@@
-184,6
+190,12
@@
class frmMain : public frmMainADT
wxBitmap *imgSSLWarning = NULL;
wxBitmap *imgOnline = NULL;
wxBitmap *imgOffline = NULL;
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;
int ActivityIconStatus = 0;
int SearchUID = 0;
int ContactUID = 0;
@@
-249,6
+261,7
@@
class frmMain : public frmMainADT
void UpdateConnectionStatus( wxCommandEvent& event );
void SetupSSLStatus( int AccountID );
void InvalidSSLCertificate( wxCommandEvent& event );
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 );
void CheckUpdates( wxCommandEvent& event );
void OpenImportDialog( wxCommandEvent& event );
void OpenExportDialog( wxCommandEvent& event );
@@
-274,8
+287,10
@@
class frmMain : public frmMainADT
XABViewMode GetViewMode();
#if defined(__APPLE__)
void UpdateSSLAccountStatus(int AccountID, int SSLStatus, SecTrustRef SecurityTrustObject);
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
#else
- void UpdateSSLAccountStatus(int AccountID, int SSLStatus, SSLCertCollection SSLCertInc);
+ void UpdateSSLAccountStatus(int AccountID, int SSLStatus, SSLCertCollection
String
SSLCertInc);
#endif
DECLARE_EVENT_TABLE()
#endif
DECLARE_EVENT_TABLE()
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy