Index: src/ch/ch.rc =================================================================== diff -u -N -r829650fe5755561af4dc1c25b6df7a728a737684 -re912e0a6b456c2eed24bec7303a908d3ff0aa59a --- src/ch/ch.rc (.../ch.rc) (revision 829650fe5755561af4dc1c25b6df7a728a737684) +++ src/ch/ch.rc (.../ch.rc) (revision e912e0a6b456c2eed24bec7303a908d3ff0aa59a) @@ -150,125 +150,21 @@ PUSHBUTTON "&Help",IDC_HELP_BUTTON,287,106,50,14,0,0,HIDC_HELP_BUTTON END -IDD_FEEDBACK_DSTFILE_DIALOG DIALOGEX 0, 0, 290, 111 +IDD_FEEDBACK_FILE_ERROR_DIALOG DIALOGEX 0, 0, 283, 112 STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Copy handler - error opening file" +CAPTION "File Error" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - PUSHBUTTON "&Retry",IDC_RETRY_BUTTON,7,90,53,14,0,0,HIDC_RETRY_BUTTON - PUSHBUTTON "&Ignore",IDC_IGNORE_BUTTON,63,90,50,14,0,0,HIDC_IGNORE_BUTTON - PUSHBUTTON "I&gnore all",IDC_IGNORE_ALL_BUTTON,114,90,62,14,0,0,HIDC_IGNORE_ALL_BUTTON - DEFPUSHBUTTON "&Wait",IDC_WAIT_BUTTON,178,90,50,14,0,0,HIDC_WAIT_BUTTON - PUSHBUTTON "&Cancel",IDCANCEL,233,90,50,14,0,0,HIDCANCEL - EDITTEXT IDC_FILENAME_EDIT,44,23,239,17,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_FILENAME_EDIT - EDITTEXT IDC_MESSAGE_EDIT,44,57,239,24,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_MESSAGE_EDIT - ICON IDI_ERR_ICON,IDC_001_STATIC,11,15,20,20,SS_REALSIZEIMAGE - LTEXT "Cannot open file for writing:",IDC_002_STATIC,38,13,245,8 - LTEXT "Error description:",IDC_003_STATIC,38,46,245,8 + PUSHBUTTON "&Retry",IDC_RETRY_BUTTON,7,79,64,14,0,0,HIDC_RETRY_BUTTON + PUSHBUTTON "&Skip",IDC_SKIP_BUTTON,74,79,64,14,0,0,HIDC_SKIP_BUTTON + DEFPUSHBUTTON "&Pause",IDC_PAUSE_BUTTON,141,79,64,14,0,0,HIDC_PAUSE_BUTTON + PUSHBUTTON "&Cancel",IDCANCEL,212,79,64,14,0,0,HIDCANCEL + ICON IDI_ERR_ICON,IDC_001_STATIC,15,15,21,20,SS_REALSIZEIMAGE + CONTROL "&Apply to all items",IDC_ALL_ITEMS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,269,10 + LTEXT "Encountered an error while processing file.",IDC_DESC_STATIC,43,7,223,23 + LTEXT "File: c:\\test.avi\nReason: No permission to perform the operation requested.",IDC_INFO_STATIC,51,28,225,42 END -IDD_FEEDBACK_IGNOREWAITRETRY_DIALOG DIALOGEX 0, 0, 294, 242 -STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Copy handler - error opening file" -FONT 8, "Tahoma", 0, 0, 0x1 -BEGIN - PUSHBUTTON "&Retry",IDC_RETRY_BUTTON,7,221,50,14,0,0,HIDC_RETRY_BUTTON - PUSHBUTTON "&Ignore",IDC_IGNORE_BUTTON,60,221,50,14,0,0,HIDC_IGNORE_BUTTON - PUSHBUTTON "I&gnore all",IDC_IGNORE_ALL_BUTTON,110,221,69,14,0,0,HIDC_IGNORE_ALL_BUTTON - DEFPUSHBUTTON "&Wait",IDC_WAIT_BUTTON,183,221,50,14,0,0,HIDC_WAIT_BUTTON - PUSHBUTTON "&Cancel",IDCANCEL,237,221,50,14,0,0,HIDCANCEL - EDITTEXT IDC_MESSAGE_EDIT,49,19,238,23,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_MESSAGE_EDIT - EDITTEXT IDC_FILENAME_EDIT,111,54,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_FILENAME_EDIT - EDITTEXT IDC_FILESIZE_EDIT,111,69,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_FILESIZE_EDIT - EDITTEXT IDC_CREATETIME_EDIT,111,84,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_CREATETIME_EDIT - EDITTEXT IDC_MODIFY_TIME_EDIT,111,99,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_MODIFY_TIME_EDIT - EDITTEXT IDC_DEST_FILENAME_EDIT,111,130,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_FILENAME_EDIT - EDITTEXT IDC_DEST_FILESIZE_EDIT,111,145,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_FILESIZE_EDIT - EDITTEXT IDC_DEST_CREATETIME_EDIT,111,160,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_CREATETIME_EDIT - EDITTEXT IDC_DEST_MODIFYTIME_EDIT,111,175,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_MODIFYTIME_EDIT - LTEXT "Cannot open source file for reading - reason:",IDC_001_STATIC,49,10,238,8 - LTEXT "Name:",IDC_002_STATIC,53,54,53,8 - LTEXT "Size:",IDC_003_STATIC,53,69,53,8 - LTEXT "Created:",IDC_004_STATIC,53,84,53,8 - LTEXT "Last modified:",IDC_005_STATIC,53,99,53,8 - LTEXT "Expected source file:",IDC_006_STATIC,49,42,238,8 - ICON IDI_ERR_ICON,IDC_007_STATIC,16,19,20,20,SS_REALSIZEIMAGE - LTEXT "Name:",IDC_008_STATIC,53,130,53,8 - LTEXT "Size:",IDC_009_STATIC,53,145,53,8 - LTEXT "Created:",IDC_010_STATIC,53,160,53,8 - LTEXT "Last modified:",IDC_011_STATIC,53,175,53,8 - LTEXT "Source file found:",IDC_012_STATIC,49,118,81,8 - LTEXT "What would you like to do ?",IDC_013_STATIC,39,204,248,8 -END - -IDD_FEEDBACK_REPLACE_FILES_DIALOG DIALOGEX 0, 0, 294, 258 -STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Copy handler - smaller destination file found" -FONT 8, "Tahoma", 0, 0, 0x1 -BEGIN - DEFPUSHBUTTON "Co&py rest",IDC_COPY_REST_BUTTON,7,237,62,14,0,0,HIDC_COPY_REST_BUTTON - PUSHBUTTON "R&ecopy",IDC_RECOPY_BUTTON,69,237,74,14,0,0,HIDC_RECOPY_BUTTON - PUSHBUTTON "&Ignore",IDC_IGNORE_BUTTON,143,237,58,14,0,0,HIDC_IGNORE_BUTTON - PUSHBUTTON "&Cancel",IDCANCEL,237,237,50,14,0,0,HIDCANCEL - PUSHBUTTON "Cop&y rest all",IDC_COPY_REST_ALL_BUTTON,7,222,83,14,0,0,HIDC_COPY_REST_ALL_BUTTON - PUSHBUTTON "Recopy &all",IDC_RECOPY_ALL_BUTTON,91,222,110,14,0,0,HIDC_RECOPY_ALL_BUTTON - PUSHBUTTON "I&gnore all",IDC_IGNORE_ALL_BUTTON,201,222,86,14,0,0,HIDC_IGNORE_ALL_BUTTON - EDITTEXT IDC_FILENAME_EDIT,111,62,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_FILENAME_EDIT - EDITTEXT IDC_FILESIZE_EDIT,111,77,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_FILESIZE_EDIT - EDITTEXT IDC_CREATETIME_EDIT,111,92,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_CREATETIME_EDIT - EDITTEXT IDC_MODIFY_TIME_EDIT,111,107,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_MODIFY_TIME_EDIT - EDITTEXT IDC_DEST_FILENAME_EDIT,111,138,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_FILENAME_EDIT - EDITTEXT IDC_DEST_FILESIZE_EDIT,111,153,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_FILESIZE_EDIT - EDITTEXT IDC_DEST_CREATETIME_EDIT,111,168,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_CREATETIME_EDIT - EDITTEXT IDC_DEST_MODIFYTIME_EDIT,111,183,176,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_MODIFYTIME_EDIT - ICON IDI_QUESTION_ICON,IDC_001_STATIC,10,15,20,20,SS_REALSIZEIMAGE - LTEXT "Destination file exists and is smaller than source file.\nPossible reasons:\n- copying/moving source file wasn't finished (copy rest)\n- file being copied is in another version than destination file (recopy)",IDC_002_STATIC,41,7,246,41 - LTEXT "Name:",IDC_003_STATIC,48,62,61,8 - LTEXT "Size:",IDC_004_STATIC,48,77,61,8 - LTEXT "Created:",IDC_005_STATIC,48,92,61,8 - LTEXT "Last modified:",IDC_006_STATIC,48,107,61,8 - LTEXT "Source file:",IDC_007_STATIC,41,50,246,8 - LTEXT "Name:",IDC_008_STATIC,48,138,61,8 - LTEXT "Size:",IDC_009_STATIC,48,153,61,8 - LTEXT "Created:",IDC_010_STATIC,48,168,61,8 - LTEXT "Last modified:",IDC_011_STATIC,48,183,61,8 - LTEXT "Destination file:",IDC_012_STATIC,41,125,246,8 - LTEXT "What would you like to do ?",IDC_013_STATIC,41,203,246,8 -END - -IDD_FEEDBACK_SMALL_REPLACE_FILES_DIALOG DIALOGEX 0, 0, 294, 258 -STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Copy handler - destination file found" -FONT 8, "Tahoma", 0, 0, 0x1 -BEGIN - PUSHBUTTON "R&ecopy",IDC_RECOPY_BUTTON,7,237,143,14,0,0,HIDC_RECOPY_BUTTON - DEFPUSHBUTTON "&Ignore",IDC_IGNORE_BUTTON,151,237,86,14,0,0,HIDC_IGNORE_BUTTON - PUSHBUTTON "&Cancel",IDCANCEL,237,237,50,14,0,0,HIDCANCEL - PUSHBUTTON "Recopy &all",IDC_RECOPY_ALL_BUTTON,7,222,143,14,0,0,HIDC_RECOPY_ALL_BUTTON - PUSHBUTTON "I&gnore all",IDC_IGNORE_ALL_BUTTON,151,222,136,14,0,0,HIDC_IGNORE_ALL_BUTTON - EDITTEXT IDC_FILENAME_EDIT,111,64,173,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_FILENAME_EDIT - EDITTEXT IDC_FILESIZE_EDIT,111,79,173,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_FILESIZE_EDIT - EDITTEXT IDC_CREATETIME_EDIT,111,94,173,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_CREATETIME_EDIT - EDITTEXT IDC_MODIFY_TIME_EDIT,111,109,173,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_MODIFY_TIME_EDIT - EDITTEXT IDC_DEST_FILENAME_EDIT,111,138,173,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_FILENAME_EDIT - EDITTEXT IDC_DEST_FILESIZE_EDIT,111,153,173,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_FILESIZE_EDIT - EDITTEXT IDC_DEST_CREATETIME_EDIT,111,168,173,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_CREATETIME_EDIT - EDITTEXT IDC_DEST_MODIFYTIME_EDIT,111,183,173,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,0,HIDC_DEST_MODIFYTIME_EDIT - ICON IDI_QUESTION_ICON,IDC_001_STATIC,10,15,20,20,SS_REALSIZEIMAGE - LTEXT "Destination file exists and has equal or greater size than source file.\nPossible reasons:\n- file being copied is in another version than destination one (recopy/ignore)\n- source and destination files are identical (ignore)",IDC_002_STATIC,41,7,246,44 - LTEXT "Name:",IDC_003_STATIC,48,64,61,8 - LTEXT "Size:",IDC_004_STATIC,48,79,61,8 - LTEXT "Created:",IDC_005_STATIC,48,94,61,8 - LTEXT "Last modified:",IDC_006_STATIC,48,109,61,8 - LTEXT "Source file:",IDC_007_STATIC,41,52,246,8 - LTEXT "Name:",IDC_008_STATIC,48,138,61,8 - LTEXT "Size:",IDC_009_STATIC,48,153,61,8 - LTEXT "Created:",IDC_010_STATIC,48,168,61,8 - LTEXT "Last modified:",IDC_011_STATIC,48,183,61,8 - LTEXT "Destination file:",IDC_012_STATIC,41,125,246,8 - LTEXT "What would you like to do ?",IDC_013_STATIC,41,203,246,8 -END - IDD_MINIVIEW_DIALOG DIALOGEX 0, 0, 90, 23 STYLE DS_ABSALIGN | DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION EXSTYLE WS_EX_TOOLWINDOW @@ -366,21 +262,22 @@ CONTROL "",IDC_PRIORITY_STATIC,"STATICEX",0x4,312,88,143,12,WS_EX_STATICEDGE,HIDC_PRIORITY_STATIC END -IDD_FEEDBACK_NOTENOUGHPLACE_DIALOG DIALOGEX 0, 0, 254, 138 +IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG DIALOGEX 0, 0, 254, 147 STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Copy handler - not enough free space" +CAPTION "Not enough free space" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - PUSHBUTTON "&Retry",IDC_RETRY_BUTTON,78,117,57,14,0,0,HIDC_RETRY_BUTTON - PUSHBUTTON "C&ontinue",IDC_IGNORE_BUTTON,136,117,57,14,0,0,HIDC_IGNORE_BUTTON - PUSHBUTTON "&Cancel",IDCANCEL,197,117,50,14,0,0,HIDCANCEL + PUSHBUTTON "&Retry",IDC_RETRY_BUTTON,78,113,57,14,0,0,HIDC_RETRY_BUTTON + PUSHBUTTON "C&ontinue",IDC_IGNORE_BUTTON,136,113,57,14,0,0,HIDC_IGNORE_BUTTON + PUSHBUTTON "&Cancel",IDCANCEL,197,113,50,14,0,0,HIDCANCEL LISTBOX IDC_FILES_LIST,41,35,206,44,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,0,HIDC_FILES_LIST LTEXT "",IDC_REQUIRED_STATIC,108,85,139,8,0,0,HIDC_REQUIRED_STATIC LTEXT "",IDC_AVAILABLE_STATIC,108,97,139,8,0,0,HIDC_AVAILABLE_STATIC ICON IDI_WARNING_ICON,IDC_001_STATIC,9,11,20,20,SS_REALSIZEIMAGE LTEXT "Required space:",IDC_003_STATIC,41,85,59,8 LTEXT "Space available:",IDC_004_STATIC,41,97,59,8 LTEXT "",IDC_HEADER_STATIC,41,7,206,24 + CONTROL "&Do not ask anymore",IDC_ALL_ITEMS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,240,10 END IDD_SHUTDOWN_DIALOG DIALOGEX 0, 0, 186, 86 @@ -573,7 +470,25 @@ PUSHBUTTON "&Download latest version...",IDC_OPEN_WEBPAGE_BUTTON,85,62,112,14 END +IDD_FEEDBACK_REPLACE_DIALOG DIALOGEX 0, 0, 272, 152 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "File already exists" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "File you are trying to copy already exists. What do you want to do ?",IDC_INFO_STATIC,7,7,258,15 + PUSHBUTTON "&Replace",IDC_REPLACE_BUTTON,7,118,50,14 + PUSHBUTTON "&Copy rest",IDC_COPY_REST_BUTTON,60,118,50,14 + CONTROL "&Apply to all items",IDC_ALL_ITEMS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,135,258,10 + PUSHBUTTON "&Skip",IDC_SKIP_BUTTON,111,118,50,14 + PUSHBUTTON "&Pause",IDC_PAUSE_BUTTON,163,118,50,14 + PUSHBUTTON "&Cancel",IDC_CANCEL_BUTTON,215,118,50,14 + ICON "",IDC_SRC_ICON_STATIC,21,31,21,20 + ICON "",IDC_DST_ICON_STATIC,21,79,21,20 + LTEXT "File: c:\\projects\\xxx.avi\nSize: 154kB\nLast modified: 2008-01-12",IDC_SRC_INFO_STATIC,59,27,206,41 + LTEXT "File: c:\\projects\\xxx.avi\nSize: 154kB\nLast modified: 2008-01-12",IDC_DST_INFO_STATIC,59,74,206,41 +END + ///////////////////////////////////////////////////////////////////////////// // // DESIGNINFO @@ -590,38 +505,14 @@ BOTTOMMARGIN, 120 END - IDD_FEEDBACK_DSTFILE_DIALOG, DIALOG + IDD_FEEDBACK_FILE_ERROR_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 283 + RIGHTMARGIN, 276 TOPMARGIN, 7 - BOTTOMMARGIN, 104 + BOTTOMMARGIN, 105 END - IDD_FEEDBACK_IGNOREWAITRETRY_DIALOG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 287 - TOPMARGIN, 7 - BOTTOMMARGIN, 235 - END - - IDD_FEEDBACK_REPLACE_FILES_DIALOG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 287 - TOPMARGIN, 7 - BOTTOMMARGIN, 251 - END - - IDD_FEEDBACK_SMALL_REPLACE_FILES_DIALOG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 287 - TOPMARGIN, 7 - BOTTOMMARGIN, 251 - END - IDD_MINIVIEW_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 @@ -654,12 +545,12 @@ BOTTOMMARGIN, 243 END - IDD_FEEDBACK_NOTENOUGHPLACE_DIALOG, DIALOG + IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 247 TOPMARGIN, 7 - BOTTOMMARGIN, 131 + BOTTOMMARGIN, 140 END IDD_SHUTDOWN_DIALOG, DIALOG @@ -725,6 +616,14 @@ TOPMARGIN, 7 BOTTOMMARGIN, 76 END + + IDD_FEEDBACK_REPLACE_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 265 + TOPMARGIN, 7 + BOTTOMMARGIN, 145 + END END #endif // APSTUDIO_INVOKED @@ -1271,6 +1170,9 @@ IDS_BDDIR_STRING "Directory" IDS_BDTREE_STRING "Tree" IDS_BDNDSCONTAINER_STRING "NDS Container" + IDS_INFO_FILE_STRING "File: %filename" + IDS_INFO_SIZE_STRING "Size: %size" + IDS_INFO_MODIFIED_STRING "Modified: %datemod" END STRINGTABLE @@ -1295,6 +1197,11 @@ "CH shell extension registered on your system does not match the Copy Handler version you are currently running.\nPlease re-register the shell extension using Copy Handler context menu and reboot your system to make sure the proper version is loaded.\n\nCopy Handler shell extension will be disabled." END +STRINGTABLE +BEGIN + IDS_INFO_REASON_STRING "Reason: %reason" +END + #endif // English (U.S.) resources /////////////////////////////////////////////////////////////////////////////