X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Factmgr%2FfrmActivityMgr-tasks.cpp;h=513b8fe0d2600613d8b5ce90ab803ac8b2846b71;hb=d269801e3d32dbbea14af5f261190ef097635fce;hp=fe6eb3dfb7871199cd15052c72e0a0cdce662ce0;hpb=14126c5545a63de9b0f4d189d5ad796b94d5a8e9;p=xestiaab%2F.git

diff --git a/source/actmgr/frmActivityMgr-tasks.cpp b/source/actmgr/frmActivityMgr-tasks.cpp
index fe6eb3d..513b8fe 100644
--- a/source/actmgr/frmActivityMgr-tasks.cpp
+++ b/source/actmgr/frmActivityMgr-tasks.cpp
@@ -31,7 +31,11 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
 	coldata.SetId(ActivityTaskID);
 	coldata.SetData(ActivityTaskID);
 
-	AnimationTimer.StartAnimation();
+	if (ApplicationSleepMode == FALSE){
+		
+		AnimationTimer.StartAnimation();
+		
+	}
 
 	// Get the preferences file.
 	
@@ -79,6 +83,15 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
 	
 	}
 	
+	ActivityMgrAccountSettings AccountSettings;
+	AccountSettings.Address = AccountAddress;
+	AccountSettings.Port = AccountPort;
+	AccountSettings.Username = AccountUsername;
+	AccountSettings.Password = AccountPassword;
+	AccountSettings.SSL = AccountSSL;
+	AccountSettings.Prefix = AccountPrefix;
+	AccountSettings.Dir = AccountDir;
+	
 	CardDAVConn->SetupConnection(AccountAddress, AccountPort, AccountUsername, AccountPassword, AccountSSL, AccountPrefix, AccountDir);
 	CardDAVConn->SetupVariables(&ActivityList, ActivityTaskID);
 	CardDAVConn->SetupResultBools(&BlankBool, &BlankBool);		
@@ -104,14 +117,21 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
 
 		ETagDB *ETagDBPtr = ETagTmrPtr->GetPointer(AccountDir);
 		
+		CardDAV2 *ConnObject = new CardDAV2(AccountAddress.ToStdString(), AccountPort, AccountUsername.ToStdString(), AccountPassword.ToStdString(), AccountSSL, AccountPrefix.ToStdString(), AccountDir.ToStdString());
+		ConnObject->SetupConnectionObject();
+		
 		ActivityListType.insert(std::make_pair(ActivityTaskID, 0));
 		ActivityListData.insert(std::make_pair(ActivityTaskID, TaskData));
+		ActivityListURL.insert(std::make_pair(ActivityTaskID, TaskURL));
+		ActivityListEditMode.insert(std::make_pair(ActivityTaskID, false));
 		ActivityListConn.insert(std::make_pair(ActivityTaskID, CardDAVConn));
+		ActivityListConnObject.insert(std::make_pair(ActivityTaskID, ConnObject));
 		ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex));
 		ActivityListTaskDetail.insert(std::make_pair(ActivityTaskID, TaskDetail));
 		ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount));
 		ActivityListFilename.insert(std::make_pair(ActivityTaskID, TaskFilename));
 		ActivityListFullFilename.insert(std::make_pair(ActivityTaskID, TaskFullFilename));
+		ActivityListAccSettings.insert(std::make_pair(ActivityTaskID, AccountSettings));
 		
 		ActivityListETag.insert(std::make_pair(ActivityTaskID, ETagDBPtr->GetETag(TaskFilename)));
 		ActivityListETagOriginal.insert(std::make_pair(ActivityTaskID, ETagDBPtr->GetETagOriginal(TaskFilename)));
@@ -125,20 +145,22 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
 		lstActivity->SetItem(itemindex, 1, AccountName);
 		lstActivity->SetItem(itemindex, 2, _("Queued"));
 		
-		CardDAVConn->SetUploadMode(TRUE);
-		CardDAVConn->SetupData(wxT("PUT"), TaskURL, TaskData);
-		CardDAVConn->SetEditMode(TRUE);
-		
 		ETagDB *ETagDBPtr = ETagTmrPtr->GetPointer(AccountDir);
+
+		CardDAV2 *ConnObject = new CardDAV2(AccountAddress.ToStdString(), AccountPort, AccountUsername.ToStdString(), AccountPassword.ToStdString(), AccountSSL, AccountPrefix.ToStdString(), AccountDir.ToStdString());
+		ConnObject->SetupConnectionObject();
 		
 		ActivityListType.insert(std::make_pair(ActivityTaskID, 1));
 		ActivityListData.insert(std::make_pair(ActivityTaskID, TaskData));
-		ActivityListConn.insert(std::make_pair(ActivityTaskID, CardDAVConn));
+		ActivityListURL.insert(std::make_pair(ActivityTaskID, TaskURL));
+		ActivityListEditMode.insert(std::make_pair(ActivityTaskID, true));
+		ActivityListConnObject.insert(std::make_pair(ActivityTaskID, ConnObject));
 		ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex));
 		ActivityListTaskDetail.insert(std::make_pair(ActivityTaskID, TaskDetail));
 		ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount));
 		ActivityListFilename.insert(std::make_pair(ActivityTaskID, TaskFilename));
 		ActivityListFullFilename.insert(std::make_pair(ActivityTaskID, TaskFullFilename));
+		ActivityListAccSettings.insert(std::make_pair(ActivityTaskID, AccountSettings));
 		
 		ActivityListETag.insert(std::make_pair(ActivityTaskID, ETagDBPtr->GetETag(TaskFilename)));
 		ActivityListETagOriginal.insert(std::make_pair(ActivityTaskID, ETagDBPtr->GetETagOriginal(TaskFilename)));
@@ -158,9 +180,9 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
 		ActivityListType.insert(std::make_pair(ActivityTaskID, 2));
 		ActivityListData.insert(std::make_pair(ActivityTaskID, TaskData));
 		ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount));
-		ActivityListConn.insert(std::make_pair(ActivityTaskID, CardDAVConn));
 		ActivityListFilename.insert(std::make_pair(ActivityTaskID, TaskFilename));
 		ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex));
+		ActivityListAccSettings.insert(std::make_pair(ActivityTaskID, AccountSettings));
 	
 	} else if (TaskType == 3){
 
@@ -177,12 +199,13 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
 		ActivityListTaskDetail.insert(std::make_pair(ActivityTaskID, AccountPrefix));
 		ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount));
 		ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex));
+		ActivityListAccSettings.insert(std::make_pair(ActivityTaskID, AccountSettings));
 	
 	}
 	
 	ProcessTasksData = TRUE;
 	
-	if (!ActProcessTimer.IsRunning()) {
+	if (!ActProcessTimer.IsRunning() && ApplicationSleepMode == FALSE) {
 	
 		wxCommandEvent event(ACTMGR_STARTTIMER);
 		wxPostEvent(this, event);