Merge commits from upstream

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

diff --git a/source/actmgr/frmActivityMgr.h b/source/actmgr/frmActivityMgr.h
index fec4778..d6dc31a 100644 (file)
--- a/source/actmgr/frmActivityMgr.h
+++ b/source/actmgr/frmActivityMgr.h
@@ -53,6 +53,7 @@ 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)
+DECLARE_EVENT_TYPE(ACTMGR_STARTANIMATIONTIMER, wxID_ANY)
 
 struct vCardDownloadDataFileClass{
        unsigned int DataType = 0;
@@ -114,7 +115,7 @@ class frmActivityMgr : public frmActivityMgrADT
                std::map<int,wxArrayString> ActivityListLog;
                bool WindowOpen = FALSE;
                bool TasksActive = FALSE;
-               bool SleepMode = FALSE;
+               bool ApplicationSleepMode = FALSE;
                bool ProcessTasksData = FALSE;
                //int ConflictResult = 0;
                wxETagProcessTimer *ETagTmrPtr;
@@ -134,10 +135,12 @@ class frmActivityMgr : public frmActivityMgrADT
                void StopTimer( wxCommandEvent& event );
                void StartProcessTimer( wxCommandEvent& event );
                void StopProcessTimer( wxCommandEvent& event );
+               void StartAnimationTimer(wxCommandEvent& event);
                void FlushAllTasks();
                void RemoveTask();
                void ProcessTasksThread();
                void ToggleConnectionStatus( wxCommandEvent& event );
+               void SleepMode( wxCommandEvent &event );
                void WriteServerCertificate(wxString AccountName, SSLCertCollection SSLCertInc);
                void UpdateStatusLabel( wxCommandEvent& event );
        public: