CopyHandler

Clone
ixen
committed
e8897f4
on 11 Dec 20
Made status dialog wider to accomodate translated labels (CH-368) Adjusted current path reported by scan operation to be a current sub-direc… Show more
Made status dialog wider to accomodate translated labels (CH-368) Adjusted current path reported by scan operation to be a current sub-directory scanned instead of base path. Disabled sub-task stats when task is in error/cancelled/load error states.

Show less

src/ch/StatusDlg.cpp (+11 -1)
1099 1099 {
1100 1100         CString strSpeedText = GetSizeString(dSizeSpeed);       // last avg
1101 1101         CString strAvgSpeedText = GetSizeString(dAvgSizeSpeed); // last avg
1102 1102
1103 1103         CString strAvgWord = GetResManager().LoadString(IDS_AVERAGEWORD_STRING);
1104 1104
1105 1105         // avg transfer
1106 1106         CString strFmt;
1107 1107         strFmt.Format(_T("%s/s (%s%s/s); %.0f/s (%s%.0f/s)"), (PCTSTR)strSpeedText, (PCTSTR)strAvgWord, (PCTSTR)strAvgSpeedText,
1108 1108                 dCountSpeed, (PCTSTR)strAvgWord, dAvgCountSpeed);
1109 1109
1110 1110         return strFmt;
1111 1111 }
1112 1112
1113 1113 void CStatusDlg::UpdateTaskStatsDetails(const chengine::TTaskStatsSnapshotPtr& spTaskStats)
1114 1114 {
1115 1115         unsigned long long timeTotalEstimated = 0;
1116 1116         unsigned long long timeElapsed = 0;
1117 1117         unsigned long long timeRemaining = 0;
1118 1118
  1119         bool bShowDetails = true;
  1120         switch(spTaskStats->GetTaskState())
  1121         {
  1122         case chengine::eTaskState_Error:
  1123         case chengine::eTaskState_LoadError:
  1124         case chengine::eTaskState_Cancelled:
  1125         case chengine::eTaskState_None:
  1126                 bShowDetails = false;
  1127         }
  1128
1119 1129         chengine::TSubTaskStatsSnapshotPtr spSubTaskStats = spTaskStats->GetSubTasksStats().GetCurrentSubTaskSnapshot();
1120           if(spSubTaskStats)
  1130         if(spSubTaskStats && bShowDetails)
1121 1131         {
1122 1132                 // text progress
1123 1133                 CString strProcessedText = GetProcessedText(spSubTaskStats->GetProcessedCount(), spSubTaskStats->GetTotalCount(), spSubTaskStats->GetProcessedSize(), spSubTaskStats->GetTotalSize());
1124 1134                 GetDlgItem(IDC_SUBTASKPROCESSED_STATIC)->SetWindowText(strProcessedText);
1125 1135
1126 1136                 // progress bars
1127 1137                 m_ctlCurrentObjectProgress.SetProgress(spSubTaskStats->GetCurrentItemProcessedSize(), spSubTaskStats->GetCurrentItemTotalSize());
1128 1138                 m_ctlSubTaskCountProgress.SetProgress(spSubTaskStats->GetProcessedCount(), spSubTaskStats->GetTotalCount());
1129 1139                 m_ctlSubTaskSizeProgress.SetProgress(spSubTaskStats->GetProcessedSize(), spSubTaskStats->GetTotalSize());
1130 1140
1131 1141                 // time information
1132 1142                 timeTotalEstimated = spSubTaskStats->GetEstimatedTotalTime();
1133 1143                 timeElapsed = spSubTaskStats->GetTimeElapsed();
1134 1144                 timeRemaining = timeTotalEstimated - timeElapsed;
1135 1145
1136 1146                 CString strTime1 = FormatTimeMiliseconds(timeElapsed);
1137 1147                 CString strTime2 = FormatTimeMiliseconds(timeTotalEstimated);
1138 1148                 CString strTime3 = FormatTimeMiliseconds(timeRemaining);
1139 1149
1140 1150                 CString strTime;