Index: src/ch/StatusDlg.cpp
===================================================================
diff -u -r428dbab8a736f60f57c2217cb23b0dcf21c5a923 -re45315d2ecd008df0162cba53a77dc6b8c5880d0
--- src/ch/StatusDlg.cpp (.../StatusDlg.cpp) (revision 428dbab8a736f60f57c2217cb23b0dcf21c5a923)
+++ src/ch/StatusDlg.cpp (.../StatusDlg.cpp) (revision e45315d2ecd008df0162cba53a77dc6b8c5880d0)
@@ -222,12 +222,11 @@
// subtask
GetDlgItem(IDC_SUBTASKNAME_STATIC)->SetWindowText(GetResManager().LoadString(IDS_EMPTYSUBTASKNAME_STRING));
+ GetDlgItem(IDC_CURRENT_ITEM_STATIC)->SetWindowText(GetResManager().LoadString(IDS_EMPTYSOURCETEXT_STRING));
GetDlgItem(IDC_SUBTASKPROCESSED_STATIC)->SetWindowText(GetResManager().LoadString(IDS_EMPTYPROCESSEDTEXT_STRING));
GetDlgItem(IDC_SUBTASKTIME_STATIC)->SetWindowText(GetResManager().LoadString(IDS_EMPTYTIMETEXT_STRING));
GetDlgItem(IDC_SUBTASKTRANSFER_STATIC)->SetWindowText(GetResManager().LoadString(IDS_EMPTYTRANSFERTEXT_STRING));
- GetDlgItem(IDC_TASKPROCESSED_STATIC)->SetWindowText(GetResManager().LoadString(IDS_EMPTYPROCESSEDTEXT_STRING));
- GetDlgItem(IDC_TASKTRANSFER_STATIC)->SetWindowText(GetResManager().LoadString(IDS_EMPTYTRANSFERTEXT_STRING));
GetDlgItem(IDC_TASKTIME_STATIC)->SetWindowText(GetResManager().LoadString(IDS_EMPTYTIMETEXT_STRING));
m_ctlTaskCountProgress.SetPos(0);
@@ -895,6 +894,9 @@
AddResizableControl(IDC_SUBTASKNAME_LABEL_STATIC, 0.5, 0.0, 0.0, 0);
AddResizableControl(IDC_SUBTASKNAME_STATIC, 0.5, 0.0, 0.5, 0);
+ AddResizableControl(IDC_CURRENT_ITEM_LABEL_STATIC, 0.5, 0.0, 0.0, 0);
+ AddResizableControl(IDC_CURRENT_ITEM_STATIC, 0.5, 0.0, 0.5, 0);
+
AddResizableControl(IDC_SUBTASKPROCESSED_LABEL_STATIC, 0.5, 0.0, 0.0, 0);
AddResizableControl(IDC_SUBTASKPROCESSED_STATIC, 0.5, 0.0, 0.5, 0);
@@ -914,17 +916,9 @@
AddResizableControl(IDC_SUBTASKSIZE_PROGRESS, 0.5, 0.0, 0.5, 0);
// right part of the dialog (task stats)
- AddResizableControl(IDC_ENTIRETASK_GROUP_STATIC, 0.5, 0.0, 0.5, 0);
-
- AddResizableControl(IDC_TASKPROCESSED_LABEL_STATIC, 0.5, 0.0, 0.0, 0);
- AddResizableControl(IDC_TASKPROCESSED_STATIC, 0.5, 0.0, 0.5, 0);
-
AddResizableControl(IDC_TASKTIME_LABEL_STATIC, 0.5, 0.0, 0.0, 0);
AddResizableControl(IDC_TASKTIME_STATIC, 0.5, 0.0, 0.5, 0);
- AddResizableControl(IDC_TASKTRANSFER_LABEL_STATIC, 0.5, 0.0, 0.0, 0);
- AddResizableControl(IDC_TASKTRANSFER_STATIC, 0.5, 0.0, 0.5, 0);
-
AddResizableControl(IDC_TASKCOUNT_LABEL_STATIC, 0.5, 0.0, 0.0, 0);
AddResizableControl(IDC_TASKCOUNT_PROGRESS, 0.5, 0.0, 0.5, 0);
@@ -993,20 +987,10 @@
}
// second part
- chengine::ESubOperationType eSubOperationType = chengine::eSubOperation_None;
- chengine::TSubTaskStatsSnapshotPtr spSubtaskStats = spTaskStats->GetSubTasksStats().GetCurrentSubTaskSnapshot();
- if(spSubtaskStats)
- eSubOperationType = spSubtaskStats->GetSubOperationType();
-
- if(eSubOperationType == chengine::eSubOperation_Deleting)
- strStatusText += GetResManager().LoadString(IDS_STATUS_DELETING_STRING);
- else if(eSubOperationType == chengine::eSubOperation_Scanning)
- strStatusText += GetResManager().LoadString(IDS_STATUS_SEARCHING_STRING);
- else if(eSubOperationType == chengine::eSubOperation_FastMove)
- strStatusText += GetResManager().LoadString(IDS_STATUS_FASTMOVE_STRING);
- else if(spTaskStats->GetOperationType() == chengine::eOperation_Copy)
+ EOperationType eOperation = spTaskStats->GetOperationType();
+ if(eOperation == chengine::eOperation_Copy)
strStatusText += GetResManager().LoadString(IDS_STATUS_COPYING_STRING);
- else if(spTaskStats->GetOperationType() == chengine::eOperation_Move)
+ else if(eOperation == chengine::eOperation_Move)
strStatusText += GetResManager().LoadString(IDS_STATUS_MOVING_STRING);
else
strStatusText += GetResManager().LoadString(IDS_STATUS_UNKNOWN_STRING);
@@ -1034,7 +1018,7 @@
return strStatusText;
}
-CString CStatusDlg::GetSubtaskName(chengine::ESubOperationType eSubtask) const
+CString CStatusDlg::GetSubtaskName(EOperationType eOperation, ESubOperationType eSubtask) const
{
if(eSubtask == chengine::eSubOperation_Deleting)
return GetResManager().LoadString(IDS_STATUS_DELETING_STRING);
@@ -1043,7 +1027,12 @@
if(eSubtask == chengine::eSubOperation_FastMove)
return GetResManager().LoadString(IDS_STATUS_FASTMOVE_STRING);
if(eSubtask == chengine::eSubOperation_Copying)
- return GetResManager().LoadString(IDS_STATUS_COPYING_STRING);
+ {
+ if(eOperation == chengine::eOperation_Move)
+ return GetResManager().LoadString(IDS_STATUS_MOVING_STRING);
+ else
+ return GetResManager().LoadString(IDS_STATUS_COPYING_STRING);
+ }
return GetResManager().LoadString(IDS_STATUS_UNKNOWN_STRING);
}
@@ -1158,13 +1147,14 @@
// subtask name
chengine::ESubOperationType eSubOperationType = spSubTaskStats->GetSubOperationType();
- CString strSubtaskName = GetSubtaskName(eSubOperationType);
+ CString strSubtaskName = GetSubtaskName(spTaskStats->GetOperationType(), eSubOperationType);
GetDlgItem(IDC_SUBTASKNAME_STATIC)->SetWindowText(strSubtaskName);
// current path
string::TString strPath = spSubTaskStats->GetCurrentPath();
if(strPath.IsEmpty())
strPath = GetResManager().LoadString(IDS_NONEINPUTFILE_STRING);
+ GetDlgItem(IDC_CURRENT_ITEM_STATIC)->SetWindowText(strPath.c_str());
SetBufferSizesString(spTaskStats->GetCurrentBufferSize(), spSubTaskStats->GetCurrentBufferIndex());
}
@@ -1175,6 +1165,7 @@
m_ctlSubTaskSizeProgress.SetProgress(0, 100);
GetDlgItem(IDC_SUBTASKNAME_STATIC)->SetWindowText(GetResManager().LoadString(IDS_EMPTYSUBTASKNAME_STRING));
+ GetDlgItem(IDC_CURRENT_ITEM_STATIC)->SetWindowText(GetResManager().LoadString(IDS_EMPTYSOURCETEXT_STRING));
GetDlgItem(IDC_SUBTASKPROCESSED_STATIC)->SetWindowText(GetResManager().LoadString(IDS_EMPTYPROCESSEDTEXT_STRING));
GetDlgItem(IDC_SUBTASKTIME_STATIC)->SetWindowText(GetResManager().LoadString(IDS_EMPTYTIMETEXT_STRING));
GetDlgItem(IDC_SUBTASKTRANSFER_STATIC)->SetWindowText(GetResManager().LoadString(IDS_EMPTYTRANSFERTEXT_STRING));
@@ -1190,17 +1181,8 @@
if(strSrcPath.IsEmpty())
strSrcPath = GetResManager().LoadString(IDS_EMPTYSOURCETEXT_STRING);
- GetDlgItem(IDC_SOURCEOBJECT_STATIC)->SetWindowText(spTaskStats->GetSourcePath().c_str()); // src object
+ GetDlgItem(IDC_SOURCEOBJECT_STATIC)->SetWindowText(strSrcPath); // src object
- // count of processed data/overall count of data
- CString strProcessedText = GetProcessedText(spTaskStats->GetProcessedCount(), spTaskStats->GetTotalCount(),
- spTaskStats->GetProcessedSize(), spTaskStats->GetTotalSize());
- GetDlgItem(IDC_TASKPROCESSED_STATIC)->SetWindowText(strProcessedText);
-
- // transfer
- CString strTaskSpeed = GetSpeedString(spTaskStats->GetSizeSpeed(), spTaskStats->GetAvgSizeSpeed(), spTaskStats->GetCountSpeed(), spTaskStats->GetAvgCountSpeed());
- GetDlgItem(IDC_TASKTRANSFER_STATIC)->SetWindowText(strTaskSpeed);
-
// elapsed time / estimated total time (estimated time left)
timeTotalEstimated = spTaskStats->GetEstimatedTotalTime();
timeElapsed = spTaskStats->GetTimeElapsed();
Index: src/ch/StatusDlg.h
===================================================================
diff -u -r428dbab8a736f60f57c2217cb23b0dcf21c5a923 -re45315d2ecd008df0162cba53a77dc6b8c5880d0
--- src/ch/StatusDlg.h (.../StatusDlg.h) (revision 428dbab8a736f60f57c2217cb23b0dcf21c5a923)
+++ src/ch/StatusDlg.h (.../StatusDlg.h) (revision e45315d2ecd008df0162cba53a77dc6b8c5880d0)
@@ -75,7 +75,7 @@
CString GetProcessedText(unsigned long long ullProcessedCount, unsigned long long ullTotalCount, unsigned long long ullProcessedSize, unsigned long long ullTotalSize);
void UpdateTaskStatsDetails(const chengine::TTaskStatsSnapshotPtr& spTaskStats);
void SetTaskListEntry(size_t stPos, const chengine::TTaskStatsSnapshotPtr& spTaskStats);
- CString GetSubtaskName(chengine::ESubOperationType eSubtask) const;
+ CString GetSubtaskName(chengine::EOperationType eOperation, chengine::ESubOperationType eSubtask) const;
CString GetProgressWindowTitleText() const;
void UpdateTaskBarProgress() const;
Index: src/ch/ch.rc
===================================================================
diff -u -r428dbab8a736f60f57c2217cb23b0dcf21c5a923 -re45315d2ecd008df0162cba53a77dc6b8c5880d0
--- src/ch/ch.rc (.../ch.rc) (revision 428dbab8a736f60f57c2217cb23b0dcf21c5a923)
+++ src/ch/ch.rc (.../ch.rc) (revision e45315d2ecd008df0162cba53a77dc6b8c5880d0)
@@ -121,70 +121,67 @@
PUSHBUTTON "&Apply",IDC_APPLY_BUTTON,340,193,50,14
END
-IDD_STATUS_DIALOG DIALOGEX 0, 0, 491, 302
+IDD_STATUS_DIALOG DIALOGEX 0, 0, 491, 270
STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
EXSTYLE WS_EX_APPWINDOW
CAPTION "Status"
FONT 8, "Tahoma", 0, 0, 0x1
BEGIN
- CONTROL "",IDC_STATUS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,21,223,196
- PUSHBUTTON "&Pause",IDC_PAUSE_BUTTON,7,222,44,14
- PUSHBUTTON "&Restart",IDC_RESTART_BUTTON,97,222,44,14
- PUSHBUTTON "&Cancel",IDC_CANCEL_BUTTON,142,222,44,14
- PUSHBUTTON "&Remove",IDC_DELETE_BUTTON,187,222,44,14
+ CONTROL "",IDC_STATUS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,21,223,167
+ PUSHBUTTON "&Pause",IDC_PAUSE_BUTTON,7,190,44,14
+ PUSHBUTTON "&Restart",IDC_RESTART_BUTTON,97,190,44,14
+ PUSHBUTTON "&Cancel",IDC_CANCEL_BUTTON,142,190,44,14
+ PUSHBUTTON "&Remove",IDC_DELETE_BUTTON,187,190,44,14
PUSHBUTTON "Remove inactive",IDC_REMOVE_FINISHED_BUTTON,159,7,71,14
- PUSHBUTTON "",IDC_STICK_BUTTON,484,295,7,7,BS_CENTER | BS_VCENTER | BS_FLAT
+ PUSHBUTTON "",IDC_STICK_BUTTON,484,263,7,7,BS_CENTER | BS_VCENTER | BS_FLAT
PUSHBUTTON "...",IDC_SET_BUFFERSIZE_BUTTON,463,71,13,14
PUSHBUTTON ">",IDC_SET_PRIORITY_BUTTON,463,85,13,14
PUSHBUTTON "View log",IDC_SHOW_LOG_BUTTON,431,18,45,12
LTEXT "List of tasks:",IDC_TASKLIST_LABEL_STATIC,7,10,145,8
- CONTROL "",IDC_GLOBAL_PROGRESS,"msctls_progress32",0x0,71,282,153,7
- LTEXT "Progress:",IDC_GLOBALPROGRESS_LABEL_STATIC,13,281,54,8
- CONTROL "",IDC_TASKSIZE_PROGRESS,"msctls_progress32",0x0,311,282,165,6
- LTEXT "Task size:",IDC_TASKSIZE_LABEL_STATIC,247,280,62,8
- LTEXT "Destination:",IDC_DESTINATIONOBJECT_LABEL_STATIC,247,61,40,8
- LTEXT "Source:",IDC_SOURCEOBJECT_LABEL_STATIC,247,48,62,8
- LTEXT "Buffer size:",IDC_BUFFERSIZE_LABEL_STATIC,247,75,62,8
- LTEXT "Thread priority:",IDC_THREADPRIORITY_LABEL_STATIC,247,89,62,8
- LTEXT "Operation:",IDC_OPERATION_LABEL_STATIC,247,35,62,8
- LTEXT "Speed:",IDC_TASKTRANSFER_LABEL_STATIC,247,258,62,8
- LTEXT "Processed:",IDC_TASKPROCESSED_LABEL_STATIC,247,232,62,8
- LTEXT "Transfer:",IDC_GLOBALTRANSFER_LABEL_STATIC,13,268,54,8
- LTEXT "Processed:",IDC_GLOBALPROCESSED_LABEL_STATIC,13,255,54,8
- LTEXT "Time:",IDC_TASKTIME_LABEL_STATIC,247,245,62,8
- PUSHBUTTON "&Resume",IDC_RESUME_BUTTON,52,222,44,14
- LTEXT "Task ID:",IDC_TASKID_LABEL_STATIC,247,21,62,8
+ CONTROL "",IDC_GLOBAL_PROGRESS,"msctls_progress32",0x0,71,250,153,7
+ LTEXT "Progress:",IDC_GLOBALPROGRESS_LABEL_STATIC,13,249,54,8
+ CONTROL "",IDC_TASKSIZE_PROGRESS,"msctls_progress32",0x0,311,127,165,6
+ LTEXT "Size of items:",IDC_TASKSIZE_LABEL_STATIC,247,126,62,8
+ LTEXT "Destination:",IDC_DESTINATIONOBJECT_LABEL_STATIC,247,59,62,8
+ LTEXT "Source:",IDC_SOURCEOBJECT_LABEL_STATIC,247,46,62,8
+ LTEXT "Buffer size:",IDC_BUFFERSIZE_LABEL_STATIC,247,73,62,8
+ LTEXT "Thread priority:",IDC_THREADPRIORITY_LABEL_STATIC,247,87,62,8
+ LTEXT "Operation:",IDC_OPERATION_LABEL_STATIC,247,33,62,8
+ LTEXT "Transfer:",IDC_GLOBALTRANSFER_LABEL_STATIC,13,235,54,8
+ LTEXT "Processed:",IDC_GLOBALPROCESSED_LABEL_STATIC,13,222,54,8
+ LTEXT "Estimated time:",IDC_TASKTIME_LABEL_STATIC,247,103,62,8
+ PUSHBUTTON "&Resume",IDC_RESUME_BUTTON,52,190,44,14
+ LTEXT "Task ID:",IDC_TASKID_LABEL_STATIC,247,19,62,8
CONTROL "",IDC_TASKID_STATIC,"STATICEX",0x4,311,18,118,12,WS_EX_STATICEDGE
CONTROL "",IDC_OPERATION_STATIC,"STATICEX",0x4,311,32,165,12,WS_EX_STATICEDGE
CONTROL "",IDC_SOURCEOBJECT_STATIC,"STATICEX",0x4,311,45,165,12,WS_EX_STATICEDGE
CONTROL "",IDC_DESTINATIONOBJECT_STATIC,"STATICEX",0x4,311,58,165,12,WS_EX_STATICEDGE
- CONTROL "",IDC_TASKPROCESSED_STATIC,"STATICEX",0x4,311,230,165,12,WS_EX_STATICEDGE
- CONTROL "",IDC_TASKTIME_STATIC,"STATICEX",0x4,311,243,165,12,WS_EX_STATICEDGE
- CONTROL "",IDC_TASKTRANSFER_STATIC,"STATICEX",0x4,311,256,165,12,WS_EX_STATICEDGE
- CONTROL "",IDC_GLOBALPROCESSED_STATIC,"STATICEX",0x4,71,253,153,12,WS_EX_STATICEDGE
- CONTROL "",IDC_GLOBALTRANSFER_STATIC,"STATICEX",0x4,71,266,153,12,WS_EX_STATICEDGE
+ CONTROL "",IDC_TASKTIME_STATIC,"STATICEX",0x4,311,102,165,12,WS_EX_STATICEDGE
+ CONTROL "",IDC_GLOBALPROCESSED_STATIC,"STATICEX",0x4,71,221,153,12,WS_EX_STATICEDGE
+ CONTROL "",IDC_GLOBALTRANSFER_STATIC,"STATICEX",0x4,71,234,153,12,WS_EX_STATICEDGE
CONTROL "",IDC_BUFFERSIZE_STATIC,"STATICEX",0x4,311,72,151,12,WS_EX_STATICEDGE
CONTROL "",IDC_THREADPRIORITY_STATIC,"STATICEX",0x4,311,86,151,12,WS_EX_STATICEDGE
- CONTROL "",IDC_SUBTASKCOUNT_PROGRESS,"msctls_progress32",0x0,311,189,165,6
- LTEXT "Count of objects:",IDC_SUBTASKCOUNT_LABEL_STATIC,247,187,62,8
- CONTROL "",IDC_SUBTASKSIZE_PROGRESS,"msctls_progress32",0x0,311,199,165,6
- LTEXT "Size of objects:",IDC_SUBTASKSIZE_LABEL_STATIC,247,197,62,8
- LTEXT "Processed:",IDC_SUBTASKPROCESSED_LABEL_STATIC,247,139,62,8
- CONTROL "",IDC_SUBTASKPROCESSED_STATIC,"STATICEX",0x4,311,136,165,12,WS_EX_STATICEDGE
- LTEXT "Time:",IDC_SUBTASKTIME_LABEL_STATIC,247,152,62,8
- CONTROL "",IDC_SUBTASKTIME_STATIC,"STATICEX",0x4,311,149,165,12,WS_EX_STATICEDGE
- CONTROL "",IDC_TASKCOUNT_PROGRESS,"msctls_progress32",0x0,311,272,165,6
- LTEXT "Task count:",IDC_TASKCOUNT_LABEL_STATIC,247,270,62,8
- LTEXT "Speed:",IDC_SUBTASKTRANSFER_LABEL_STATIC,247,165,62,8
- CONTROL "",IDC_SUBTASKTRANSFER_STATIC,"STATICEX",0x4,311,162,165,12,WS_EX_STATICEDGE
- LTEXT "Current phase:",IDC_SUBTASKNAME_LABEL_STATIC,247,125,62,8
- CONTROL "",IDC_SUBTASKNAME_STATIC,"STATICEX",0x4,311,122,165,12,WS_EX_STATICEDGE
- CONTROL "",IDC_CURRENTOBJECT_PROGRESS,"msctls_progress32",0x0,311,179,165,6
- LTEXT "Current object:",IDC_CURRENTOBJECT_LABEL_STATIC,247,177,62,8
- GROUPBOX "Task information",IDC_TASKINFORMATION_GROUP_STATIC,238,7,246,98,0,WS_EX_TRANSPARENT
- GROUPBOX "Current phase statistics",IDC_CURRENTPHASE_GROUP_STATIC,238,110,246,102,0,WS_EX_TRANSPARENT
- GROUPBOX "Entire task statistics",IDC_ENTIRETASK_GROUP_STATIC,238,218,246,77,0,WS_EX_TRANSPARENT
- GROUPBOX "Global statistics",IDC_GLOBAL_GROUP_STATIC,7,242,223,53,0,WS_EX_TRANSPARENT
+ CONTROL "",IDC_SUBTASKCOUNT_PROGRESS,"msctls_progress32",0x0,311,238,165,6
+ LTEXT "Count of items:",IDC_SUBTASKCOUNT_LABEL_STATIC,247,237,62,8
+ CONTROL "",IDC_SUBTASKSIZE_PROGRESS,"msctls_progress32",0x0,311,248,165,6
+ LTEXT "Size of items:",IDC_SUBTASKSIZE_LABEL_STATIC,247,247,62,8
+ LTEXT "Processed items:",IDC_SUBTASKPROCESSED_LABEL_STATIC,247,186,62,8
+ CONTROL "",IDC_SUBTASKPROCESSED_STATIC,"STATICEX",0x4,311,185,165,12,WS_EX_STATICEDGE
+ LTEXT "Estimated time:",IDC_SUBTASKTIME_LABEL_STATIC,247,214,62,8
+ CONTROL "",IDC_SUBTASKTIME_STATIC,"STATICEX",0x4,311,213,165,12,WS_EX_STATICEDGE
+ CONTROL "",IDC_TASKCOUNT_PROGRESS,"msctls_progress32",0x0,311,117,165,6
+ LTEXT "Count of items:",IDC_TASKCOUNT_LABEL_STATIC,247,116,62,8
+ LTEXT "Processing speed:",IDC_SUBTASKTRANSFER_LABEL_STATIC,247,200,62,8
+ CONTROL "",IDC_SUBTASKTRANSFER_STATIC,"STATICEX",0x4,311,199,165,12,WS_EX_STATICEDGE
+ LTEXT "Current phase:",IDC_SUBTASKNAME_LABEL_STATIC,247,158,62,8
+ CONTROL "",IDC_SUBTASKNAME_STATIC,"STATICEX",0x4,311,157,165,12,WS_EX_STATICEDGE
+ CONTROL "",IDC_CURRENTOBJECT_PROGRESS,"msctls_progress32",0x0,311,228,165,6
+ LTEXT "Current item:",IDC_CURRENTOBJECT_LABEL_STATIC,247,227,62,8
+ GROUPBOX "Task information",IDC_TASKINFORMATION_GROUP_STATIC,238,7,246,134,0,WS_EX_TRANSPARENT
+ GROUPBOX "Details",IDC_CURRENTPHASE_GROUP_STATIC,238,145,246,118,0,WS_EX_TRANSPARENT
+ GROUPBOX "Global statistics",IDC_GLOBAL_GROUP_STATIC,7,210,223,53,0,WS_EX_TRANSPARENT
+ LTEXT "Current item:",IDC_CURRENT_ITEM_LABEL_STATIC,247,172,62,8
+ CONTROL "",IDC_CURRENT_ITEM_STATIC,"STATICEX",0x4,311,171,165,12,WS_EX_STATICEDGE
END
IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG DIALOGEX 0, 0, 275, 129
@@ -602,7 +599,7 @@
LEFTMARGIN, 7
RIGHTMARGIN, 484
TOPMARGIN, 7
- BOTTOMMARGIN, 295
+ BOTTOMMARGIN, 263
END
IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG, DIALOG
Index: src/ch/resource.h
===================================================================
diff -u -r428dbab8a736f60f57c2217cb23b0dcf21c5a923 -re45315d2ecd008df0162cba53a77dc6b8c5880d0
--- src/ch/resource.h (.../resource.h) (revision 428dbab8a736f60f57c2217cb23b0dcf21c5a923)
+++ src/ch/resource.h (.../resource.h) (revision e45315d2ecd008df0162cba53a77dc6b8c5880d0)
@@ -114,9 +114,8 @@
#define IDC_ERRORS_STATIC 1032
#define IDC_SUBTASKNAME_STATIC 1032
#define IDC_PROGRESS_STATIC 1033
-#define IDC_TASKPROCESSED_STATIC 1033
+#define IDC_CURRENT_ITEM_STATIC 1033
#define IDC_TRANSFER_STATIC 1034
-#define IDC_TASKTRANSFER_STATIC 1034
#define IDC_CUSTOM_RULES_BUTTON 1035
#define IDC_OVERALL_PROGRESS_STATIC 1035
#define IDC_GLOBALPROCESSED_STATIC 1035
@@ -275,7 +274,6 @@
#define IDC_010_STATIC 1228
#define IDC_HDR_FILTERS_STATIC 1228
#define IDC_011_STATIC 1229
-#define IDC_TASKPROCESSED_LABEL_STATIC 1229
#define IDC_012_STATIC 1230
#define IDC_GLOBALTRANSFER_LABEL_STATIC 1230
#define IDC_MAXREADAHEAD_STATIC 1230
@@ -363,14 +361,13 @@
#define IDC_DESTINATIONOBJECT_LABEL_STATIC 1302
#define IDC_BUFFERSIZE_LABEL_STATIC 1303
#define IDC_THREADPRIORITY_LABEL_STATIC 1304
-#define IDC_TASKTRANSFER_LABEL_STATIC 1305
+#define IDC_CURRENT_ITEM_LABEL_STATIC 1305
#define IDC_TASKSIZE_LABEL_STATIC 1306
#define IDC_TASKTIME_STATIC 1307
#define IDC_GLOBALPROGRESS_LABEL_STATIC 1308
#define IDC_TASKLIST_LABEL_STATIC 1309
#define IDC_TASKINFORMATION_GROUP_STATIC 1310
#define IDC_CURRENTPHASE_GROUP_STATIC 1311
-#define IDC_ENTIRETASK_GROUP_STATIC 1312
#define IDC_GLOBAL_GROUP_STATIC 1313
#define IDC_BASIC_CHECK 1314
#define IDC_MSG_RICHEDIT 1315
Index: src/libchengine/TTask.cpp
===================================================================
diff -u -rc88853d744d42c9d0d18d14f920190d535bb714a -re45315d2ecd008df0162cba53a77dc6b8c5880d0
--- src/libchengine/TTask.cpp (.../TTask.cpp) (revision c88853d744d42c9d0d18d14f920190d535bb714a)
+++ src/libchengine/TTask.cpp (.../TTask.cpp) (revision e45315d2ecd008df0162cba53a77dc6b8c5880d0)
@@ -407,13 +407,27 @@
spSnapshot->SetBufferCount(GetTaskPropValue<eTO_BufferQueueDepth>(m_tConfiguration));
TSubTaskStatsSnapshotPtr spCurrentSubTask = spSnapshot->GetSubTasksStats().GetCurrentSubTaskSnapshot();
- if(spCurrentSubTask)
- spSnapshot->SetSourcePath(spCurrentSubTask->GetCurrentPath());
- else if(m_spSrcPaths->GetCount() > 0)
+ if(m_spSrcPaths->GetCount() > 0)
{
- TBasePathDataPtr spBasePath = m_spSrcPaths->GetAt(0);
- if(spBasePath)
- spSnapshot->SetSourcePath(spBasePath->GetSrcPath().ToString());
+ std::wstring wstrPaths;
+
+ const size_t stMaxPaths = std::min(2UL, m_spSrcPaths->GetCount());
+ for(file_count_t stIndex = 0; stIndex < stMaxPaths; ++stIndex)
+ {
+ TBasePathDataPtr spBasePath = m_spSrcPaths->GetAt(stIndex);
+ if(spBasePath)
+ {
+ if(!wstrPaths.empty())
+ wstrPaths += L"; ";
+
+ wstrPaths += spBasePath->GetSrcPath().ToString();
+ }
+ }
+
+ if(stMaxPaths < m_spSrcPaths->GetCount())
+ wstrPaths += L"; ...";
+
+ spSnapshot->SetSourcePath(wstrPaths.c_str());
}
int iCurrentBufferIndex = spCurrentSubTask ? spCurrentSubTask->GetCurrentBufferIndex() : TBufferSizes::eBuffer_Default;