Index: src/ch/ShutdownDlg.cpp =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r8068e0c351055554340ac9755d1bc846893bf2b8 --- src/ch/ShutdownDlg.cpp (.../ShutdownDlg.cpp) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/ShutdownDlg.cpp (.../ShutdownDlg.cpp) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) @@ -19,6 +19,7 @@ #include "stdafx.h" #include "ch.h" #include "ShutdownDlg.h" +#include "resource.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -31,24 +32,18 @@ CShutdownDlg::CShutdownDlg() - :ictranslate::CLanguageDialog(CShutdownDlg::IDD) + :ictranslate::CLanguageDialog(IDD_SHUTDOWN_DIALOG) { - //{{AFX_DATA_INIT(CShutdownDlg) - m_strTime = _T(""); - //}}AFX_DATA_INIT } - void CShutdownDlg::DoDataExchange(CDataExchange* pDX) { CLanguageDialog::DoDataExchange(pDX); - //{{AFX_DATA_MAP(CShutdownDlg) + DDX_Control(pDX, IDC_TIME_PROGRESS, m_ctlProgress); DDX_Text(pDX, IDC_TIME_STATIC, m_strTime); - //}}AFX_DATA_MAP } - BEGIN_MESSAGE_MAP(CShutdownDlg,ictranslate::CLanguageDialog) //{{AFX_MSG_MAP(CShutdownDlg) ON_WM_TIMER() @@ -70,7 +65,7 @@ m_ctlProgress.SetRange32(0, m_iOverallTime); // init timer - SetTimer(6678, 200, NULL); + SetTimer(6678, 200, nullptr); return TRUE; } @@ -96,5 +91,10 @@ void CShutdownDlg::FormatTimeString(int iTime, CString *pstrData) { - pstrData->Format(_T("%lu s."), iTime/1000); + pstrData->Format(_T("%d s."), iTime/1000); } + +void CShutdownDlg::SetOverallTime(int iTotalSeconds) +{ + m_iOverallTime = abs(iTotalSeconds); +}