Merge branch 'master' of ssh://gelforn.xestia.co.uk/scmrepos/xestiaab

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

diff --git a/source/actmgr/frmActivityMgr.h b/source/actmgr/frmActivityMgr.h
index 45f56fb..2fe3807 100644 (file)
--- a/source/actmgr/frmActivityMgr.h
+++ b/source/actmgr/frmActivityMgr.h
@@ -39,6 +39,10 @@ Subclass of frmActivityMgrADT, which is generated by wxFormBuilder.
 #include "../common/dirs.h"
 #include "../common/preferences.h"
 
+#if defined(__WIN32__)
+#include "../common/win32ssl.h"
+#endif
+
 //// end generated include
 
 DECLARE_EVENT_TYPE(ACTMGR_RESUMEPROC, wxID_ANY)
@@ -69,6 +73,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,11 +99,14 @@ 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,ActivityMgrAccountSettings> ActivityListAccSettings;
                std::map<int,wxString> ActivityListETag;
                std::map<int,wxString> ActivityListETagOriginal;
                std::map<int,wxDateTime> ActivityListFinDate;