Index: src/ch/StatusDlg.h =================================================================== diff -u -N -rf25056c67d674c9491c8b23354236a253037132d -r9b8cccbee0fcfeca28a112cc0253a7641f73f74f --- src/ch/StatusDlg.h (.../StatusDlg.h) (revision f25056c67d674c9491c8b23354236a253037132d) +++ src/ch/StatusDlg.h (.../StatusDlg.h) (revision 9b8cccbee0fcfeca28a112cc0253a7641f73f74f) @@ -20,6 +20,7 @@ #define __STATUSDLG_H__ #include "FFListCtrl.h" +#include "TProgressCtrlEx.h" namespace chcore { @@ -45,7 +46,7 @@ void PostCloseMessage(); void SetBufferSizesString(UINT uiValue, int iIndex); void RefreshStatus(); - LPTSTR FormatTime(time_t timeSeconds, LPTSTR lpszBuffer, size_t stMaxBufferSize); + int GetImageFromStatus(chcore::ETaskCurrentState eState); void ApplyButtonsState(); @@ -66,6 +67,13 @@ void StickDialogToScreenEdge(); + LPTSTR FormatTime(time_t timeSeconds, LPTSTR lpszBuffer, size_t stMaxBufferSize); + LPTSTR FormatTimeMiliseconds(unsigned long long timeMiliSeconds, LPTSTR lpszBuffer, size_t stMaxBufferSize); + + CString GetProcessedText(unsigned long long ullProcessedCount, unsigned long long ullTotalCount, unsigned long long ullProcessedSize, unsigned long long ullTotalSize); + void UpdateTaskStatsDetails( chcore::TASK_DISPLAY_DATA &td, DWORD dwCurrentTime ); + void SetTaskListEntry(const chcore::TASK_DISPLAY_DATA &td, int nPos, const chcore::TTaskPtr& spTask); + virtual BOOL OnInitDialog(); afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg void OnPauseButton(); @@ -96,7 +104,6 @@ protected: chcore::TTaskManager* m_pTasks; chcore::TTaskPtr m_spSelectedItem; - chcore::TTaskPtr m_spLastSelected; TCHAR m_szData[_MAX_PATH]; TCHAR m_szTimeBuffer1[40]; @@ -109,12 +116,15 @@ CImageList m_images; - CProgressCtrl m_ctlCurrentProgress; CFFListCtrl m_ctlStatusList; - CProgressCtrl m_ctlProgressAll; + +private: + TProgressCtrlEx m_ctlTaskCountProgress; + TProgressCtrlEx m_ctlTaskSizeProgress; + TProgressCtrlEx m_ctlCurrentObjectProgress; + TProgressCtrlEx m_ctlSubTaskCountProgress; + TProgressCtrlEx m_ctlSubTaskSizeProgress; + TProgressCtrlEx m_ctlProgressAll; }; -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - #endif