Index: src/ch/resource.h =================================================================== diff -u -N -rcbe8851b4ff9b0f235e2c700174370b8884cb844 -r9b8cccbee0fcfeca28a112cc0253a7641f73f74f --- src/ch/resource.h (.../resource.h) (revision cbe8851b4ff9b0f235e2c700174370b8884cb844) +++ src/ch/resource.h (.../resource.h) (revision 9b8cccbee0fcfeca28a112cc0253a7641f73f74f) @@ -57,12 +57,19 @@ #define IDC_STATUS_LIST 1003 #define IDC_REMOVEFILEFOLDER_BUTTON 1004 #define IDC_ALL_PROGRESS 1005 +#define IDC_GLOBAL_PROGRESS 1005 #define IDC_DESTPATH_EDIT 1006 #define IDC_TASK_PROGRESS 1007 +#define IDC_TASKSIZE_PROGRESS 1007 #define IDC_DESTBROWSE_BUTTON 1008 +#define IDC_SUBTASKTASKCOUNT_PROGRESS 1008 +#define IDC_SUBTASKCOUNT_PROGRESS 1008 #define IDC_OPERATION_COMBO 1009 +#define IDC_SUBTASKSIZE_PROGRESS 1009 #define IDC_FILTERS_LIST 1010 +#define IDC_TASKCOUNT_PROGRESS 1010 #define IDC_ADDDIR_BUTTON 1011 +#define IDC_CURRENTOBJECT_PROGRESS 1011 #define IDC_BUFFERSIZES_LIST 1012 #define IDC_SET_BUFFERSIZE_BUTTON 1013 #define IDC_FILTERS_CHECK 1014 @@ -79,19 +86,30 @@ #define IDC_ADDFILTER_BUTTON 1025 #define IDC_REMOVEFILTER_BUTTON 1026 #define IDC_SOURCE_STATIC 1027 +#define IDC_SOURCEOBJECT_STATIC 1027 #define IDC_DESTINATION_STATIC 1028 +#define IDC_DESTINATIONOBJECT_STATIC 1028 #define IDC_OPERATION_STATIC 1029 #define IDC_BUFFERSIZE_STATIC 1030 #define IDC_PRIORITY_STATIC 1031 +#define IDC_THREADPRIORITY_STATIC 1031 #define IDC_ERRORS_STATIC 1032 +#define IDC_SUBTASKNAME_STATIC 1032 #define IDC_PROGRESS_STATIC 1033 +#define IDC_TASKPROCESSED_STATIC 1033 #define IDC_TRANSFER_STATIC 1034 +#define IDC_TASKTRANSFER_STATIC 1034 #define IDC_OVERALL_PROGRESS_STATIC 1035 +#define IDC_GLOBALPROCESSED_STATIC 1035 #define IDC_OVERALL_TRANSFER_STATIC 1036 +#define IDC_GLOBALTRANSFER_STATIC 1036 #define IDC_TIME_STATIC 1037 #define IDC_ROLL_UNROLL_BUTTON 1038 +#define IDC_SUBTASKPROCESSED_STATIC 1038 #define IDC_SIZE_EDIT 1039 +#define IDC_SUBTASKTIME_STATIC 1039 #define IDC_ASSOCIATEDFILES__STATIC 1040 +#define IDC_TASKID_STATIC 1040 #define IDC_START_ALL_BUTTON 1041 #define IDC_RESTART_BUTTON 1042 #define IDC_DELETE_BUTTON 1043 @@ -100,6 +118,7 @@ #define IDC_CANCEL_ALL_BUTTON 1046 #define IDC_REMOVE_FINISHED_BUTTON 1047 #define IDC_PROPERTIES_LIST 1048 +#define IDC_SUBTASKTRANSFER_STATIC 1048 #define IDC_PROGRESS_LIST 1049 #define IDC_SOURCE_EDIT 1050 #define IDC_DESTINATION_EDIT 1051 @@ -230,25 +249,44 @@ #define IDC_006_STATIC 1224 #define IDC_007_STATIC 1225 #define IDC_008_STATIC 1226 +#define IDC_SUBTASKCOUNT_LABEL_STATIC 1226 #define IDC_009_STATIC 1227 +#define IDC_CURRENTOBJECT_LABEL_STATIC 1227 #define IDC_010_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_013_STATIC 1231 +#define IDC_GLOBALPROCESSED_LABEL_STATIC 1231 #define IDC_014_STATIC 1232 +#define IDC_GLOBALSTATS_LABEL_STATIC 1232 #define IDC_015_STATIC 1233 +#define IDC_TASKSTATS_LABEL_STATIC 1233 #define IDC_016_STATIC 1234 +#define IDC_GLOBALSTATS_RIGHTLINE_STATIC 1234 #define IDC_017_STATIC 1235 +#define IDC_TASKSTATS_RIGHTLINE_STATIC 1235 #define IDC_018_STATIC 1236 +#define IDC_GLOBALSTATS_LEFTLINE_STATIC 1236 #define IDC_019_STATIC 1237 +#define IDC_TASKSTATS_LEFTLINE_STATIC 1237 #define IDC_020_STATIC 1238 +#define IDC_TASKTIME_LABEL_STATIC 1238 #define IDC_021_STATIC 1239 +#define IDC_TASKID_LABEL_STATIC 1239 #define IDC_022_STATIC 1240 +#define IDC_SUBTASKSIZE_LABEL_STATIC 1240 #define IDC_023_STATIC 1241 +#define IDC_SUBTASKPROCESSED_LABEL_STATIC 1241 #define IDC_024_STATIC 1242 +#define IDC_SUBTASKTIME_LABEL_STATIC 1242 #define IDC_025_STATIC 1243 +#define IDC_TASKCOUNT_LABEL_STATIC 1243 #define IDC_026_STATIC 1244 +#define IDC_SUBTASKTRANSFER_LABEL_STATIC 1244 #define IDC_027_STATIC 1245 +#define IDC_SUBTASKNAME_LABEL_STATIC 1245 #define IDC_028_STATIC 1246 #define IDC_029_STATIC 1247 #define IDC_030_STATIC 1248 @@ -287,6 +325,20 @@ #define IDC_DESC_STATIC 1297 #define IDC_00_STATIC 1298 #define IDC_01_STATIC 1299 +#define IDC_OPERATION_LABEL_STATIC 1300 +#define IDC_SOURCEOBJECT_LABEL_STATIC 1301 +#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_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 IDS_APPNAME_STRING 5000 #define IDS_PRIORITY0_STRING 5001 #define IDS_PRIORITY1_STRING 5002 @@ -326,7 +378,7 @@ #define IDS_UNREGISTERERR_STRING 6004 #define IDS_CRASH_STRING 6006 #define IDS_COMMAND_LINE_FAILED_STRING 6007 -#define IDS_CHEXT_ALREADY_UNREGISTERED 6008 +#define IDS_CHEXT_ALREADY_UNREGISTERED 6008 #define IDS_PROGRAM_STRING 8000 #define IDS_CLIPBOARDMONITORING_STRING 8001 #define IDS_CLIPBOARDINTERVAL_STRING 8002 @@ -556,11 +608,12 @@ #define IDS_BSTWODISKS_STRING 21537 #define IDS_BSCD_STRING 21538 #define IDS_BSLAN_STRING 21539 -#define IDS_EMPTYASSOCFILE_STRING 21549 +#define IDS_EMPTYTASKID_STRING 21549 #define IDS_FILTERING_STRING 21550 #define IDS_CONFIRMCANCEL_STRING 21551 #define IDS_STATUS_INITIALIZING_STRING 21552 #define IDS_STATUS_FASTMOVE_STRING 21553 +#define IDS_EMPTYSUBTASKNAME_STRING 21554 #define ID_POPUP_SHOW_STATUS 32773 #define ID_POPUP_TIME_CRITICAL 32774 #define ID_POPUP_HIGHEST 32775 @@ -589,7 +642,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 215 #define _APS_NEXT_COMMAND_VALUE 32818 -#define _APS_NEXT_CONTROL_VALUE 1300 +#define _APS_NEXT_CONTROL_VALUE 1314 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif