Move INSTALL, LICENSE, README, THANKS and TODO into root directory

[xestiaab/.git] / source / frmNewAccount.h

diff --git a/source/frmNewAccount.h b/source/frmNewAccount.h
index 5261f78..6ef8b0c 100644 (file)
--- a/source/frmNewAccount.h
+++ b/source/frmNewAccount.h
@@ -25,7 +25,15 @@
  */
 
 #include "AppXestiaAddrBk.h"
+#include "carddav2/carddav2.h"
+
+#include "frmInvalidSSLCertificate.h"
+
 #include <wx/fileconf.h>
+#include <string>
+
+DECLARE_EVENT_TYPE(UPDATERESULTS, wxID_ANY);
+DECLARE_EVENT_TYPE(RUNCARDDAV2TEST, wxID_ANY);
 
 //// end generated include
 
@@ -33,22 +41,39 @@
 class frmNewAccount : public frmNewAccountADT
 {
 protected:
-    // Handlers for frmNewAccountADT events.
-    void CheckAccountName( wxCommandEvent& event );
-    void ProcessPrevious( wxCommandEvent& event );
-    void ProcessNext( wxCommandEvent& event );
-    void CloseWindow( wxCommandEvent& event );
-    void UpdateRequirements( wxCommandEvent& event );
-    void WriteAccountDetails( wxFileConfig *cfgfilein, wxString AccountType, wxString DirectoryName );
+       // Handlers for frmNewAccountADT events.
+       void CheckAccountName( wxCommandEvent& event );
+       void ProcessPrevious( wxCommandEvent& event );
+       void ProcessNext( wxCommandEvent& event );
+       void CloseWindow( wxCommandEvent& event );
+       void UpdateRequirements( wxCommandEvent& event );
+       void UpdateResults( wxCommandEvent& event );
+       void WriteAccountDetails( wxFileConfig *cfgfilein, wxString AccountType, wxString DirectoryName );
+       void RunCardDAV2Test( wxCommandEvent& event );
+#if defined(__APPLE__)
+       int DisplayTrustPanel(ConnectionObject *Connection);
+       SecTrustResultType ProcessResultType(ConnectionObject *Connection);
+#endif
 public:
-    /** Constructor */
-    frmNewAccount( wxWindow* parent );
-    void SetupPointers(bool *ReloadAccountInc);
-    //// end generated class members
+       /** Constructor */
+       frmNewAccount( wxWindow* parent );
+       void SetupPointers(bool *ReloadAccountInc);
+       DECLARE_EVENT_TABLE()
+       //// end generated class members
 private:
-    int PageSeek = 0;
-    wxString ServerPrefix;
-    bool ReloadAccountConfig = FALSE;
+       int PageSeek = 0;
+       wxString ServerPrefix;
+       bool *ReloadAccountConfig = NULL;
+       void SetErrorMessageLabel();
+       struct NewAccountResult{
+               bool Connected = false;
+               bool SSLStatus = false;
+               COSSLVerified SSLVerified = COSSL_NORESULT;
+               bool ValidResponse = false;
+               bool AuthPassed = false;
+               bool CanProcess = false;
+               std::string ErrorMessage = "";
+       };
 };
 
 #endif // __frmNewAccount__