Index: changelog.txt =================================================================== diff -u -N -r499a5948d3a5180152b4ae71b2bfc557c05503d4 -r4d8adf81cb22d447a71925f4631623280c796e6f --- changelog.txt (.../changelog.txt) (revision 499a5948d3a5180152b4ae71b2bfc557c05503d4) +++ changelog.txt (.../changelog.txt) (revision 4d8adf81cb22d447a71925f4631623280c796e6f) @@ -11,6 +11,7 @@ * Simplified task edit and user-feedback dialogs * Adjusted the look of mini-view dialog * Added context menus to both status dialog and mini-view +* Simplified status dialog and adjusted the way copy stats are calculated Other: * Task definition xml files now uses human-readable attribute values instead of numeric ones Index: src/ch/ch.rc =================================================================== diff -u -N -r9fcf462ad4a28203a3d34ded6da7125d4dcc925c -r4d8adf81cb22d447a71925f4631623280c796e6f --- src/ch/ch.rc (.../ch.rc) (revision 9fcf462ad4a28203a3d34ded6da7125d4dcc925c) +++ src/ch/ch.rc (.../ch.rc) (revision 4d8adf81cb22d447a71925f4631623280c796e6f) @@ -134,54 +134,54 @@ PUSHBUTTON "&Remove",IDC_DELETE_BUTTON,187,190,44,14 PUSHBUTTON "Remove inactive",IDC_REMOVE_FINISHED_BUTTON,159,7,71,14 PUSHBUTTON "",IDC_STICK_BUTTON,505,263,7,7,BS_CENTER | BS_VCENTER | BS_FLAT - PUSHBUTTON "...",IDC_SET_BUFFERSIZE_BUTTON,484,71,13,14 - PUSHBUTTON ">",IDC_SET_PRIORITY_BUTTON,484,85,13,14 - PUSHBUTTON "View log",IDC_SHOW_LOG_BUTTON,452,18,45,12 + PUSHBUTTON "...",IDC_SET_BUFFERSIZE_BUTTON,489,73,13,14 + PUSHBUTTON ">",IDC_SET_PRIORITY_BUTTON,489,87,13,14 + PUSHBUTTON "View log",IDC_SHOW_LOG_BUTTON,457,18,45,12 LTEXT "List of tasks:",IDC_TASKLIST_LABEL_STATIC,7,10,145,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,332,129,165,6 - LTEXT "Size of items:",IDC_TASKSIZE_LABEL_STATIC,244,128,86,8 - LTEXT "Destination:",IDC_DESTINATIONOBJECT_LABEL_STATIC,244,59,86,8 - LTEXT "Source:",IDC_SOURCEOBJECT_LABEL_STATIC,244,46,86,8 - LTEXT "Buffer size:",IDC_BUFFERSIZE_LABEL_STATIC,244,73,86,8 - LTEXT "Thread priority:",IDC_THREADPRIORITY_LABEL_STATIC,244,87,86,8 - LTEXT "Operation:",IDC_OPERATION_LABEL_STATIC,244,33,86,8 - LTEXT "Transfer:",IDC_GLOBALTRANSFER_LABEL_STATIC,13,235,54,8 + CONTROL "",IDC_GLOBAL_PROGRESS,"msctls_progress32",0x0,71,251,153,7 + LTEXT "Progress:",IDC_GLOBALPROGRESS_LABEL_STATIC,13,250,54,8 + CONTROL "",IDC_TASKSIZE_PROGRESS,"msctls_progress32",0x0,337,129,165,6 + LTEXT "Size of items processed:",IDC_TASKSIZE_LABEL_STATIC,240,128,95,8 + LTEXT "Destination:",IDC_DESTINATIONOBJECT_LABEL_STATIC,240,61,95,8 + LTEXT "Source:",IDC_SOURCEOBJECT_LABEL_STATIC,240,47,95,8 + LTEXT "Buffer size:",IDC_BUFFERSIZE_LABEL_STATIC,240,75,95,8 + LTEXT "Thread priority:",IDC_THREADPRIORITY_LABEL_STATIC,240,89,95,8 + LTEXT "Operation:",IDC_OPERATION_LABEL_STATIC,240,33,95,8 + LTEXT "Transfer:",IDC_GLOBALTRANSFER_LABEL_STATIC,13,236,54,8 LTEXT "Processed:",IDC_GLOBALPROCESSED_LABEL_STATIC,13,222,54,8 - LTEXT "Estimated time:",IDC_TASKTIME_LABEL_STATIC,244,103,86,8 + LTEXT "Estimated time:",IDC_TASKTIME_LABEL_STATIC,240,103,95,8 PUSHBUTTON "&Resume",IDC_RESUME_BUTTON,52,190,44,14 - LTEXT "Task name:",IDC_TASKID_LABEL_STATIC,244,19,86,8 - CONTROL "",IDC_TASKID_STATIC,"STATICEX",0x4,332,18,118,12,WS_EX_STATICEDGE - CONTROL "",IDC_OPERATION_STATIC,"STATICEX",0x4,332,32,165,12,WS_EX_STATICEDGE - CONTROL "",IDC_SOURCEOBJECT_STATIC,"STATICEX",0x4,332,45,165,12,WS_EX_STATICEDGE - CONTROL "",IDC_DESTINATIONOBJECT_STATIC,"STATICEX",0x4,332,58,165,12,WS_EX_STATICEDGE - CONTROL "",IDC_TASKTIME_STATIC,"STATICEX",0x4,332,102,165,12,WS_EX_STATICEDGE + LTEXT "Task name:",IDC_TASKID_LABEL_STATIC,240,19,95,8 + CONTROL "",IDC_TASKID_STATIC,"STATICEX",0x4,337,18,119,12,WS_EX_STATICEDGE + CONTROL "",IDC_OPERATION_STATIC,"STATICEX",0x4,337,32,165,12,WS_EX_STATICEDGE + CONTROL "",IDC_SOURCEOBJECT_STATIC,"STATICEX",0x4,337,46,165,12,WS_EX_STATICEDGE + CONTROL "",IDC_DESTINATIONOBJECT_STATIC,"STATICEX",0x4,337,60,165,12,WS_EX_STATICEDGE + CONTROL "",IDC_TASKTIME_STATIC,"STATICEX",0x4,337,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,332,72,151,12,WS_EX_STATICEDGE - CONTROL "",IDC_THREADPRIORITY_STATIC,"STATICEX",0x4,332,86,151,12,WS_EX_STATICEDGE - CONTROL "",IDC_SUBTASKCOUNT_PROGRESS,"msctls_progress32",0x0,332,240,165,6 - LTEXT "Count of items:",IDC_SUBTASKCOUNT_LABEL_STATIC,244,239,86,8 - CONTROL "",IDC_SUBTASKSIZE_PROGRESS,"msctls_progress32",0x0,332,251,165,6 - LTEXT "Size of items:",IDC_SUBTASKSIZE_LABEL_STATIC,244,250,86,8 - LTEXT "Processed items:",IDC_SUBTASKPROCESSED_LABEL_STATIC,244,186,86,8 - CONTROL "",IDC_SUBTASKPROCESSED_STATIC,"STATICEX",0x4,332,185,165,12,WS_EX_STATICEDGE - LTEXT "Estimated time:",IDC_SUBTASKTIME_LABEL_STATIC,244,214,86,8 - CONTROL "",IDC_SUBTASKTIME_STATIC,"STATICEX",0x4,332,213,165,12,WS_EX_STATICEDGE - CONTROL "",IDC_TASKCOUNT_PROGRESS,"msctls_progress32",0x0,332,118,165,6 - LTEXT "Count of items:",IDC_TASKCOUNT_LABEL_STATIC,244,117,86,8 - LTEXT "Processing speed:",IDC_SUBTASKTRANSFER_LABEL_STATIC,244,200,86,8 - CONTROL "",IDC_SUBTASKTRANSFER_STATIC,"STATICEX",0x4,332,199,165,12,WS_EX_STATICEDGE - LTEXT "Current phase:",IDC_SUBTASKNAME_LABEL_STATIC,244,158,86,8 - CONTROL "",IDC_SUBTASKNAME_STATIC,"STATICEX",0x4,332,157,165,12,WS_EX_STATICEDGE - CONTROL "",IDC_CURRENTOBJECT_PROGRESS,"msctls_progress32",0x0,332,229,165,6 - LTEXT "Current item:",IDC_CURRENTOBJECT_LABEL_STATIC,244,228,86,8 + CONTROL "",IDC_GLOBALTRANSFER_STATIC,"STATICEX",0x4,71,235,153,12,WS_EX_STATICEDGE + CONTROL "",IDC_BUFFERSIZE_STATIC,"STATICEX",0x4,337,74,151,12,WS_EX_STATICEDGE + CONTROL "",IDC_THREADPRIORITY_STATIC,"STATICEX",0x4,337,88,151,12,WS_EX_STATICEDGE + CONTROL "",IDC_SUBTASKCOUNT_PROGRESS,"msctls_progress32",0x0,337,239,165,6 + LTEXT "Number of items processed:",IDC_SUBTASKCOUNT_LABEL_STATIC,240,238,95,8 + CONTROL "",IDC_SUBTASKSIZE_PROGRESS,"msctls_progress32",0x0,337,250,165,6 + LTEXT "Size of items processed:",IDC_SUBTASKSIZE_LABEL_STATIC,240,249,95,8 + LTEXT "Processed items:",IDC_SUBTASKPROCESSED_LABEL_STATIC,240,185,95,8 + CONTROL "",IDC_SUBTASKPROCESSED_STATIC,"STATICEX",0x4,337,184,165,12,WS_EX_STATICEDGE + LTEXT "Estimated time:",IDC_SUBTASKTIME_LABEL_STATIC,240,213,95,8 + CONTROL "",IDC_SUBTASKTIME_STATIC,"STATICEX",0x4,337,212,165,12,WS_EX_STATICEDGE + CONTROL "",IDC_TASKCOUNT_PROGRESS,"msctls_progress32",0x0,337,118,165,6 + LTEXT "Number of items processed:",IDC_TASKCOUNT_LABEL_STATIC,240,117,95,8 + LTEXT "Processing speed:",IDC_SUBTASKTRANSFER_LABEL_STATIC,240,199,95,8 + CONTROL "",IDC_SUBTASKTRANSFER_STATIC,"STATICEX",0x4,337,198,165,12,WS_EX_STATICEDGE + LTEXT "Current phase:",IDC_SUBTASKNAME_LABEL_STATIC,240,157,95,8 + CONTROL "",IDC_SUBTASKNAME_STATIC,"STATICEX",0x4,337,156,165,12,WS_EX_STATICEDGE + CONTROL "",IDC_CURRENTOBJECT_PROGRESS,"msctls_progress32",0x0,337,228,165,6 + LTEXT "Current item:",IDC_CURRENTOBJECT_LABEL_STATIC,240,227,95,8 GROUPBOX "Task information",IDC_TASKINFORMATION_GROUP_STATIC,237,7,268,134,0,WS_EX_TRANSPARENT GROUPBOX "Details",IDC_CURRENTPHASE_GROUP_STATIC,237,145,268,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,244,172,86,8 - CONTROL "",IDC_CURRENT_ITEM_STATIC,"STATICEX",0x4,332,171,165,12,WS_EX_STATICEDGE + LTEXT "Current item:",IDC_CURRENT_ITEM_LABEL_STATIC,240,171,95,8 + CONTROL "",IDC_CURRENT_ITEM_STATIC,"STATICEX",0x4,337,170,165,12,WS_EX_STATICEDGE END IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG DIALOGEX 0, 0, 275, 129