X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Factmgr%2FfrmActivityMgr.h;h=9947ea4834f5e20a5a4ac1def3593f3aa1e2fca5;hb=2c8998278759b5bf6fc3bcf75afd289c214b6c84;hp=55458b1884d746c1d915e47e649e15be8cd4dee7;hpb=17ceb4e3a5a0b0fdb902775773699bfbbccc7b5c;p=xestiaab%2F.git

diff --git a/source/actmgr/frmActivityMgr.h b/source/actmgr/frmActivityMgr.h
index 55458b1..9947ea4 100644
--- a/source/actmgr/frmActivityMgr.h
+++ b/source/actmgr/frmActivityMgr.h
@@ -33,11 +33,17 @@ 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
 
 //// end generated include
 
@@ -48,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;
@@ -95,11 +102,13 @@ class frmActivityMgr : public frmActivityMgrADT
 		std::map<int,int> ActivityListType;
 		std::map<int,long> ActivityListIndex;
 		std::map<int,wxString> ActivityListData;
+		std::map<int,wxString> ActivityListURL;
+		std::map<int,bool> ActivityListEditMode;
 		std::map<int,wxString> ActivityListTaskDetail;
 		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;
@@ -107,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;
@@ -127,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 */