Removed references of CardDAV and delete ConnectionObject when finished

[xestiaab/.git] / source / actmgr / frmActivityMgr.h

diff --git a/source/actmgr/frmActivityMgr.h b/source/actmgr/frmActivityMgr.h
index fec4778..9947ea4 100644 (file)
--- a/source/actmgr/frmActivityMgr.h
+++ b/source/actmgr/frmActivityMgr.h
@@ -33,13 +33,14 @@ Subclass of frmActivityMgrADT, which is generated by wxFormBuilder.
 #endif
 
 #include "../AppXestiaAddrBk.h"
-#include "../carddav/carddav.h"
 #include "../common/timers.h"
 #include "../common/etag.h"
 #include "../common/dirs.h"
 #include "../common/preferences.h"
 #include "../common/sslcertstructs.h"
-
+#include "../connobject/ConnectionObject.h"
+#include "../carddav2/carddav2.h"
+       
 #if defined(__WIN32__)
 #include "../common/win32ssl.h"
 #endif
@@ -53,6 +54,7 @@ DECLARE_EVENT_TYPE(ACTMGR_STOPTIMER, wxID_ANY)
 DECLARE_EVENT_TYPE(ACTMGR_STARTPROCESSTIMER, wxID_ANY)
 DECLARE_EVENT_TYPE(ACTMGR_STOPPROCESSTIMER, wxID_ANY)
 DECLARE_EVENT_TYPE(ACTMGR_UPDATESTATUSLABEL, wxID_ANY)
+DECLARE_EVENT_TYPE(ACTMGR_STARTANIMATIONTIMER, wxID_ANY)
 
 struct vCardDownloadDataFileClass{
        unsigned int DataType = 0;
@@ -106,7 +108,7 @@ class frmActivityMgr : public frmActivityMgrADT
                std::map<int,wxString> ActivityListAccount;
                std::map<int,wxString> ActivityListFilename;
                std::map<int,wxString> ActivityListFullFilename;
-               std::map<int,CardDAV*> ActivityListConn;
+               std::map<int,ConnectionObject*> ActivityListConnObject;
                std::map<int,ActivityMgrAccountSettings> ActivityListAccSettings;
                std::map<int,wxString> ActivityListETag;
                std::map<int,wxString> ActivityListETagOriginal;
@@ -114,7 +116,7 @@ class frmActivityMgr : public frmActivityMgrADT
                std::map<int,wxArrayString> ActivityListLog;
                bool WindowOpen = FALSE;
                bool TasksActive = FALSE;
-               bool SleepMode = FALSE;
+               bool ApplicationSleepMode = FALSE;
                bool ProcessTasksData = FALSE;
                //int ConflictResult = 0;
                wxETagProcessTimer *ETagTmrPtr;
@@ -134,11 +136,14 @@ class frmActivityMgr : public frmActivityMgrADT
                void StopTimer( wxCommandEvent& event );
                void StartProcessTimer( wxCommandEvent& event );
                void StopProcessTimer( wxCommandEvent& event );
+               void StartAnimationTimer(wxCommandEvent& event);
                void FlushAllTasks();
                void RemoveTask();
                void ProcessTasksThread();
                void ToggleConnectionStatus( wxCommandEvent& event );
+               void SleepMode( wxCommandEvent &event );
                void WriteServerCertificate(wxString AccountName, SSLCertCollection SSLCertInc);
+               void WriteServerCertificate(wxString AccountName, SSLCertCollectionString SSLCertInc);
                void UpdateStatusLabel( wxCommandEvent& event );
        public:
                /** Constructor */