X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Factmgr%2FfrmActivityMgr.h;h=2c6ffc6d0c45a6515222762c6f8332fdd0e8065d;hb=d042c124580649327968a6950ef8e6f0ca2be399;hp=45f56fbdfff37275c1fb53174a01c5cf281bc51d;hpb=4bf3e76fa05aad77c1cd5673dd87a551dbffc718;p=xestiaab%2F.git

diff --git a/source/actmgr/frmActivityMgr.h b/source/actmgr/frmActivityMgr.h
index 45f56fb..2c6ffc6 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;
@@ -69,6 +76,16 @@ struct SSLInvalidTrustNotifObj{
 };
 #endif
 
+struct ActivityMgrAccountSettings{
+	wxString Address;
+	int Port;
+	wxString Username;
+	wxString Password;
+	bool SSL;
+	wxString Prefix;
+	wxString Dir;
+};
+
 /** Implementing frmActivityMgrADT */
 class frmActivityMgr : public frmActivityMgrADT
 {
@@ -85,18 +102,22 @@ 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;
 		std::map<int,wxDateTime> ActivityListFinDate;
 		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;
@@ -116,11 +137,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 */