Improved syncronisation (stop conflict resolution screen appearing everytime after...

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

diff --git a/source/frmActivityMgr.h b/source/frmActivityMgr.h
index d434056..857eb32 100644 (file)
--- a/source/frmActivityMgr.h
+++ b/source/frmActivityMgr.h
@@ -10,6 +10,7 @@ Subclass of frmActivityMgrADT, which is generated by wxFormBuilder.
 #include "carddav/carddav.h"
 #include <map>
 #include <wx/timer.h>
+
 #include "common/timers.h"
 #include "common/etag.h"
 
@@ -21,12 +22,19 @@ DECLARE_EVENT_TYPE(ACTMGR_STARTTIMER, wxID_ANY)
 DECLARE_EVENT_TYPE(ACTMGR_STOPTIMER, wxID_ANY)
 DECLARE_EVENT_TYPE(ACTMGR_STARTPROCESSTIMER, wxID_ANY)
 DECLARE_EVENT_TYPE(ACTMGR_STOPPROCESSTIMER, wxID_ANY)
+DECLARE_EVENT_TYPE(ACTMGR_UPDATESTATUSLABEL, wxID_ANY)
 
 struct vCardDownloadDataFileClass{
        unsigned int DataType = 0;
        wxString FileData;
 };
 
+struct ActivityMgrLabelUpdate{
+       long ItemIndex;
+       wxString ItemLabel;
+       wxString ItemDes;
+};
+
 /** Implementing frmActivityMgrADT */
 class frmActivityMgr : public frmActivityMgrADT
 {
@@ -63,6 +71,7 @@ class frmActivityMgr : public frmActivityMgrADT
        protected:
                // Handlers for frmActivityMgrADT events.
                void CloseWindow( wxCommandEvent& event );
+               void CloseWindow( wxCloseEvent& event );
                void StopTask( wxCommandEvent& event );
                void StopAllTasks( wxCommandEvent& event );
                void RetryTask( wxCommandEvent& event );
@@ -75,6 +84,7 @@ class frmActivityMgr : public frmActivityMgrADT
                void ProcessTasksThread();
                void ToggleConnectionStatus( wxCommandEvent& event );
                void WriteServerCertificate(wxString AccountName, SSLCertCollection SSLCertInc);
+               void UpdateStatusLabel( wxCommandEvent& event );
        public:
                /** Constructor */
                frmActivityMgr( wxWindow* parent );