Index: src/ch/ch.rc =================================================================== diff -u -r1f27a2022090cf7aaf827a3f1ad90d6fe0038518 -r17518cb4e2c229cb291fc23e58d74c9d9d8c658a --- src/ch/ch.rc (.../ch.rc) (revision 1f27a2022090cf7aaf827a3f1ad90d6fe0038518) +++ src/ch/ch.rc (.../ch.rc) (revision 17518cb4e2c229cb291fc23e58d74c9d9d8c658a) @@ -12,6 +12,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // +#define _USING_V110_SDK71_ 1 #include "afxres.h" ///////////////////////////////////////////////////////////////////////////// @@ -220,12 +221,12 @@ CAPTION "Copying/moving parameters" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - CONTROL "List1",IDC_FILES_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,16,279,57,0,HIDC_FILES_LIST + CONTROL "List1",IDC_FILES_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,16,279,57,WS_EX_ACCEPTFILES,HIDC_FILES_LIST PUSHBUTTON "Add &file(s)...",IDC_ADDFILE_BUTTON,291,15,53,14,0,0,HIDC_ADDFILE_BUTTON PUSHBUTTON "Add f&older...",IDC_ADDDIR_BUTTON,291,30,53,14,0,0,HIDC_ADDDIR_BUTTON PUSHBUTTON "&Delete",IDC_REMOVEFILEFOLDER_BUTTON,291,45,53,14,0,0,HIDC_REMOVEFILEFOLDER_BUTTON PUSHBUTTON "&Import...",IDC_IMPORT_BUTTON,291,60,53,14,0,0,HIDC_IMPORT_BUTTON - CONTROL "",IDC_DESTPATH_COMBOBOXEX,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP,7,86,314,136,0,HIDC_DESTPATH_COMBOBOXEX + CONTROL "",IDC_DESTPATH_COMBOBOXEX,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP,7,86,314,136,WS_EX_ACCEPTFILES,HIDC_DESTPATH_COMBOBOXEX PUSHBUTTON "...",IDC_DESTBROWSE_BUTTON,326,85,18,14,0,0,HIDC_DESTBROWSE_BUTTON COMBOBOX IDC_OPERATION_COMBO,13,124,159,143,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_OPERATION_COMBO COMBOBOX IDC_PRIORITY_COMBO,181,124,159,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_PRIORITY_COMBO @@ -240,8 +241,8 @@ "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,255,329,10,0,HIDC_IGNOREFOLDERS_CHECK CONTROL "Do not copy/move contents of files - only create it (empty)",IDC_ONLYSTRUCTURE_CHECK, "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,277,329,10,0,HIDC_ONLYSTRUCTURE_CHECK - PUSHBUTTON "&OK",IDOK,186,297,50,14,0,0,HIDCANCEL - PUSHBUTTON "&Cancel",IDCANCEL,239,297,50,14,0,0,HIDCANCEL + PUSHBUTTON "&OK",IDOK,186,297,50,14,0,0,0x80950001 + PUSHBUTTON "&Cancel",IDCANCEL,239,297,50,14,0,0,0x80950002 LTEXT "Source files/folders:",IDC_001_STATIC,7,7,337,8 LTEXT "Destination folder:",IDC_002_STATIC,7,76,337,8 LTEXT "Operation type:",IDC_003_STATIC,13,115,117,8 @@ -388,31 +389,37 @@ PUSHBUTTON "&Download latest version...",IDC_OPEN_WEBPAGE_BUTTON,130,126,112,14 COMBOBOX IDC_UPDATECHANNEL_COMBO,159,101,139,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Update channel:",IDC_UPDATECHANNEL_STATIC,160,89,138,8 - LTEXT "Check for updates:",IDC_CHECKFORUPDATESFREQ_STATIC,7,89,62,8 + LTEXT "Check for updates:",IDC_CHECKFORUPDATESFREQ_STATIC,7,89,142,8 COMBOBOX IDC_UPDATESFREQ_COMBO,7,101,142,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_CHANGELOG_RICHEDIT,"RichEdit20W",ES_MULTILINE | ES_READONLY | ES_NUMBER | WS_VSCROLL | WS_TABSTOP,51,25,247,56 ICON "",IDC_ICON_STATIC,15,15,20,20 CONTROL "Custom1",IDC_MAINUPDATEINFO_CUSTOM,"STATICEX",0x30,47,7,251,14 END -IDD_FEEDBACK_REPLACE_DIALOG DIALOGEX 0, 0, 273, 159 +IDD_FEEDBACK_REPLACE_DIALOG DIALOGEX 0, 0, 319, 186 STYLE DS_SETFONT | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME 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,259,15 - PUSHBUTTON "&Replace",IDC_REPLACE_BUTTON,7,124,50,14 - PUSHBUTTON "&Copy rest",IDC_COPY_REST_BUTTON,60,124,50,14 - CONTROL "&Apply to all items",IDC_ALL_ITEMS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,142,259,10 - PUSHBUTTON "&Skip",IDC_SKIP_BUTTON,111,124,50,14 - PUSHBUTTON "&Pause",IDC_PAUSE_BUTTON,163,124,50,14 - PUSHBUTTON "&Cancel",IDC_CANCEL_BUTTON,216,124,50,14 - ICON "",IDC_SRC_ICON_STATIC,21,36,21,20 - ICON "",IDC_DST_ICON_STATIC,21,86,21,20 - LTEXT "",IDC_SRC_INFO_STATIC,60,32,206,36 - LTEXT "",IDC_DST_INFO_STATIC,60,81,206,36 - LTEXT "File being copied:",IDC_00_STATIC,14,20,250,8 - LTEXT "Existing file:",IDC_01_STATIC,16,70,250,8 + PUSHBUTTON "&Replace",IDC_REPLACE_BUTTON,8,148,60,14 + PUSHBUTTON "&Append",IDC_COPY_REST_BUTTON,69,148,60,14 + PUSHBUTTON "&Skip",IDC_SKIP_BUTTON,130,148,60,14 + PUSHBUTTON "&Pause",IDC_PAUSE_BUTTON,191,148,60,14 + PUSHBUTTON "&Cancel",IDC_CANCEL_BUTTON,252,148,60,14 + CONTROL "&Apply to all items",IDC_ALL_ITEMS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,169,305,10 + EDITTEXT IDC_SRC_FILENAME_EDIT,54,31,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_SRC_PATH_EDIT,54,42,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_SRC_FILESIZE_EDIT,54,53,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_SRC_MODIFIEDDATE_EDIT,54,64,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_DST_FILENAME_EDIT,54,94,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_DST_PATH_EDIT,54,105,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_DST_FILESIZE_EDIT,54,116,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_DST_MODIFIEDDATE_EDIT,54,127,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + LTEXT "File you are trying to copy already exists. What do you want to do?",IDC_INFO_STATIC,7,7,305,15 + ICON "",IDC_SRC_ICON_STATIC,20,38,20,20 + ICON "",IDC_DST_ICON_STATIC,20,102,20,20 + GROUPBOX "Source file",IDC_SRCFILE_STATIC,7,20,305,58 + GROUPBOX "Destination file",IDC_DSTFILE_STATIC,7,83,305,58 END @@ -547,9 +554,9 @@ IDD_FEEDBACK_REPLACE_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 266 + RIGHTMARGIN, 312 TOPMARGIN, 7 - BOTTOMMARGIN, 152 + BOTTOMMARGIN, 179 END END #endif // APSTUDIO_INVOKED @@ -681,6 +688,7 @@ 2 TEXTINCLUDE BEGIN + "#define _USING_V110_SDK71_ 1\r\n" "#include ""afxres.h""\r\n" "\0" END @@ -720,7 +728,17 @@ 0 END +IDD_FEEDBACK_REPLACE_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END +IDD_CUSTOM_COPY_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END + + ///////////////////////////////////////////////////////////////////////////// // // String Table @@ -832,6 +850,7 @@ IDS_CFGLOGLEVEL_VALUES "Debug!Info!Warning!Error" IDS_UPDATE_FREQUENCIES "Never!Every startup!Daily!Weekly!Once every 2 weeks!Monthly!Quarterly" IDS_BUFFER_QUEUE_DEPTH "Buffer queue depth" + IDS_FASTMOVEBEFOREBLOCK_STRING "Use fast move before blocking" END STRINGTABLE @@ -892,7 +911,7 @@ IDS_EMPTYOPERATIONTEXT_STRING "None of tasks selected" IDS_EMPTYSOURCETEXT_STRING "empty" IDS_EMPTYDESTINATIONTEXT_STRING "empty" - IDS_EMPTYBUFFERSIZETEXT_STRING "unknown" + IDS_EMPTYBUFFERSIZETEXT_STRING "unused" IDS_EMPTYPRIORITYTEXT_STRING "unknown" IDS_EMPTYPROCESSEDTEXT_STRING "empty" IDS_EMPTYTRANSFERTEXT_STRING "unknown" @@ -928,6 +947,7 @@ IDS_EMPTYSUBTASKNAME_STRING "none" IDS_STATUS_LOADERROR_STRING "Load error" IDS_EXPORTING_TASK_FAILED "Exporting task data failed. Reason: %reason." + IDS_BUTTON_TRUNCATE_STRING "&Truncate" END STRINGTABLE @@ -1153,13 +1173,19 @@ IDS_BDDIR_STRING "Directory" IDS_BDTREE_STRING "Tree" IDS_BDNDSCONTAINER_STRING "NDS Container" - IDS_INFO_FILE_STRING "File: %filename" + IDS_INFO_PATH_STRING "Location: %pathname" IDS_INFO_SIZE_STRING "Size: %size" IDS_INFO_MODIFIED_STRING "Modified: %datemod" END STRINGTABLE BEGIN + IDS_INFO_REASON_STRING "Reason: %reason" + IDS_INFO_FILE_STRING "File: %filename" +END + +STRINGTABLE +BEGIN IDS_INFO_TWO_FILE_STRING "Source file: %filename\nDestination file: %dstfilename" IDS_OK_STRING "&OK" @@ -1180,7 +1206,8 @@ STRINGTABLE BEGIN - IDS_UPDATER_EQUAL_VERSION_STRING "Your current version: %thisver (%thisnumericver)" + IDS_UPDATER_EQUAL_VERSION_STRING + "Your current version: %thisver (%thisnumericver)" IDS_UPDATER_ERROR_STRING "Check for updates error" IDS_UPDATER_WAITING_STRING "Connecting with %site..." IDS_SHELL_EXTENSION_MISMATCH_STRING @@ -1200,11 +1227,6 @@ IDS_HIDE_AND_DONT_REGISTER "Hide and do not register extension" END -STRINGTABLE -BEGIN - IDS_INFO_REASON_STRING "Reason: %reason" -END - #endif // English (United States) resources /////////////////////////////////////////////////////////////////////////////