From: Steve Brokenshire Date: Sun, 4 Oct 2015 15:03:14 +0000 (+0100) Subject: Updated Activity Manager X-Git-Tag: release-0.05~45 X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;ds=sidebyside;h=94da715b36188770f644b871bd59f59f140474be;p=xestiaab%2F.git Updated Activity Manager --- diff --git a/source/frmActivityMgr.cpp b/source/frmActivityMgr.cpp index f7b2f95..9f3ba7d 100644 --- a/source/frmActivityMgr.cpp +++ b/source/frmActivityMgr.cpp @@ -288,7 +288,7 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco lstActivity->SetItem(itemindex, 1, AccountName); lstActivity->SetItem(itemindex, 2, _("Queued")); - // TODO: Pass the ETagDB for the account to the connection. + ETagDB *ETagDBPtr = ETagTmrPtr->GetPointer(AccountDir); ActivityList.insert(std::make_pair(ActivityTaskID, 0)); ActivityListType.insert(std::make_pair(ActivityTaskID, 2)); @@ -644,7 +644,6 @@ void frmActivityMgr::ProcessTasksThread() ConvertedV4Data.WriteFile(FullFilename); - iter->second = 4; } @@ -1704,6 +1703,14 @@ void frmActivityMgr::ProcessTasksThread() } // Mark as completed. + + wxString AccountNameFinal; + AccountNameFinal = PrefData.accounts.GetAccountDirectory(AccountID); + AccountNameFinal.Append(wxT(".carddav")); + + wxCommandEvent reloadevent(RELOADCONTACTLIST); + reloadevent.SetString(AccountNameFinal); + wxPostEvent(this->GetParent(), reloadevent); iter->second = 4; continue; @@ -1713,6 +1720,8 @@ void frmActivityMgr::ProcessTasksThread() // Update the data to the server. CardDAVIter->second.ProcessData(); + iter->second = 4; + continue; } @@ -1896,18 +1905,14 @@ void frmActivityMgr::UpdateStatusLabel(wxCommandEvent& event){ if (actmgrudata != NULL){ - wxPuts(wxT("ItemIndex:") + actmgrudata->ItemIndex); - wxPuts(wxT("ItemLabel:") + actmgrudata->ItemLabel); - wxPuts(wxT("ItemDes: ") + actmgrudata->ItemDes); - - lstActivity->SetItem(actmgrudata->ItemIndex, 2, actmgrudata->ItemLabel); + lstActivity->SetItem(actmgrudata->ItemIndex, 2, actmgrudata->ItemLabel); - /*if (!actmgrudata->ItemDes.IsEmpty()){ + /*if (!actmgrudata->ItemDes.IsEmpty()){ lstActivity->SetItem(actmgrudata->ItemIndex, 0, actmgrudata->ItemDes); - }*/ + }*/ - delete actmgrudata; - actmgrudata = NULL; + delete actmgrudata; + actmgrudata = NULL; }