Index: src/ch/ch.rc =================================================================== diff -u -N -rbaad6054459abaaf69cbfd1ebad8783085160d99 -r5aac942a83e4a308ff401cca43be501b1bbdfb6a --- src/ch/ch.rc (.../ch.rc) (revision baad6054459abaaf69cbfd1ebad8783085160d99) +++ src/ch/ch.rc (.../ch.rc) (revision 5aac942a83e4a308ff401cca43be501b1bbdfb6a) @@ -40,11 +40,11 @@ ICON "",IDC_IMAGE_STATIC,13,13,20,20,SS_REALSIZEIMAGE CONTROL "Do not show this again",IDC_BASIC_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,36,163,10 PUSHBUTTON "",IDC_FIRST_BUTTON,7,49,50,14 - CONTROL "",IDC_MSG_RICHEDIT,"RichEdit20W",ES_MULTILINE | ES_READONLY | WS_DISABLED | WS_TABSTOP,43,13,127,20 - CONTROL "",IDC_MEASURE_RICHEDIT,"RichEdit20W",ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,7,7,11,7 + CONTROL "",IDC_MSG_RICHEDIT,"RichEdit20W",WS_DISABLED | WS_TABSTOP | 0x804,43,13,127,20 + CONTROL "",IDC_MEASURE_RICHEDIT,"RichEdit20W",NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP | 0x8c4,7,7,11,7 END -IDD_BUFFERSIZE_DIALOG DIALOGEX 0, 0, 345, 135 +IDD_BUFFERSIZE_DIALOG DIALOGEX 0, 0, 345, 169 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Buffer size settings" FONT 8, "Tahoma", 0, 0, 0x1 @@ -61,21 +61,27 @@ COMBOBOX IDC_LANMULTIPLIER_COMBO,307,52,31,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_LANMULTIPLIER_COMBO EDITTEXT IDC_BUFFERCOUNT_EDIT,206,82,122,14,ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_BUFFERCOUNT_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,327,82,11,14 - CONTROL "Use only default buffer",IDC_ONLYDEFAULT_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,331,10,0,HIDC_ONLYDEFAULT_CHECK - DEFPUSHBUTTON "&OK",IDOK,176,114,50,14,0,0,HIDOK - PUSHBUTTON "&Cancel",IDCANCEL,229,114,50,14,0,0,HIDCANCEL - PUSHBUTTON "&Help",IDC_HELP_BUTTON,288,114,50,14,0,0,HIDC_HELP_BUTTON + CONTROL "Use only default buffer",IDC_ONLYDEFAULT_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,132,331,10,0,HIDC_ONLYDEFAULT_CHECK + DEFPUSHBUTTON "&OK",IDOK,176,148,50,14,0,0,0x80890001 + PUSHBUTTON "&Cancel",IDCANCEL,229,148,50,14,0,0,HIDCANCEL + PUSHBUTTON "&Help",IDC_HELP_BUTTON,288,148,50,14,0,0,HIDC_HELP_BUTTON LTEXT "Default",IDC_001_STATIC,35,7,127,8 LTEXT "For copying inside one disk boundary",IDC_002_STATIC,35,38,130,8 LTEXT "For copying between two different disks",IDC_003_STATIC,35,70,132,8 LTEXT "For copying with CD-ROM use",IDC_004_STATIC,207,7,131,8 LTEXT "For copying with network use",IDC_005_STATIC,207,40,131,8 - ICON IDI_CD_ICON,IDC_006_STATIC,179,13,20,20,SS_REALSIZEIMAGE - ICON IDI_NET_ICON,IDC_007_STATIC,179,44,20,20,SS_REALSIZEIMAGE - ICON IDI_HDD_ICON,IDC_008_STATIC,7,43,20,20,SS_REALSIZEIMAGE - ICON IDI_HDD2_ICON,IDC_009_STATIC,7,73,20,20,SS_REALSIZEIMAGE - ICON IDI_TRIBE_ICON,IDC_010_STATIC,7,9,20,20,SS_REALSIZEIMAGE + ICON IDI_CD_ICON,IDC_006_STATIC,179,13,21,20,SS_REALSIZEIMAGE + ICON IDI_NET_ICON,IDC_007_STATIC,179,44,21,20,SS_REALSIZEIMAGE + ICON IDI_HDD_ICON,IDC_008_STATIC,7,43,21,20,SS_REALSIZEIMAGE + ICON IDI_HDD2_ICON,IDC_009_STATIC,7,73,21,20,SS_REALSIZEIMAGE + ICON IDI_TRIBE_ICON,IDC_010_STATIC,7,9,21,20,SS_REALSIZEIMAGE LTEXT "Count of buffers",IDC_011_STATIC,207,70,131,8 + EDITTEXT IDC_MAXREADAHEAD_EDIT,7,112,107,14,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "Max read ahead",IDC_MAXREADAHEAD_STATIC,7,100,102,8 + EDITTEXT IDC_MAXCONCURRENTREADS_EDIT,117,112,107,14,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "Max concurrent reads",IDC_MAXCONCURRENTREADS_STATIC,119,100,104,8 + EDITTEXT IDC_MAXCONCURRENTWRITES_EDIT,231,111,107,14,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "Max concurrent writes",IDC_MAXCONCURRENTWRITES_STATIC,233,99,104,8 END IDD_FEEDBACK_FILE_ERROR_DIALOG DIALOGEX 0, 0, 283, 112 @@ -107,7 +113,7 @@ CAPTION "Options" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - DEFPUSHBUTTON "&OK",IDOK,173,193,50,14,0,0,HIDOK + DEFPUSHBUTTON "&OK",IDOK,173,193,50,14,0,0,HIDHELP PUSHBUTTON "&Cancel",IDCANCEL,227,193,50,14,0,0,HIDCANCEL LISTBOX IDC_PROPERTIES_LIST,7,7,383,179,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP,0,HIDC_PROPERTIES_LIST PUSHBUTTON "&Apply",IDC_APPLY_BUTTON,283,193,50,14,0,0,HIDC_APPLY_BUTTON @@ -241,7 +247,7 @@ "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,HIDOK + PUSHBUTTON "&OK",IDOK,186,297,50,14,0,0,HIDHELP PUSHBUTTON "&Cancel",IDCANCEL,239,297,50,14,0,0,HIDCANCEL LTEXT "Source files/folders:",IDC_001_STATIC,7,7,337,8 LTEXT "Destination folder:",IDC_002_STATIC,7,76,337,8 @@ -299,7 +305,7 @@ CONTROL "Hidden",IDC_HIDDEN_CHECK,"Button",BS_AUTO3STATE | WS_TABSTOP,117,212,68,10,0,HIDC_HIDDEN_CHECK CONTROL "System",IDC_SYSTEM_CHECK,"Button",BS_AUTO3STATE | WS_TABSTOP,117,224,68,10,0,HIDC_SYSTEM_CHECK CONTROL "Directory",IDC_DIRECTORY_CHECK,"Button",BS_AUTO3STATE | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,191,212,93,10,0,HIDC_DIRECTORY_CHECK - DEFPUSHBUTTON "&OK",IDOK,127,245,50,14,0,0,HIDOK + DEFPUSHBUTTON "&OK",IDOK,127,245,50,14,0,0,HIDHELP PUSHBUTTON "&Cancel",IDCANCEL,179,245,50,14,0,0,HIDCANCEL CONTROL "",IDC_001_STATIC,"Static",SS_ETCHEDHORZ,7,238,276,1 PUSHBUTTON "&Help",IDC_HELP_BUTTON,234,245,50,14,0,0,HIDC_HELP_BUTTON @@ -317,7 +323,7 @@ PUSHBUTTON "&Add",IDC_ADD_BUTTON,17,160,50,14,0,0,HIDC_ADD_BUTTON PUSHBUTTON "&Update",IDC_CHANGE_BUTTON,69,160,50,14,0,0,HIDC_CHANGE_BUTTON PUSHBUTTON "&Delete",IDC_DELETE_BUTTON,121,160,50,14,0,0,HIDC_DELETE_BUTTON - DEFPUSHBUTTON "&OK",IDOK,156,185,50,14,0,0,HIDOK + DEFPUSHBUTTON "&OK",IDOK,156,185,50,14,0,0,HIDHELP PUSHBUTTON "&Cancel",IDCANCEL,211,185,50,14,0,0,HIDCANCEL LTEXT "Shortcuts:",IDC_001_STATIC,7,7,311,8 LTEXT "Name:",IDC_002_STATIC,18,126,53,8 @@ -339,7 +345,7 @@ PUSHBUTTON "&Add",IDC_ADD_BUTTON,20,141,50,14,0,0,HIDC_ADD_BUTTON PUSHBUTTON "&Update",IDC_CHANGE_BUTTON,72,141,50,14,0,0,HIDC_CHANGE_BUTTON PUSHBUTTON "&Delete",IDC_DELETE_BUTTON,124,141,50,14,0,0,HIDC_DELETE_BUTTON - DEFPUSHBUTTON "&OK",IDOK,156,169,50,14,0,0,HIDOK + DEFPUSHBUTTON "&OK",IDOK,156,169,50,14,0,0,HIDHELP PUSHBUTTON "&Cancel",IDCANCEL,211,169,50,14,0,0,HIDCANCEL LTEXT "Recently used paths:",IDC_001_STATIC,7,7,311,8 GROUPBOX "Path",IDC_002_STATIC,7,110,311,51 @@ -351,7 +357,7 @@ CAPTION "About ..." FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - DEFPUSHBUTTON "&OK",IDOK,306,143,56,14,WS_GROUP,0,HIDOK + DEFPUSHBUTTON "&OK",IDOK,306,143,56,14,WS_GROUP,0,HIDHELP ICON IDR_MAINFRAME,IDC_STATIC,11,14,20,20 CTEXT "",IDC_COPYRIGHT_STATIC,40,93,322,8 CONTROL "",IDC_HOMEPAGELINK_STATIC,"STATICEX",0x1,208,32,154,8 @@ -391,7 +397,7 @@ LTEXT "Update channel:",IDC_UPDATECHANNEL_STATIC,160,89,138,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 + 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 @@ -444,7 +450,7 @@ LEFTMARGIN, 7 RIGHTMARGIN, 338 TOPMARGIN, 7 - BOTTOMMARGIN, 128 + BOTTOMMARGIN, 162 END IDD_FEEDBACK_FILE_ERROR_DIALOG, DIALOG @@ -903,6 +909,9 @@ IDS_CFGLOGLEVEL_VALUES "Trace!Debug!Info!Warning!Error!Fatal" IDS_UPDATE_FREQUENCIES "Never!Every startup!Daily!Weekly!Once every 2 weeks!Monthly!Quarterly" IDS_BUFFER_QUEUE_DEPTH "Buffer queue depth" + IDS_BUFFER_MAX_READAHEAD "Maximum read ahead (buffers)" + IDS_BUFFER_MAX_CONCURRENT_READS "Maximum concurrent read requests" + IDS_BUFFER_MAX_CONCURRENT_WRITES "Maximum concurrent write requests" IDS_FASTMOVEBEFOREBLOCK_STRING "Use fast move before blocking" IDS_CFG_USE_SECURE_CONNECTION "Use secure connection when checking for updates" @@ -931,7 +940,8 @@ IDS_MINIVIEWAUTOHIDE_STRING "Hide when empty" IDS_PROCESSINGTHREAD_STRING "Copying/moving thread" IDS_AUTOCOPYREST_STRING "Auto ""copy-rest"" of files" - IDS_SETDESTATTRIB_STRING "Set dates and attributes of destination files and directories" + IDS_SETDESTATTRIB_STRING + "Set dates and attributes of destination files and directories" IDS_PROTECTROFILES_STRING "Protect read-only files" IDS_LIMITOPERATIONS_STRING "Limit maximum operations running simultaneously ..."