Index: src/ch/ch.rc =================================================================== diff -u -r25aab92a9d195154393782ca83cbf5bc41ab9277 -r7d6b4eae7b58d17c4b554c25cc4cff875bd53161 --- src/ch/ch.rc (.../ch.rc) (revision 25aab92a9d195154393782ca83cbf5bc41ab9277) +++ src/ch/ch.rc (.../ch.rc) (revision 7d6b4eae7b58d17c4b554c25cc4cff875bd53161) @@ -223,20 +223,19 @@ PUSHBUTTON "&<<",IDC_ROLL_UNROLL_BUTTON,212,7,19,12,NOT WS_VISIBLE,0,HIDC_ROLL_UNROLL_BUTTON PUSHBUTTON "...",IDC_SET_BUFFERSIZE_BUTTON,459,72,13,14,0,0,HIDC_SET_BUFFERSIZE_BUTTON PUSHBUTTON ">",IDC_SET_PRIORITY_BUTTON,459,88,13,14,0,0,HIDC_SET_PRIORITY_BUTTON - PUSHBUTTON "View log",IDC_SHOW_LOG_BUTTON,249,116,60,14,0,0,HIDC_SHOW_LOG_BUTTON + PUSHBUTTON "View log",IDC_SHOW_LOG_BUTTON,249,167,223,14,0,0,HIDC_SHOW_LOG_BUTTON LTEXT "Operations list:",IDC_001_STATIC,7,7,197,8 CONTROL "Progress1",IDC_ALL_PROGRESS,"msctls_progress32",PBS_SMOOTH,313,234,159,9 LTEXT "Progress:",IDC_002_STATIC,249,235,62,8 - CONTROL "Progress2",IDC_TASK_PROGRESS,"msctls_progress32",0x0,313,181,159,6 - LTEXT "Progress:",IDC_003_STATIC,249,179,62,8 + CONTROL "Progress2",IDC_TASK_PROGRESS,"msctls_progress32",0x0,313,150,159,6 + LTEXT "Progress:",IDC_003_STATIC,249,148,62,8 LTEXT "Destination object:",IDC_004_STATIC,249,59,62,8 LTEXT "Source object:",IDC_005_STATIC,249,47,62,8 LTEXT "Buffer size:",IDC_006_STATIC,249,75,62,8 LTEXT "Thread priority:",IDC_007_STATIC,249,90,62,8 - LTEXT "Comments:",IDC_008_STATIC,249,106,62,8 LTEXT "Operation:",IDC_009_STATIC,249,34,62,8 - LTEXT "Transfer:",IDC_010_STATIC,249,167,62,8 - LTEXT "Processed:",IDC_011_STATIC,249,137,62,8 + LTEXT "Transfer:",IDC_010_STATIC,249,136,62,8 + LTEXT "Processed:",IDC_011_STATIC,249,106,62,8 LTEXT "Transfer:",IDC_012_STATIC,249,220,62,8 LTEXT "Processed:",IDC_013_STATIC,249,205,62,8 CTEXT "Global statistics",IDC_014_STATIC,293,191,84,8 @@ -245,17 +244,16 @@ CONTROL "",IDC_017_STATIC,"Static",SS_ETCHEDHORZ,411,10,61,1 CONTROL "",IDC_018_STATIC,"Static",SS_ETCHEDHORZ,249,194,37,1 CONTROL "",IDC_019_STATIC,"Static",SS_ETCHEDHORZ,249,10,38,1 - LTEXT "Time:",IDC_020_STATIC,249,152,62,8 + LTEXT "Time:",IDC_020_STATIC,249,121,62,8 PUSHBUTTON "&Resume",IDC_RESUME_BUTTON,52,196,44,14,0,0,HIDC_RESUME_BUTTON - EDITTEXT IDC_ERRORS_EDIT,313,104,159,26,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL,WS_EX_STATICEDGE,HIDC_ERRORS_EDIT LTEXT "Associated file:",IDC_021_STATIC,249,19,62,8 CONTROL "",IDC_ASSOCIATEDFILES__STATIC,"STATICEX",0x4,313,17,159,12,WS_EX_STATICEDGE,HIDC_ASSOCIATEDFILES__STATIC CONTROL "",IDC_OPERATION_STATIC,"STATICEX",0x4,313,32,159,12,WS_EX_STATICEDGE,HIDC_OPERATION_STATIC CONTROL "",IDC_SOURCE_STATIC,"STATICEX",0x4,313,45,159,12,WS_EX_STATICEDGE,HIDC_SOURCE_STATIC CONTROL "",IDC_DESTINATION_STATIC,"STATICEX",0x4,313,58,159,12,WS_EX_STATICEDGE,HIDC_DESTINATION_STATIC - CONTROL "",IDC_PROGRESS_STATIC,"STATICEX",0x4,313,135,159,12,WS_EX_STATICEDGE,HIDC_PROGRESS_STATIC - CONTROL "",IDC_TIME_STATIC,"STATICEX",0x4,313,150,159,12,WS_EX_STATICEDGE,HIDC_TIME_STATIC - CONTROL "",IDC_TRANSFER_STATIC,"STATICEX",0x4,313,165,159,12,WS_EX_STATICEDGE,HIDC_TRANSFER_STATIC + CONTROL "",IDC_PROGRESS_STATIC,"STATICEX",0x4,313,104,159,12,WS_EX_STATICEDGE,HIDC_PROGRESS_STATIC + CONTROL "",IDC_TIME_STATIC,"STATICEX",0x4,313,119,159,12,WS_EX_STATICEDGE,HIDC_TIME_STATIC + CONTROL "",IDC_TRANSFER_STATIC,"STATICEX",0x4,313,134,159,12,WS_EX_STATICEDGE,HIDC_TRANSFER_STATIC CONTROL "",IDC_OVERALL_PROGRESS_STATIC,"STATICEX",0x4,313,203,159,12,WS_EX_STATICEDGE,HIDC_OVERALL_PROGRESS_STATIC CONTROL "",IDC_OVERALL_TRANSFER_STATIC,"STATICEX",0x4,313,218,159,12,WS_EX_STATICEDGE,HIDC_OVERALL_TRANSFER_STATIC CONTROL "",IDC_BUFFERSIZE_STATIC,"STATICEX",0x4,313,74,143,12,WS_EX_STATICEDGE,HIDC_BUFFERSIZE_STATIC @@ -305,10 +303,8 @@ 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 PUSHBUTTON "...",IDC_DESTBROWSE_BUTTON,326,85,18,14,0,0,HIDC_DESTBROWSE_BUTTON - COMBOBOX IDC_OPERATION_COMBO,13,124,117,143,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_OPERATION_COMBO - COMBOBOX IDC_PRIORITY_COMBO,137,124,122,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_PRIORITY_COMBO - EDITTEXT IDC_COUNT_EDIT,264,124,80,14,ES_AUTOHSCROLL,0,HIDC_COUNT_EDIT - CONTROL "Spin1",IDC_COUNT_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,333,124,11,14 + 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 LISTBOX IDC_BUFFERSIZES_LIST,13,152,275,20,LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_NOSEL | WS_VSCROLL | WS_TABSTOP,0,HIDC_BUFFERSIZES_LIST PUSHBUTTON "&Change...",IDC_BUFFERSIZES_BUTTON,294,152,50,14,0,0,HIDC_BUFFERSIZES_BUTTON CONTROL "Filtering",IDC_FILTERS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,177,61,10,0,HIDC_FILTERS_CHECK @@ -325,8 +321,7 @@ 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 - LTEXT "Priority:",IDC_004_STATIC,137,115,120,8 - LTEXT "Count of copies:",IDC_005_STATIC,264,115,80,8 + LTEXT "Priority:",IDC_004_STATIC,181,115,120,8 LTEXT "Buffer sizes:",IDC_006_STATIC,13,142,244,8 CONTROL "",IDC_BAR3_STATIC,"Static",SS_ETCHEDHORZ,76,181,268,1 CONTROL "",IDC_BAR4_STATIC,"Static",SS_ETCHEDHORZ,98,247,246,1 @@ -768,10 +763,11 @@ BEGIN IDS_CFGINTERCEPTCONTEXTMENU_STRING "Intercept standard Windows operations (experimental/not recommended)" - IDS_CFG_CHECK_FOR_UPDATES_FREQUENCY - "Check for program updates" + IDS_CFG_CHECK_FOR_UPDATES_FREQUENCY "Check for program updates" IDS_CFG_UPDATE_CHECK_FOR_BETA "Check for updates - include beta versions" - IDS_UPDATE_FREQUENCIES "Never!Every startup!Daily!Weekly!Once every 2 weeks!Monthly!Quarterly" + IDS_CFGLOGLEVEL "Log level" + IDS_CFGLOGLEVEL_VALUES "Debug!Info!Warning!Error" + IDS_UPDATE_FREQUENCIES "Never!Every startup!Daily!Weekly!Once every 2 weeks!Monthly!Quarterly" END STRINGTABLE @@ -784,11 +780,6 @@ IDS_PROTECTROFILES_STRING "Protect read-only files" IDS_LIMITOPERATIONS_STRING "Limit maximum operations running simultaneously ..." - IDS_SHOWVISUALFEEDBACK_STRING "Show visual confirmation dialogs" - IDS_USETIMEDDIALOGS_STRING "Use timed confirmation dialogs" - IDS_TIMEDDIALOGINTERVAL_STRING "Time of showing confirmation dialogs" - IDS_AUTORETRYONERROR_STRING "Auto resume on error" - IDS_AUTORETRYINTERVAL_STRING "Auto resume every ... [ms]" IDS_DEFAULTPRIORITY_STRING "Default thread priority" IDS_AUTODETECTBUFFERSIZE_STRING "Use only default buffer" IDS_DEFAULTBUFFERSIZE_STRING "Default buffer size" @@ -839,10 +830,9 @@ IDS_EMPTYDESTINATIONTEXT_STRING "empty" IDS_EMPTYBUFFERSIZETEXT_STRING "unknown" IDS_EMPTYPRIORITYTEXT_STRING "unknown" - IDS_EMPTYERRORTEXT_STRING "empty" IDS_EMPTYPROCESSEDTEXT_STRING "empty" IDS_EMPTYTRANSFERTEXT_STRING "unknown" - IDS_EMPTYTIMETEXT_STRING "00:00 / 00:00 (00:00)" + IDS_EMPTYTIMETEXT_STRING "00:00 / 00:00 (00:00)" IDS_CURRENTPASS_STRING "pass: " IDS_AVERAGEWORD_STRING "avg: " IDS_STATUSTITLE_STRING "Status" @@ -869,8 +859,6 @@ STRINGTABLE BEGIN - IDS_COPYWORDLESSFIVE_STRING " copies" - IDS_COPYWORDMOREFOUR_STRING " copies" IDS_STATUS0_STRING "Searching" IDS_STATUS1_STRING "Copying" IDS_STATUS2_STRING "Moving" @@ -969,11 +957,15 @@ IDS_EMPTYFILTER_STRING "None of filtering options were selected" IDS_FLTALLFILTER_STRING "All files (*.*)|*.*||" IDS_IMPORTREPORT_STRING "Imported %count path(s)" - IDS_IMPORTERROR_STRING "Cannot import paths from the specified file" END STRINGTABLE BEGIN + IDS_IMPORTERROR_STRING "Cannot import paths from the specified file" +END + +STRINGTABLE +BEGIN IDS_DATECREATED_STRING "Date of creation" IDS_DATELASTWRITE_STRING "Date of last write" IDS_DATEACCESSED_STRING "Date of last access" @@ -1021,8 +1013,6 @@ IDS_LANGSFOLDERCHOOSE_STRING "!Choose folder with language files" IDS_ABOUT_LANGUAGE_STRING "Current language: %langname, Author(s): %authors" - IDS_CFGLOGLEVEL "Log level" - IDS_CFGLOGLEVEL_VALUES "Debug!Info!Warning!Error" END STRINGTABLE