Index: src/ch/ch.rc =================================================================== diff -u -rb9453afbc6264bc3f3c6a7f86fadab7744e0fb16 -rf51cacae8d8461c98bbb4a498407d6aec8f94410 --- src/ch/ch.rc (.../ch.rc) (revision b9453afbc6264bc3f3c6a7f86fadab7744e0fb16) +++ src/ch/ch.rc (.../ch.rc) (revision f51cacae8d8461c98bbb4a498407d6aec8f94410) @@ -427,7 +427,102 @@ LTEXT "Modified:",IDC_DST_TIME_STATIC,49,159,45,8 END +IDD_RULE_EDIT_ALREADYEXISTS_DIALOG DIALOGEX 0, 0, 291, 219 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "File already exists rule editor" +FONT 8, "Tahoma", 0, 0, 0x1 +BEGIN + CONTROL "Include mask (separate by vertical lines ie. *.jpg|*.gif)",IDC_INCLUDE_MASK_CHECK, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,23,277,10 + COMBOBOX IDC_INCLUDE_MASK_COMBO,15,35,269,98,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "Exclude mask",IDC_EXCLUDE_MASK_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,51,277,10 + COMBOBOX IDC_EXCLUDE_MASK_COMBO,15,64,269,170,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "Filtering by size",IDC_FILTER_BY_SIZE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,82,277,10 + COMBOBOX IDC_FILTER_BY_SIZE_COMBO,122,95,50,135,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Filtering by modification date",IDC_FILTER_BY_DATE_CHECK, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,113,277,10 + COMBOBOX IDC_FILTER_BY_DATE_COMBO,122,127,50,133,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "&OK",IDOK,179,198,50,14 + PUSHBUTTON "&Cancel",IDCANCEL,234,198,50,14 + CONTROL "",IDC_BOTTOM_BAR_STATIC,"Static",SS_ETCHEDHORZ,7,191,275,1 + LTEXT "When all of the following conditions are met...:",IDC_HEADER_STATIC,7,7,277,8 + LTEXT "...then respond with:",IDC_RESPONSE_STATIC,7,155,277,8 + COMBOBOX IDC_RESPONSE_COMBO,15,168,269,133,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + RTEXT "Size of source file",IDC_SOURCE_SIZE_STATIC,15,96,103,8 + LTEXT "size of destination file",IDC_DST_SIZE_STATIC,176,96,103,8 + RTEXT "Date of source file",IDC_SOURCE_DATE_STATIC,15,129,103,8 + LTEXT "date of destination file",IDC_DST_DATE_STATIC,176,129,103,8 +END +IDD_RULE_EDIT_ERROR_DIALOG DIALOGEX 0, 0, 291, 219 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "File error rule editor" +FONT 8, "Tahoma", 0, 0, 0x1 +BEGIN + CONTROL "Include mask (separate by vertical lines ie. *.jpg|*.gif)",IDC_INCLUDE_MASK_CHECK, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,23,277,10 + COMBOBOX IDC_INCLUDE_MASK_COMBO,15,35,269,98,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "Exclude mask",IDC_EXCLUDE_MASK_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,51,277,10 + COMBOBOX IDC_EXCLUDE_MASK_COMBO,15,64,269,170,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "Filtering by operation",IDC_FILTER_BY_OPERATION_CHECK, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,82,277,10 + COMBOBOX IDC_FILTER_BY_OPERATION_COMBO,15,96,269,135,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Filtering by system error number",IDC_FILTER_BY_SYSTEMERROR_CHECK, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,113,277,10 + DEFPUSHBUTTON "&OK",IDOK,179,198,50,14 + PUSHBUTTON "&Cancel",IDCANCEL,234,198,50,14 + CONTROL "",IDC_001_STATIC,"Static",SS_ETCHEDHORZ,7,191,275,1 + LTEXT "When all of the following conditions are met...:",IDC_HEADER_STATIC,7,7,277,8 + LTEXT "...then respond with:",IDC_RESPONSE_STATIC,7,155,277,8 + COMBOBOX IDC_RESPONSE_COMBO,15,168,269,133,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_FILTER_BY_SYSTEMERROR_EDIT,15,126,269,14,ES_AUTOHSCROLL | ES_NUMBER +END + +IDD_RULE_EDIT_NOTENOUGHSPACE_DIALOG DIALOGEX 0, 0, 291, 157 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Not enough space rule editor" +FONT 8, "Tahoma", 0, 0, 0x1 +BEGIN + CONTROL "Include mask (separate by vertical lines ie. *.jpg|*.gif)",IDC_INCLUDE_MASK_CHECK, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,23,277,10 + COMBOBOX IDC_INCLUDE_MASK_COMBO,15,35,269,98,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "Exclude mask",IDC_EXCLUDE_MASK_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,51,277,10 + COMBOBOX IDC_EXCLUDE_MASK_COMBO,15,64,269,170,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "&OK",IDOK,179,135,50,14 + PUSHBUTTON "&Cancel",IDCANCEL,234,135,50,14 + CONTROL "",IDC_BOTTOM_BAR_STATIC,"Static",SS_ETCHEDHORZ,7,128,274,1 + LTEXT "When all of the following conditions are met...:",IDC_HEADER_STATIC,7,7,277,8 + LTEXT "...then respond with:",IDC_RESPONSE_STATIC,7,92,277,8 + COMBOBOX IDC_RESPONSE_COMBO,15,105,269,133,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_RULE_EDIT_ALL_DIALOG DIALOGEX 0, 0, 351, 341 +STYLE DS_SETFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Feedback rules editor" +FONT 8, "Tahoma", 0, 0, 0x1 +BEGIN + CONTROL "List2",IDC_FILE_ALREADY_EXISTS_RULES_LIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,7,18,337,65 + PUSHBUTTON "&OK",IDOK,239,320,50,14 + PUSHBUTTON "&Cancel",IDCANCEL,294,320,50,14 + CONTROL "",IDC_BOTTOM_BAR_STATIC,"Static",SS_ETCHEDHORZ,8,313,336,1 + PUSHBUTTON "Change...",IDC_ALREADY_EXISTS_CHANGE_BUTTON,184,87,50,14 + PUSHBUTTON "Remove",IDC_ALREADY_EXISTS_REMOVE_BUTTON,294,87,50,14 + LTEXT "File already exists rules:",IDC_FILE_ALREADY_EXISTS_STATIC,7,7,337,8 + CONTROL "",IDC_FILE_ERROR_RULES_LIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,7,119,337,65 + LTEXT "File error rules:",IDC_FILE_ERROR_RULES_STATIC,7,108,337,8 + CONTROL "",IDC_NOT_ENOUGH_SPACE_RULES_LIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,7,223,337,65 + LTEXT "Not enough space rules:",IDC_NOT_ENOUGH_SPACE_STATIC,7,212,337,8 + PUSHBUTTON "Add...",IDC_ALREADY_EXISTS_ADD_BUTTON,239,87,50,14 + PUSHBUTTON "Change...",IDC_FILE_ERROR_CHANGE_BUTTON,184,188,50,14 + PUSHBUTTON "Remove",IDC_FILE_ERROR_REMOVE_BUTTON,294,188,50,14 + PUSHBUTTON "Add...",IDC_FILE_ERROR_ADD_BUTTON,239,188,50,14 + PUSHBUTTON "Change...",IDC_NOT_ENOUGH_SPACE_CHANGE_BUTTON,184,292,50,14 + PUSHBUTTON "Remove",IDC_NOT_ENOUGH_SPACE_REMOVE_BUTTON,294,292,50,14 + PUSHBUTTON "Add...",IDC_NOT_ENOUGH_SPACE_ADD_BUTTON,239,292,50,14 +END + + ///////////////////////////////////////////////////////////////////////////// // // DESIGNINFO @@ -563,6 +658,38 @@ TOPMARGIN, 7 BOTTOMMARGIN, 216 END + + IDD_RULE_EDIT_ALREADYEXISTS_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 284 + TOPMARGIN, 7 + BOTTOMMARGIN, 212 + END + + IDD_RULE_EDIT_ERROR_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 284 + TOPMARGIN, 7 + BOTTOMMARGIN, 212 + END + + IDD_RULE_EDIT_NOTENOUGHSPACE_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 284 + TOPMARGIN, 7 + BOTTOMMARGIN, 150 + END + + IDD_RULE_EDIT_ALL_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 344 + TOPMARGIN, 7 + BOTTOMMARGIN, 334 + END END #endif // APSTUDIO_INVOKED @@ -676,7 +803,27 @@ 0 END +IDD_RULE_EDIT_ALREADYEXISTS_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END +IDD_RULE_EDIT_ERROR_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_RULE_EDIT_NOTENOUGHSPACE_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_RULE_EDIT_ALL_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END + + ///////////////////////////////////////////////////////////////////////////// // // Icon @@ -1265,6 +1412,7 @@ IDS_EQ_STRING "=" IDS_GE_STRING ">=" IDS_GT_STRING ">" + IDS_DT_STRING "<>" IDS_UPDATER_NEW_VERSION_STRING "Updated version: %officialver (%numericver).\nReleased: %reldate" END @@ -1285,10 +1433,23 @@ IDS_UPDATER_NEWVERSIONEXISTS "There are updates available" IDS_UPDATER_RELEASENOTES "Release notes:" IDS_FINALIZE_CH_ERROR "Failed to finalize Copy Handler. Some information about tasks being processed might be lost. Error: %reason." + IDS_FEEDBACK_RESPONSE_UNKNOWN "Unknown" + IDS_FEEDBACK_RESPONSE_OVERWRITE "Replace" + IDS_FEEDBACK_RESPONSE_RESUME "Resume" + IDS_FEEDBACK_RESPONSE_SKIP "Skip" + IDS_FEEDBACK_RESPONSE_CANCEL "Cancel" END STRINGTABLE BEGIN + IDS_FEEDBACK_RESPONSE_PAUSE "Pause" + IDS_FEEDBACK_RESPONSE_RETRY "Retry" + IDS_FEEDBACK_RESPONSE_IGNORE "Ignore" + IDS_FEEDBACK_RESPONSE_RENAME "Rename" +END + +STRINGTABLE +BEGIN IDS_BSONEDISK_STRING "One disk: " IDS_BSTWODISKS_STRING "Two disks: " IDS_BSCD_STRING "CD: " @@ -1355,10 +1516,29 @@ "Cannot initialize common controls. The application will now exit." IDS_ERROR_INITIALIZING_RICH_EDIT_CONTROL "Cannot initialize rich edit control. The application will now exit." + IDS_HDRRESULT_STRING "Response" + IDS_SOURCE_FILE_STRING "source" + IDS_DESTINATION_FILE_STRING "destination" + IDS_HDROPERATION_STRING "Operation" + IDS_HDRSYSTEMERROR_STRING "System error" + IDS_OPERATION_DELETEERROR "Delete" + IDS_OPERATION_SEEKERROR "Seek" + IDS_OPERATION_RESIZEERROR "Resize" + IDS_OPERATION_READERROR "Read" + IDS_OPERATION_WRITEERROR "Write" + IDS_OPERATION_FINALIZEERROR "Finalize" + IDS_OPERATION_FASTMOVEERROR "Fast move" + IDS_OPERATION_CREATEERROR "Create" END STRINGTABLE BEGIN + IDS_OPERATION_CHECKFORFREESPACE "Check for free space" + IDS_OPERATION_RETRIEVEFILEINFO "Retrieve file information" +END + +STRINGTABLE +BEGIN IDS_DATECREATED_STRING "Date of creation" IDS_DATELASTWRITE_STRING "Date of last write" IDS_DATEACCESSED_STRING "Date of last access"