Index: src/ch/StatusDlg.h =================================================================== diff -u -r44a2ec5f1eb0a435b56daef42ef5fe3b7a91da0d -rd04caed42cbc16ffd508f173ca5f92d9512cfc69 --- src/ch/StatusDlg.h (.../StatusDlg.h) (revision 44a2ec5f1eb0a435b56daef42ef5fe3b7a91da0d) +++ src/ch/StatusDlg.h (.../StatusDlg.h) (revision d04caed42cbc16ffd508f173ca5f92d9512cfc69) @@ -21,12 +21,13 @@ #include "FFListCtrl.h" #include "TProgressCtrlEx.h" +#include "TExplorerTaskBarProgress.h" namespace chcore { class TTaskManager; class TTask; - typedef boost::shared_ptr TTaskPtr; + typedef std::shared_ptr TTaskPtr; } #define WM_UPDATESTATUS WM_USER+6 @@ -36,11 +37,9 @@ // CStatusDlg dialog class CStatusDlg : public ictranslate::CLanguageDialog { - enum { IDD = IDD_STATUS_DIALOG }; - // Construction public: - CStatusDlg(chcore::TTaskManager* pTasks, CWnd* pParent = NULL); // standard constructor + CStatusDlg(chcore::TTaskManager* pTasks, CWnd* pParent = nullptr); // standard constructor virtual ~CStatusDlg(); void PostCloseMessage(); @@ -76,10 +75,15 @@ CString GetSubtaskName(chcore::ESubOperationType eSubtask) const; CString GetProgressWindowTitleText() const; + void UpdateTaskBarProgress() const; + CString GetSpeedString(double dSizeSpeed, double dAvgSizeSpeed, double dCountSpeed, double dAvgCountSpeed) const; void SetWindowTitle(PCTSTR pszText); virtual BOOL OnInitDialog(); + + void SelectInitialTask(); + afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg void OnPauseButton(); afx_msg void OnCancelButton(); @@ -121,6 +125,7 @@ TProgressCtrlEx m_ctlProgressAll; chcore::TTaskManagerStatsSnapshotPtr m_spTaskMgrStats; + TExplorerTaskBarProgress m_taskBarProgress; }; #endif