X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Factmgr%2FfrmActivityMgr-tasks.cpp;h=cdcdfc7bbb6b87310240641b138b0a39eaffeca5;hb=25c2c8c7fed1898939175dfe2871015b6099c106;hp=72135db2ef296a0368299b3bd5dd54120b44a621;hpb=a066714be6d7646614c51e71313cc7c2a6bb4a0f;p=xestiaab%2F.git diff --git a/source/actmgr/frmActivityMgr-tasks.cpp b/source/actmgr/frmActivityMgr-tasks.cpp index 72135db..cdcdfc7 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. @@ -115,6 +119,8 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco 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)); ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex)); ActivityListTaskDetail.insert(std::make_pair(ActivityTaskID, TaskDetail)); @@ -135,15 +141,12 @@ 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); 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)); ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex)); ActivityListTaskDetail.insert(std::make_pair(ActivityTaskID, TaskDetail)); ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount)); @@ -169,7 +172,6 @@ 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)); @@ -195,7 +197,7 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco ProcessTasksData = TRUE; - if (!ActProcessTimer.IsRunning()) { + if (!ActProcessTimer.IsRunning() && ApplicationSleepMode == FALSE) { wxCommandEvent event(ACTMGR_STARTTIMER); wxPostEvent(this, event);