Index: src/ch/FeedbackReplaceDlg.h =================================================================== diff -u -N -r5b4b933c78513d867ec02d33325907c2069c7bef -r08717141ce5f6926116c298cbc9442094a45bb67 --- src/ch/FeedbackReplaceDlg.h (.../FeedbackReplaceDlg.h) (revision 5b4b933c78513d867ec02d33325907c2069c7bef) +++ src/ch/FeedbackReplaceDlg.h (.../FeedbackReplaceDlg.h) (revision 08717141ce5f6926116c298cbc9442094a45bb67) @@ -19,6 +19,8 @@ #ifndef __FEEDBACKREPLACEDLG_H__ #define __FEEDBACKREPLACEDLG_H__ +#include "../libchengine/FeedbackAlreadyExistsRuleList.h" + namespace chengine { class TFileInfo; @@ -34,7 +36,7 @@ BOOL OnInitDialog() override; - bool IsApplyToAllItemsChecked() const; + const chengine::FeedbackAlreadyExistsRuleList& GetRules() const; protected: void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support @@ -43,6 +45,19 @@ void RefreshFilesInfo(); void RefreshImages(); + afx_msg void OnBnClickedReplaceButton(); + afx_msg void OnBnClickedCopyRestButton(); + afx_msg void OnBnClickedSkipButton(); + afx_msg void OnBnClickedPauseButton(); + afx_msg void OnBnClickedCancelButton(); + + afx_msg void OnBnMassReplace(); + afx_msg void OnBnMassRename(); + afx_msg void OnBnMassResume(); + afx_msg void OnBnMassSkip(); + + afx_msg void OnGetMinMaxInfo(MINMAXINFO* lpMMI); + DECLARE_MESSAGE_MAP() private: @@ -76,27 +91,12 @@ CMFCMenuButton m_btnMassResume; CMFCMenuButton m_btnMassSkip; - BOOL m_bAllItems; - CRect m_rcInitial; -protected: 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 OnBnMassReplace(); - afx_msg void OnBnMassRename(); - afx_msg void OnBnMassResume(); - afx_msg void OnBnMassSkip(); - - afx_msg void OnGetMinMaxInfo(MINMAXINFO* lpMMI); + chengine::FeedbackAlreadyExistsRuleList m_feedbackRules; // feedback rules resulting from choices made in this dialog box }; #endif