Added copyright and license header to the C++ files and headers in the top source...

[xestiaab/.git] / source / frmActivityMgr.cpp

diff --git a/source/frmActivityMgr.cpp b/source/frmActivityMgr.cpp
index f7b2f95..f26e00f 100644 (file)
--- a/source/frmActivityMgr.cpp
+++ b/source/frmActivityMgr.cpp
@@ -1,3 +1,21 @@
+// frmActivityMgr.cpp - Activity Manager form.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Address Book is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
+
 #include "frmActivityMgr.h"
 #include <wx/mstream.h>
 #include <wx/file.h>
@@ -288,7 +306,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 +662,6 @@ void frmActivityMgr::ProcessTasksThread()
                                                
                                                        ConvertedV4Data.WriteFile(FullFilename);
                                                
-                                               
                                                        iter->second = 4;
                                        
                                                }
@@ -1704,6 +1721,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 +1738,8 @@ void frmActivityMgr::ProcessTasksThread()
                                // Update the data to the server.
                                        
                                CardDAVIter->second.ProcessData();
+                               iter->second = 4;
+                               continue;
                        
                        }
 
@@ -1896,18 +1923,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;
        
        }