Index: src/ch/ch.rc =================================================================== diff -u -re6f64ea0eecaf86dfa1a42c80604d227b69be768 -r931355150221601949c1e8e3efc9e1621d337189 --- src/ch/ch.rc (.../ch.rc) (revision e6f64ea0eecaf86dfa1a42c80604d227b69be768) +++ src/ch/ch.rc (.../ch.rc) (revision 931355150221601949c1e8e3efc9e1621d337189) @@ -87,17 +87,18 @@ LTEXT "Encountered an error while processing file.",IDC_HEADER_STATIC,7,7,261,8 CONTROL "C&ustom rules...",IDC_CUSTOM_RULES_BUTTON,"MfcButton",WS_TABSTOP,7,132,81,14 CONTROL "&Pause",IDC_PAUSE_BUTTON,"MfcButton",WS_TABSTOP,97,132,81,14 - CONTROL "&Cancel",IDC_CANCEL_BUTTON,"MfcButton",WS_TABSTOP,187,132,81,14 + CONTROL "&Cancel",IDCANCEL,"MfcButton",WS_TABSTOP,187,132,81,14 CONTROL "&Skip",IDC_SKIP_BUTTON,"MfcMenuButton",WS_TABSTOP,187,112,81,14 CONTROL "&Retry",IDC_RETRY_BUTTON,"MfcMenuButton",WS_TABSTOP,97,112,81,14 - EDITTEXT IDC_FILENAME_EDIT,92,40,169,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - LTEXT "Names:",IDC_NAMES_STATIC,45,40,45,8 - EDITTEXT IDC_OPERATION_EDIT,92,65,169,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - LTEXT "Operation:",IDC_OPERATION_STATIC,45,65,45,8 - EDITTEXT IDC_SYSTEM_ERROR_EDIT,92,77,169,24,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - LTEXT "System error:",IDC_SYSTEM_ERROR_STATIC,45,77,45,8 - EDITTEXT IDC_SECOND_FILENAME_EDIT,92,52,169,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_FILENAME_EDIT,103,40,158,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + LTEXT "File:",IDC_SRC_NAME_STATIC,45,40,54,8 + EDITTEXT IDC_OPERATION_EDIT,103,65,158,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + LTEXT "Operation:",IDC_OPERATION_STATIC,45,65,54,8 + EDITTEXT IDC_SYSTEM_ERROR_EDIT,103,77,158,24,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY + LTEXT "System error:",IDC_SYSTEM_ERROR_STATIC,45,77,54,8 + EDITTEXT IDC_SECOND_FILENAME_EDIT,103,52,158,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER GROUPBOX "Error details",IDC_ERROR_DETAILS_STATIC,7,22,261,86 + LTEXT "Alternate file:",IDC_DST_NAME_STATIC,45,52,54,8 END IDD_MINIVIEW_DIALOG DIALOGEX 0, 0, 91, 23 @@ -513,24 +514,30 @@ CAPTION "Feedback rules editor" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - CONTROL "List2",IDC_FILE_ALREADY_EXISTS_RULES_LIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,7,18,337,65 - PUSHBUTTON "&OK",IDOK,239,320,50,14 - PUSHBUTTON "&Cancel",IDCANCEL,294,320,50,14 - CONTROL "",IDC_BOTTOM_BAR_STATIC,"Static",SS_ETCHEDHORZ,8,313,336,1 + 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 "Change...",IDC_ALREADY_EXISTS_CHANGE_BUTTON,184,87,50,14 - PUSHBUTTON "Remove",IDC_ALREADY_EXISTS_REMOVE_BUTTON,294,87,50,14 - LTEXT "File already exists rules:",IDC_FILE_ALREADY_EXISTS_STATIC,7,7,337,8 - CONTROL "",IDC_FILE_ERROR_RULES_LIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,7,119,337,65 - LTEXT "File error rules:",IDC_FILE_ERROR_RULES_STATIC,7,108,337,8 - CONTROL "",IDC_NOT_ENOUGH_SPACE_RULES_LIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,7,223,337,65 - LTEXT "Not enough space rules:",IDC_NOT_ENOUGH_SPACE_STATIC,7,212,337,8 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 "Change...",IDC_FILE_ERROR_CHANGE_BUTTON,184,188,50,14 - PUSHBUTTON "Remove",IDC_FILE_ERROR_REMOVE_BUTTON,294,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 "Change...",IDC_NOT_ENOUGH_SPACE_CHANGE_BUTTON,184,292,50,14 - PUSHBUTTON "Remove",IDC_NOT_ENOUGH_SPACE_REMOVE_BUTTON,294,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 + PUSHBUTTON "&OK",IDOK,239,320,50,14 + PUSHBUTTON "&Cancel",IDCANCEL,294,320,50,14 + CONTROL "",IDC_BOTTOM_BAR_STATIC,"Static",SS_ETCHEDHORZ,8,313,336,1 + LTEXT "File already exists rules:",IDC_FILE_ALREADY_EXISTS_STATIC,7,7,337,8 + LTEXT "File error rules:",IDC_FILE_ERROR_RULES_STATIC,7,108,337,8 + LTEXT "Not enough space rules:",IDC_NOT_ENOUGH_SPACE_STATIC,7,212,337,8 END @@ -1333,7 +1340,7 @@ 0x5f6e, 0x6d49, 0x6761, 0x4f65, 0x526e, 0x6769, 0x7468, 0x463e, 0x4c41, 0x4553, 0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x4f65, 0x526e, 0x6769, 0x7468, "\076" - IDC_CANCEL_BUTTON, 0x37c, 369, 0 + IDCANCEL, 0x37c, 369, 0 0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x535f, 0x7974, 0x656c, 0x343e, 0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x7453, 0x6c79, 0x3e65, 0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x415f, 0x7475, 0x736f, 0x7a69,