Index: src/ch/ch.rc =================================================================== diff -u -r63369021254e8b67ffeef5a9ece1b5a70df881c4 -r814b694086d5dc450efb6a5e5c6902145ddc07fd --- src/ch/ch.rc (.../ch.rc) (revision 63369021254e8b67ffeef5a9ece1b5a70df881c4) +++ src/ch/ch.rc (.../ch.rc) (revision 814b694086d5dc450efb6a5e5c6902145ddc07fd) @@ -101,13 +101,13 @@ LTEXT "Alternate file:",IDC_DST_NAME_STATIC,45,52,54,8 END -IDD_MINIVIEW_DIALOG DIALOGEX 0, 0, 91, 23 -STYLE DS_ABSALIGN | DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION +IDD_MINIVIEW_DIALOG DIALOGEX 0, 0, 105, 23 +STYLE DS_ABSALIGN | DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_TOOLWINDOW CAPTION "Status" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - LISTBOX IDC_PROGRESS_LIST,7,7,77,9,LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | NOT WS_BORDER | WS_TABSTOP + LISTBOX IDC_PROGRESS_LIST,7,7,91,9,LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | NOT WS_BORDER | WS_TABSTOP END IDD_OPTIONS_DIALOG DIALOGEX 0, 0, 397, 214 @@ -225,7 +225,7 @@ CONTROL "Progress1",IDC_TIME_PROGRESS,"msctls_progress32",PBS_SMOOTH,7,48,172,9 END -IDD_CUSTOM_COPY_DIALOG DIALOGEX 0, 0, 351, 349 +IDD_CUSTOM_COPY_DIALOG DIALOGEX 0, 0, 351, 368 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 "Copying/moving parameters" @@ -242,36 +242,40 @@ COMBOBOX IDC_PRIORITY_COMBO,181,124,159,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LISTBOX IDC_BUFFERSIZES_LIST,13,152,275,20,LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_NOSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Change...",IDC_BUFFERSIZES_BUTTON,294,152,50,14 - CONTROL "Filtering",IDC_FILTERS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,177,61,10 CONTROL "List2",IDC_FILTERS_LIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,13,190,303,46 PUSHBUTTON "+",IDC_ADDFILTER_BUTTON,322,190,22,14 PUSHBUTTON "-",IDC_REMOVEFILTER_BUTTON,322,206,22,14 CONTROL "Custom rules...",IDC_CUSTOM_RULES_BUTTON,"MfcButton",WS_TABSTOP,273,254,71,14 - CONTROL "Advanced options",IDC_ADVANCED_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,273,84,10 CONTROL "Do not create destination directories - copy files loosely to destination folder",IDC_IGNOREFOLDERS_CHECK, - "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,286,329,10 + "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,286,331,10 CONTROL "Create directory structure in destination folder (relatively to root directory)",IDC_FORCEDIRECTORIES_CHECK, - "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,297,329,10 + "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,298,331,10 CONTROL "Do not copy/move contents of files - only create it (empty)",IDC_ONLYSTRUCTURE_CHECK, - "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,308,329,10 - PUSHBUTTON "&Export...",IDC_EXPORT_BUTTON,7,328,50,14 - PUSHBUTTON "&OK",IDOK,239,328,50,14 - PUSHBUTTON "&Cancel",IDCANCEL,294,328,50,14 - 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,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,278,246,1 - CONTROL "",IDC_BAR5_STATIC,"Static",SS_ETCHEDHORZ,7,322,337,1 - CONTROL "",IDC_BAR2_STATIC,"Static",SS_ETCHEDHORZ,107,107,237,1 - CTEXT "Standard options",IDC_007_STATIC,20,104,80,8 - CONTROL "",IDC_BAR1_STATIC,"Static",SS_ETCHEDHORZ,7,107,8,1 - CONTROL "",IDC_BAR8_STATIC,"Static",SS_ETCHEDHORZ,108,244,236,1 - CTEXT "Feedback rules",IDC_FEEDBACK_RULES_STATIC,21,241,80,8 - CONTROL "",IDC_BAR7_STATIC,"Static",SS_ETCHEDHORZ,8,244,7,1 + "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,310,331,10 + CONTROL "Do not create empty directories",IDC_DONT_CREATE_EMPTY_DIRECTORIES_CHECK, + "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,322,331,10 + PUSHBUTTON "&Export...",IDC_EXPORT_BUTTON,7,346,50,14 + PUSHBUTTON "&OK",IDOK,239,346,50,14 + PUSHBUTTON "&Cancel",IDCANCEL,294,346,50,14 + LTEXT "Source files/directories:",IDC_HDR_SOURCE_FILES_STATIC,7,7,337,8 + LTEXT "Destination folder:",IDC_HDR_DESTIONATION_PATH_STATIC,7,76,337,8 + LTEXT "Operation type:",IDC_HDR_OPERATION_TYPE_STATIC,13,115,117,8 + LTEXT "Priority:",IDC_HDR_PRIORITY_STATIC,181,115,120,8 + LTEXT "Buffer sizes:",IDC_HDR_BUFFER_SIZES_STATIC,13,142,244,8 + CONTROL "",IDC_BOTTOM_BAR_STATIC,"Static",SS_ETCHEDHORZ,7,340,336,1 + CONTROL "",IDC_RIGHT_STANDARD_OPTIONS_STATIC,"Static",SS_ETCHEDHORZ,107,107,237,1 + CTEXT "Standard options",IDC_HDR_STANDARD_OPTIONS_STATIC,20,104,80,8 + CONTROL "",IDC_LEFT_STANDARD_OPTIONS_STATIC,"Static",SS_ETCHEDHORZ,7,107,8,1 EDITTEXT IDC_FEEDBACK_RULES_SUMMARY_EDIT,13,254,255,14,ES_AUTOHSCROLL | WS_DISABLED + CONTROL "",IDC_LEFT_FEEDBACK_RULES_STATIC,"Static",SS_ETCHEDHORZ,8,244,7,1 + CONTROL "",IDC_RIGHT_FEEDBACK_RULES_STATIC,"Static",SS_ETCHEDHORZ,108,244,236,1 + CTEXT "Feedback rules",IDC_HDR_FEEDBACK_RULES_STATIC,21,241,80,8 + CONTROL "",IDC_RIGHT_ADVANCED_OPTIONS_STATIC,"Static",SS_ETCHEDHORZ,109,276,235,1 + CTEXT "Advanced options",IDC_HDR_ADVANCED_OPTIONS_STATIC,22,273,80,8 + CONTROL "",IDC_LEFT_ADVANCED_OPTIONS_STATIC,"Static",SS_ETCHEDHORZ,9,276,6,1 + CONTROL "",IDC_LEFT_FILTERS_STATIC,"Static",SS_ETCHEDHORZ,7,180,6,1 + CONTROL "",IDC_RIGHT_FILTERS_STATIC,"Static",SS_ETCHEDHORZ,107,180,235,1 + CTEXT "Filters",IDC_HDR_FILTERS_STATIC,20,177,80,8 END IDD_FILTER_DIALOG DIALOGEX 0, 0, 291, 267 @@ -280,10 +284,10 @@ FONT 8, "Tahoma", 0, 0, 0x1 BEGIN CONTROL "Include files matching:",IDC_FILTER_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,277,10 - COMBOBOX IDC_FILTER_COMBO,15,19,249,98,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILTER_COMBO,15,19,249,98,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "...",IDC_INCLUDE_MASK_BUTTON,"MfcButton",WS_TABSTOP,267,19,17,12 CONTROL "Exclude files matching:",IDC_EXCLUDEMASK_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,277,10 - COMBOBOX IDC_FILTEREXCLUDE_COMBO,15,48,249,170,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILTEREXCLUDE_COMBO,15,48,249,170,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "...",IDC_EXCLUDE_MASK_BUTTON,"MfcButton",WS_TABSTOP,267,48,17,12 CONTROL "Filtering by size",IDC_SIZE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,277,10 COMBOBOX IDC_SIZETYPE1_COMBO,63,81,34,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -419,29 +423,29 @@ CONTROL "&Skip",IDC_SKIP_BUTTON,"MfcMenuButton",WS_TABSTOP,277,182,81,14 CONTROL "&Pause",IDC_PAUSE_BUTTON,"MfcButton",WS_TABSTOP,187,202,81,14 CONTROL "&Cancel",IDC_CANCEL_BUTTON,"MfcButton",WS_TABSTOP,277,202,81,14 - EDITTEXT IDC_SRC_FILENAME_EDIT,96,34,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - EDITTEXT IDC_SRC_PATH_EDIT,96,46,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - EDITTEXT IDC_SRC_FILESIZE_EDIT,96,58,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - EDITTEXT IDC_SRC_MODIFIEDDATE_EDIT,96,70,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - EDITTEXT IDC_DST_FILENAME_EDIT,96,106,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - EDITTEXT IDC_DST_RENAME_EDIT,96,119,251,12,ES_AUTOHSCROLL - EDITTEXT IDC_DST_PATH_EDIT,96,135,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - EDITTEXT IDC_DST_FILESIZE_EDIT,96,147,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - EDITTEXT IDC_DST_MODIFIEDDATE_EDIT,96,159,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_SRC_FILENAME_EDIT,109,34,242,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_SRC_PATH_EDIT,109,46,242,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_SRC_FILESIZE_EDIT,109,58,242,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_SRC_MODIFIEDDATE_EDIT,109,70,242,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_DST_FILENAME_EDIT,109,106,242,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_DST_RENAME_EDIT,109,119,242,12,ES_AUTOHSCROLL + EDITTEXT IDC_DST_PATH_EDIT,109,135,242,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_DST_FILESIZE_EDIT,109,147,242,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_DST_MODIFIEDDATE_EDIT,109,159,242,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,350,15 ICON "",IDC_SRC_ICON_STATIC,19,39,20,20 ICON "",IDC_DST_ICON_STATIC,19,111,20,20 GROUPBOX "Source file",IDC_SRCFILE_STATIC,7,20,350,66 GROUPBOX "Destination file",IDC_DSTFILE_STATIC,7,92,350,85 - LTEXT "Name:",IDC_SRC_NAME_STATIC,49,34,45,8 - LTEXT "Location:",IDC_SRC_LOCATION_STATIC,49,46,45,8 - LTEXT "Size:",IDC_SRC_SIZE_STATIC,49,58,45,8 - LTEXT "Modified:",IDC_SRC_TIME_STATIC,49,70,45,8 - LTEXT "Name:",IDC_DST_NAME_STATIC,49,106,45,8 - LTEXT "Rename to:",IDC_DST_RENAME_STATIC,49,121,45,8 - LTEXT "Location:",IDC_DST_LOCATION_STATIC,49,135,45,8 - LTEXT "Size:",IDC_DST_SIZE_STATIC,49,147,45,8 - LTEXT "Modified:",IDC_DST_TIME_STATIC,49,159,45,8 + LTEXT "Name:",IDC_SRC_NAME_STATIC,49,34,58,8 + LTEXT "Location:",IDC_SRC_LOCATION_STATIC,49,46,58,8 + LTEXT "Size:",IDC_SRC_SIZE_STATIC,49,58,58,8 + LTEXT "Modified:",IDC_SRC_TIME_STATIC,49,70,58,8 + LTEXT "Name:",IDC_DST_NAME_STATIC,49,106,58,8 + LTEXT "Rename to:",IDC_DST_RENAME_STATIC,49,121,58,8 + LTEXT "Location:",IDC_DST_LOCATION_STATIC,49,135,58,8 + LTEXT "Size:",IDC_DST_SIZE_STATIC,49,147,58,8 + LTEXT "Modified:",IDC_DST_TIME_STATIC,49,159,58,8 CONTROL "C&ustom rules...",IDC_CUSTOM_RULES_BUTTON,"MfcButton",WS_TABSTOP,7,202,81,14 END @@ -451,9 +455,9 @@ FONT 8, "Tahoma", 0, 0, 0x1 BEGIN CONTROL "Include files matching:",IDC_INCLUDE_MASK_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,23,277,10 - COMBOBOX IDC_INCLUDE_MASK_COMBO,15,35,250,98,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_INCLUDE_MASK_COMBO,15,35,250,98,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Exclude files matching:",IDC_EXCLUDE_MASK_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,51,277,10 - COMBOBOX IDC_EXCLUDE_MASK_COMBO,15,64,250,170,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_EXCLUDE_MASK_COMBO,15,64,250,170,CBS_DROPDOWN | CBS_AUTOHSCROLL | 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, @@ -478,11 +482,10 @@ 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,250,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,250,170,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "Include files matching:",IDC_INCLUDE_MASK_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,23,277,10 + COMBOBOX IDC_INCLUDE_MASK_COMBO,15,35,250,98,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "Exclude files matching:",IDC_EXCLUDE_MASK_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,51,277,10 + COMBOBOX IDC_EXCLUDE_MASK_COMBO,15,64,250,170,CBS_DROPDOWN | CBS_AUTOHSCROLL | 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 @@ -504,11 +507,10 @@ 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,250,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,250,170,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "Include files matching:",IDC_INCLUDE_MASK_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,23,277,10 + COMBOBOX IDC_INCLUDE_MASK_COMBO,15,35,250,98,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "Exclude files matching:",IDC_EXCLUDE_MASK_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,51,277,10 + COMBOBOX IDC_EXCLUDE_MASK_COMBO,15,64,250,170,CBS_DROPDOWN | CBS_AUTOHSCROLL | 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 @@ -526,20 +528,20 @@ FONT 8, "Tahoma", 0, 0, 0x1 BEGIN CONTROL "",IDC_FILE_ALREADY_EXISTS_RULES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,18,337,65 - PUSHBUTTON "Move up",IDC_ALREADY_EXISTS_UP_BUTTON,7,87,50,14 - PUSHBUTTON "Move down",IDC_ALREADY_EXISTS_DOWN_BUTTON,62,87,50,14 + PUSHBUTTON "Move up",IDC_ALREADY_EXISTS_UP_BUTTON,7,87,60,14 + PUSHBUTTON "Move down",IDC_ALREADY_EXISTS_DOWN_BUTTON,71,87,60,14 PUSHBUTTON "Change...",IDC_ALREADY_EXISTS_CHANGE_BUTTON,184,87,50,14 PUSHBUTTON "Add...",IDC_ALREADY_EXISTS_ADD_BUTTON,239,87,50,14 PUSHBUTTON "Remove",IDC_ALREADY_EXISTS_REMOVE_BUTTON,294,87,50,14 CONTROL "",IDC_FILE_ERROR_RULES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,119,337,65 - PUSHBUTTON "Move up",IDC_FILE_ERROR_UP_BUTTON,7,188,50,14 - PUSHBUTTON "Move down",IDC_FILE_ERROR_DOWN_BUTTON,62,188,50,14 + PUSHBUTTON "Move up",IDC_FILE_ERROR_UP_BUTTON,7,188,60,14 + PUSHBUTTON "Move down",IDC_FILE_ERROR_DOWN_BUTTON,71,188,60,14 PUSHBUTTON "Change...",IDC_FILE_ERROR_CHANGE_BUTTON,184,188,50,14 PUSHBUTTON "Add...",IDC_FILE_ERROR_ADD_BUTTON,239,188,50,14 PUSHBUTTON "Remove",IDC_FILE_ERROR_REMOVE_BUTTON,294,188,50,14 CONTROL "",IDC_NOT_ENOUGH_SPACE_RULES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,223,337,65 - PUSHBUTTON "Move up",IDC_NOT_ENOUGH_SPACE_UP_BUTTON,7,292,50,14 - PUSHBUTTON "Move down",IDC_NOT_ENOUGH_SPACE_DOWN_BUTTON,62,292,50,14 + PUSHBUTTON "Move up",IDC_NOT_ENOUGH_SPACE_UP_BUTTON,7,292,60,14 + PUSHBUTTON "Move down",IDC_NOT_ENOUGH_SPACE_DOWN_BUTTON,71,292,60,14 PUSHBUTTON "Change...",IDC_NOT_ENOUGH_SPACE_CHANGE_BUTTON,184,292,50,14 PUSHBUTTON "Add...",IDC_NOT_ENOUGH_SPACE_ADD_BUTTON,239,292,50,14 PUSHBUTTON "Remove",IDC_NOT_ENOUGH_SPACE_REMOVE_BUTTON,294,292,50,14 @@ -587,7 +589,7 @@ IDD_MINIVIEW_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 84 + RIGHTMARGIN, 98 TOPMARGIN, 7 BOTTOMMARGIN, 16 END @@ -629,7 +631,7 @@ LEFTMARGIN, 7 RIGHTMARGIN, 344 TOPMARGIN, 7 - BOTTOMMARGIN, 342 + BOTTOMMARGIN, 361 END IDD_FILTER_DIALOG, DIALOG @@ -853,7 +855,12 @@ 0 END +IDD_MINIVIEW_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END + ///////////////////////////////////////////////////////////////////////////// // // Icon @@ -1049,7 +1056,27 @@ END END +IDR_TASK_MENU MENU +BEGIN + POPUP "_POPUP_" + BEGIN + MENUITEM "&Pause", ID_TASK_MENU_PAUSE + MENUITEM "&Resume", ID_TASK_MENU_RESUME + MENUITEM "R&estart", ID_TASK_MENU_RESTART + MENUITEM "&Cancel", ID_TASK_MENU_CANCEL + MENUITEM "Re&move", ID_TASK_MENU_REMOVE + MENUITEM SEPARATOR + MENUITEM "Reset user-feedback state", ID_TASK_MENU_RESET_FEEDBACK + MENUITEM SEPARATOR + MENUITEM "Pause all", ID_TASK_MENU_PAUSE_ALL + MENUITEM "Resume all", ID_TASK_MENU_RESUME_ALL + MENUITEM "Restart all", ID_TASK_MENU_RESTART_ALL + MENUITEM "Cancel all", ID_TASK_MENU_CANCEL_ALL + MENUITEM "Remove inactive", ID_TASK_MENU_REMOVE_INACTIVE + END +END + #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // @@ -1884,7 +1911,8 @@ IDS_STATUS_LOADERROR_STRING "Load error" IDS_EXPORTING_TASK_FAILED "Exporting task data failed. Reason: %reason." IDS_LOGFILEEMPTY_STRING "Log file is empty" - IDS_INVALID_FILTER "Invalid filter:\n%err" + IDS_INVALID_FILTER_STRING "Invalid filter:\n%err" + IDS_STATUS_EXCLUDE_EMPTY_DIRECTORIES_STRING "Exclude empty directories" END STRINGTABLE @@ -2003,15 +2031,15 @@ BEGIN IDS_BSECD_STRING "CD: %size" IDS_BSELAN_STRING "LAN: %size" - IDS_HDRMASK_STRING "Include mask" + IDS_HDRMASK_STRING "Include" IDS_HDRSIZE_STRING "Size" IDS_HDRDATE_STRING "Date" IDS_HDRATTRIB_STRING "Attributes included" IDS_AND_STRING " and " IDS_FILTERMASKEMPTY_STRING "none" IDS_FILTERSIZE_STRING "any" IDS_FILTERDATE_STRING "any" - IDS_HDREXCLUDEMASK_STRING "Exclude mask" + IDS_HDREXCLUDEMASK_STRING "Exclude" IDS_HDREXCLUDEATTRIB_STRING "Attributes excluded" IDS_FILTERATTRIB_STRING "none" IDS_EMPTYFILTER_STRING "None of filtering options were selected"