Index: src/ch/FeedbackReplaceDlg.h
===================================================================
diff -u -r547f865c69434c14c6f16e4b529d4198f6fe2040 -rb9453afbc6264bc3f3c6a7f86fadab7744e0fb16
--- src/ch/FeedbackReplaceDlg.h	(.../FeedbackReplaceDlg.h)	(revision 547f865c69434c14c6f16e4b529d4198f6fe2040)
+++ src/ch/FeedbackReplaceDlg.h	(.../FeedbackReplaceDlg.h)	(revision b9453afbc6264bc3f3c6a7f86fadab7744e0fb16)
@@ -19,6 +19,8 @@
 #ifndef __FEEDBACKREPLACEDLG_H__
 #define __FEEDBACKREPLACEDLG_H__
 
+#include "../libchengine/FeedbackAlreadyExistsRuleList.h"
+
 namespace chengine
 {
 	class TFileInfo;
@@ -29,12 +31,13 @@
 	DECLARE_DYNAMIC(CFeedbackReplaceDlg)
 
 public:
-	CFeedbackReplaceDlg(const chengine::TFileInfo& spSrcFile, const chengine::TFileInfo& spDstFile, CWnd* pParent = nullptr);   // standard constructor
+	CFeedbackReplaceDlg(const chengine::TFileInfo& spSrcFile, const chengine::TFileInfo& spDstFile, const string::TString& strSuggestedName, CWnd* pParent = nullptr);   // standard constructor
 	virtual ~CFeedbackReplaceDlg();
 
 	BOOL OnInitDialog() override;
 
-	bool IsApplyToAllItemsChecked() const;
+	const chengine::FeedbackAlreadyExistsRuleList& GetRules() const;
+	string::TString GetNewName() const { return m_strNewName; }
 
 protected:
 	void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
@@ -43,6 +46,15 @@
 	void RefreshFilesInfo();
 	void RefreshImages();
 
+	afx_msg void OnBnClickedReplaceButton();
+	afx_msg void OnBnClickedRenameButton();
+	afx_msg void OnBnClickedCopyRestButton();
+	afx_msg void OnBnClickedSkipButton();
+	afx_msg void OnBnClickedPauseButton();
+	afx_msg void OnBnClickedCancelButton();
+
+	afx_msg void OnGetMinMaxInfo(MINMAXINFO* lpMMI);
+
 	DECLARE_MESSAGE_MAP()
 
 private:
@@ -55,26 +67,30 @@
 	CEdit m_ctlSrcDate;
 
 	CEdit m_ctlDstName;
+	CEdit m_ctlDstRename;
 	CEdit m_ctlDstPath;
 	CEdit m_ctlDstSize;
 	CEdit m_ctlDstDate;
 
-	CMFCMenuButton m_mfcButton;
-	CMenu m_mfcMenu;
+	CMFCMenuButton m_btnReplace;
+	CMFCMenuButton m_btnRename;
+	CMFCMenuButton m_btnResume;
+	CMFCMenuButton m_btnSkip;
+	CMFCButton m_btnPause;
+	CMFCButton m_btnCancel;
 
-	BOOL m_bAllItems;
+	CMenu m_menuMassReplace;
+	CMenu m_menuMassRename;
+	CMenu m_menuMassResume;
+	CMenu m_menuMassSkip;
 
-protected:
+	CRect m_rcInitial;
+
 	const chengine::TFileInfo& m_rSrcFile;
 	const chengine::TFileInfo& m_rDstFile;
 
-public:
-	afx_msg void OnBnClickedReplaceButton();
-	afx_msg void OnBnClickedCopyRestButton();
-	afx_msg void OnBnClickedSkipButton();
-	afx_msg void OnBnClickedPauseButton();
-	afx_msg void OnBnClickedCancelButton();
-	afx_msg void OnBnMfcMenu();
+	chengine::FeedbackAlreadyExistsRuleList m_feedbackRules;	// feedback rules resulting from choices made in this dialog box
+	string::TString m_strNewName;
 };
 
 #endif