Index: src/ch/ch.rc =================================================================== diff -u -re2680c5f62127570e7e9b8d943f7838db49d4a63 -r5d8ca703882285442606338c1acfc5fff6084e59 --- src/ch/ch.rc (.../ch.rc) (revision e2680c5f62127570e7e9b8d943f7838db49d4a63) +++ src/ch/ch.rc (.../ch.rc) (revision 5d8ca703882285442606338c1acfc5fff6084e59) @@ -391,29 +391,35 @@ LTEXT "Update channel:",IDC_UPDATECHANNEL_STATIC,160,89,138,8 LTEXT "Check for updates:",IDC_CHECKFORUPDATESFREQ_STATIC,7,89,62,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 + CONTROL "",IDC_CHANGELOG_RICHEDIT,"RichEdit20W",WS_VSCROLL | WS_TABSTOP | 0x2804,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, 184 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,146,60,14 + PUSHBUTTON "&Append",IDC_COPY_REST_BUTTON,69,146,60,14 + PUSHBUTTON "&Skip",IDC_SKIP_BUTTON,130,146,60,14 + PUSHBUTTON "&Pause",IDC_PAUSE_BUTTON,191,146,60,14 + PUSHBUTTON "&Cancel",IDC_CANCEL_BUTTON,252,146,60,14 + CONTROL "&Apply to all items",IDC_ALL_ITEMS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,167,305,10 + EDITTEXT IDC_SRC_FILENAME_EDIT,54,31,258,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_SRC_PATH_EDIT,54,42,258,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_SRC_FILESIZE_EDIT,54,53,258,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_SRC_MODIFIEDDATE_EDIT,54,64,258,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_DST_FILENAME_EDIT,54,95,258,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_DST_PATH_EDIT,54,106,258,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_DST_FILESIZE_EDIT,54,117,258,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_DST_MODIFIEDDATE_EDIT,54,128,258,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,21,36,20,20 + ICON "",IDC_DST_ICON_STATIC,21,100,20,20 + LTEXT "Source file:",IDC_00_STATIC,14,20,298,8 + LTEXT "Destination file:",IDC_01_STATIC,16,82,296,8 END @@ -548,9 +554,9 @@ IDD_FEEDBACK_REPLACE_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 266 + RIGHTMARGIN, 312 TOPMARGIN, 7 - BOTTOMMARGIN, 152 + BOTTOMMARGIN, 177 END END #endif // APSTUDIO_INVOKED @@ -682,7 +688,7 @@ 2 TEXTINCLUDE BEGIN - "#define _USING_V110_SDK71_ 1" + "#define _USING_V110_SDK71_ 1\r\n" "#include ""afxres.h""\r\n" "\0" END @@ -722,7 +728,12 @@ 0 END +IDD_FEEDBACK_REPLACE_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END + ///////////////////////////////////////////////////////////////////////////// // // String Table @@ -1155,7 +1166,7 @@ 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 @@ -1182,7 +1193,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