Index: src/ch/ch.rc =================================================================== diff -u -r814b694086d5dc450efb6a5e5c6902145ddc07fd -r68bbff6670ec7d7010ced69f600493a0ae0c687c --- src/ch/ch.rc (.../ch.rc) (revision 814b694086d5dc450efb6a5e5c6902145ddc07fd) +++ src/ch/ch.rc (.../ch.rc) (revision 68bbff6670ec7d7010ced69f600493a0ae0c687c) @@ -121,75 +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, 512, 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 "List1",IDC_STATUS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,19,223,171 - PUSHBUTTON "&Pause",IDC_PAUSE_BUTTON,7,193,44,14 - PUSHBUTTON "&Restart",IDC_RESTART_BUTTON,97,193,44,14 - PUSHBUTTON "&Cancel",IDC_CANCEL_BUTTON,142,193,44,14 - PUSHBUTTON "&Remove",IDC_DELETE_BUTTON,187,193,44,14 - PUSHBUTTON "Pause/all",IDC_PAUSE_ALL_BUTTON,7,208,71,14 - PUSHBUTTON "Resume/all",IDC_START_ALL_BUTTON,79,208,71,14 - PUSHBUTTON "Cancel/all",IDC_CANCEL_ALL_BUTTON,7,223,71,14 - PUSHBUTTON "Remove/all",IDC_REMOVE_FINISHED_BUTTON,79,223,71,14 - PUSHBUTTON "Restart/all",IDC_RESTART_ALL_BUTTON,151,223,79,14 - PUSHBUTTON "Advanced >",IDC_TASK_ADVANCED_BUTTON,151,208,79,14 - PUSHBUTTON "",IDC_STICK_BUTTON,484,295,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,7,223,8 - CONTROL "Progress1",IDC_GLOBAL_PROGRESS,"msctls_progress32",0x0,71,282,153,7 - LTEXT "Progress:",IDC_GLOBALPROGRESS_LABEL_STATIC,13,281,54,8 - CONTROL "Progress2",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,193,44,14 - LTEXT "Task ID:",IDC_TASKID_LABEL_STATIC,247,21,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_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_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,505,263,7,7,BS_CENTER | BS_VCENTER | BS_FLAT + 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,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,240,103,95,8 + PUSHBUTTON "&Resume",IDC_RESUME_BUTTON,52,190,44,14 + 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,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,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 @@ -605,9 +597,9 @@ IDD_STATUS_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 484 + RIGHTMARGIN, 505 TOPMARGIN, 7 - BOTTOMMARGIN, 295 + BOTTOMMARGIN, 263 END IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG, DIALOG @@ -984,14 +976,6 @@ END END -IDR_TASK_ADVANCED_MENU MENU -BEGIN - POPUP "_POPUP_" - BEGIN - MENUITEM "Reset 'apply to all' status", ID_POPUP_RESET_APPLY_TO_ALL - END -END - IDR_ALREADYEXISTS_MASS_REPLACE_MENU MENU BEGIN POPUP "POPUP" @@ -1066,7 +1050,8 @@ MENUITEM "&Cancel", ID_TASK_MENU_CANCEL MENUITEM "Re&move", ID_TASK_MENU_REMOVE MENUITEM SEPARATOR - MENUITEM "Reset user-feedback state", ID_TASK_MENU_RESET_FEEDBACK + MENUITEM "Edit automatic responses", ID_TASK_MENU_EDIT_FEEDBACK + MENUITEM "Reset automatic responses", ID_TASK_MENU_RESET_FEEDBACK MENUITEM SEPARATOR MENUITEM "Pause all", ID_TASK_MENU_PAUSE_ALL MENUITEM "Resume all", ID_TASK_MENU_RESUME_ALL