Index: src/ch/FeedbackReplaceDlg.cpp
===================================================================
diff -u -r5d8ca703882285442606338c1acfc5fff6084e59 -rb14efbdfe0eb5c1164b8e5f605b7e9f88fbda25a
--- src/ch/FeedbackReplaceDlg.cpp (.../FeedbackReplaceDlg.cpp) (revision 5d8ca703882285442606338c1acfc5fff6084e59)
+++ src/ch/FeedbackReplaceDlg.cpp (.../FeedbackReplaceDlg.cpp) (revision b14efbdfe0eb5c1164b8e5f605b7e9f88fbda25a)
@@ -65,6 +65,7 @@
AddResizableControl(IDC_00_STATIC, 0.0, 0.0, 1.0, 0.0);
AddResizableControl(IDC_SRC_ICON_STATIC, 0.0, 0.0, 0.0, 0.0);
+ AddResizableControl(IDC_SRCFILE_STATIC, 0.0, 0.0, 1.0, 0.0);
AddResizableControl(IDC_SRC_FILENAME_EDIT, 0.0, 0.0, 1.0, 0.0);
AddResizableControl(IDC_SRC_PATH_EDIT, 0.0, 0.0, 1.0, 0.0);
AddResizableControl(IDC_SRC_FILESIZE_EDIT, 0.0, 0.0, 1.0, 0.0);
@@ -73,6 +74,7 @@
AddResizableControl(IDC_01_STATIC, 0.0, 0.5, 1.0, 0.0);
AddResizableControl(IDC_DST_ICON_STATIC, 0.0, 0.5, 0.0, 0.0);
+ AddResizableControl(IDC_DSTFILE_STATIC, 0.0, 0.0, 1.0, 0.0);
AddResizableControl(IDC_DST_FILENAME_EDIT, 0.0, 1.0, 1.0, 0.0);
AddResizableControl(IDC_DST_PATH_EDIT, 0.0, 1.0, 1.0, 0.0);
AddResizableControl(IDC_DST_FILESIZE_EDIT, 0.0, 1.0, 1.0, 0.0);
Index: src/ch/ch.rc
===================================================================
diff -u -r5d8ca703882285442606338c1acfc5fff6084e59 -rb14efbdfe0eb5c1164b8e5f605b7e9f88fbda25a
--- src/ch/ch.rc (.../ch.rc) (revision 5d8ca703882285442606338c1acfc5fff6084e59)
+++ src/ch/ch.rc (.../ch.rc) (revision b14efbdfe0eb5c1164b8e5f605b7e9f88fbda25a)
@@ -396,30 +396,30 @@
CONTROL "Custom1",IDC_MAINUPDATEINFO_CUSTOM,"STATICEX",0x30,47,7,251,14
END
-IDD_FEEDBACK_REPLACE_DIALOG DIALOGEX 0, 0, 319, 184
+IDD_FEEDBACK_REPLACE_DIALOG DIALOGEX 0, 0, 319, 186
STYLE DS_SETFONT | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
CAPTION "File already exists"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- PUSHBUTTON "&Replace",IDC_REPLACE_BUTTON,8,146,60,14
- PUSHBUTTON "&Append",IDC_COPY_REST_BUTTON,69,146,60,14
- PUSHBUTTON "&Skip",IDC_SKIP_BUTTON,130,146,60,14
- PUSHBUTTON "&Pause",IDC_PAUSE_BUTTON,191,146,60,14
- PUSHBUTTON "&Cancel",IDC_CANCEL_BUTTON,252,146,60,14
- CONTROL "&Apply to all items",IDC_ALL_ITEMS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,167,305,10
- EDITTEXT IDC_SRC_FILENAME_EDIT,54,31,258,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- EDITTEXT IDC_SRC_PATH_EDIT,54,42,258,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- EDITTEXT IDC_SRC_FILESIZE_EDIT,54,53,258,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- EDITTEXT IDC_SRC_MODIFIEDDATE_EDIT,54,64,258,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- EDITTEXT IDC_DST_FILENAME_EDIT,54,95,258,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- EDITTEXT IDC_DST_PATH_EDIT,54,106,258,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- EDITTEXT IDC_DST_FILESIZE_EDIT,54,117,258,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- EDITTEXT IDC_DST_MODIFIEDDATE_EDIT,54,128,258,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ PUSHBUTTON "&Replace",IDC_REPLACE_BUTTON,8,148,60,14
+ PUSHBUTTON "&Append",IDC_COPY_REST_BUTTON,69,148,60,14
+ PUSHBUTTON "&Skip",IDC_SKIP_BUTTON,130,148,60,14
+ PUSHBUTTON "&Pause",IDC_PAUSE_BUTTON,191,148,60,14
+ PUSHBUTTON "&Cancel",IDC_CANCEL_BUTTON,252,148,60,14
+ CONTROL "&Apply to all items",IDC_ALL_ITEMS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,169,305,10
+ EDITTEXT IDC_SRC_FILENAME_EDIT,54,31,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ EDITTEXT IDC_SRC_PATH_EDIT,54,42,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ EDITTEXT IDC_SRC_FILESIZE_EDIT,54,53,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ EDITTEXT IDC_SRC_MODIFIEDDATE_EDIT,54,64,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ EDITTEXT IDC_DST_FILENAME_EDIT,54,94,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ EDITTEXT IDC_DST_PATH_EDIT,54,105,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ EDITTEXT IDC_DST_FILESIZE_EDIT,54,116,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ EDITTEXT IDC_DST_MODIFIEDDATE_EDIT,54,127,251,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,305,15
- ICON "",IDC_SRC_ICON_STATIC,21,36,20,20
- ICON "",IDC_DST_ICON_STATIC,21,100,20,20
- LTEXT "Source file:",IDC_00_STATIC,14,20,298,8
- LTEXT "Destination file:",IDC_01_STATIC,16,82,296,8
+ ICON "",IDC_SRC_ICON_STATIC,20,38,21,20
+ ICON "",IDC_DST_ICON_STATIC,20,102,21,20
+ GROUPBOX "Source file",IDC_SRCFILE_STATIC,7,20,305,58
+ GROUPBOX "Destination file",IDC_DSTFILE_STATIC,7,83,305,58
END
@@ -556,7 +556,7 @@
LEFTMARGIN, 7
RIGHTMARGIN, 312
TOPMARGIN, 7
- BOTTOMMARGIN, 177
+ BOTTOMMARGIN, 179
END
END
#endif // APSTUDIO_INVOKED
Index: src/ch/resource.h
===================================================================
diff -u -r5d8ca703882285442606338c1acfc5fff6084e59 -rb14efbdfe0eb5c1164b8e5f605b7e9f88fbda25a
--- src/ch/resource.h (.../resource.h) (revision 5d8ca703882285442606338c1acfc5fff6084e59)
+++ src/ch/resource.h (.../resource.h) (revision b14efbdfe0eb5c1164b8e5f605b7e9f88fbda25a)
@@ -373,6 +373,8 @@
#define IDC_DST_FILESIZE_EDIT 1344
#define IDC_DST_MODIFIEDDATE_EDIT 1345
#define IDC_SRC_PATH_EDIT 1346
+#define IDC_SRCFILE_STATIC 1347
+#define IDC_DSTFILE_STATIC 1348
#define IDS_APPNAME_STRING 5000
#define IDS_PRIORITY0_STRING 5001
#define IDS_PRIORITY1_STRING 5002
@@ -704,7 +706,7 @@
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 221
#define _APS_NEXT_COMMAND_VALUE 32819
-#define _APS_NEXT_CONTROL_VALUE 1347
+#define _APS_NEXT_CONTROL_VALUE 1348
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif