Index: src/ch/ch.rc =================================================================== diff -u -rc88853d744d42c9d0d18d14f920190d535bb714a -r814b694086d5dc450efb6a5e5c6902145ddc07fd --- src/ch/ch.rc (.../ch.rc) (revision c88853d744d42c9d0d18d14f920190d535bb714a) +++ 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 @@ -423,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 @@ -482,10 +482,9 @@ 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 + 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 mask",IDC_EXCLUDE_MASK_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,51,277,10 + 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 @@ -508,10 +507,9 @@ 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 + 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 mask",IDC_EXCLUDE_MASK_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,51,277,10 + 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 @@ -530,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 @@ -591,7 +589,7 @@ IDD_MINIVIEW_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 84 + RIGHTMARGIN, 98 TOPMARGIN, 7 BOTTOMMARGIN, 16 END @@ -857,7 +855,12 @@ 0 END +IDD_MINIVIEW_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END + ///////////////////////////////////////////////////////////////////////////// // // Icon @@ -1053,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 ///////////////////////////////////////////////////////////////////////////// //