Index: src/ch/FeedbackFileErrorDlg.h =================================================================== diff -u -N -r3993a75a24145732742d61be638111d1d85c367b -re6f64ea0eecaf86dfa1a42c80604d227b69be768 --- src/ch/FeedbackFileErrorDlg.h (.../FeedbackFileErrorDlg.h) (revision 3993a75a24145732742d61be638111d1d85c367b) +++ src/ch/FeedbackFileErrorDlg.h (.../FeedbackFileErrorDlg.h) (revision e6f64ea0eecaf86dfa1a42c80604d227b69be768) @@ -1,60 +1,70 @@ -/*************************************************************************** - * Copyright (C) 2001-2008 by J�zef Starosczyk * - * ixen@copyhandler.com * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Library General Public License * - * (version 2) as published by the Free Software Foundation; * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU Library General Public * - * License along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ -#ifndef __FEEDBACKFILEERRORDLG_H__ -#define __FEEDBACKFILEERRORDLG_H__ +// ============================================================================ +// Copyright (C) 2001-2020 by Jozef Starosczyk +// ixen {at} copyhandler [dot] com +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU Library General Public License +// (version 2) as published by the Free Software Foundation; +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU Library General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., +// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// ============================================================================ +#pragma once + #include "../libchengine/FeedbackErrorRuleList.h" #include "../libchengine/FeedbackRules.h" +#include "../libchengine/EFileError.h" // CFeedbackFileErrorDlg dialog class CFeedbackFileErrorDlg : public ictranslate::CLanguageDialog { DECLARE_DYNAMIC(CFeedbackFileErrorDlg) public: - CFeedbackFileErrorDlg(chengine::FeedbackRules& currentRules, const wchar_t* pszSrcPath, const wchar_t* pszDstPath, unsigned long ulSysError, CWnd* pParent = nullptr); // standard constructor + CFeedbackFileErrorDlg(chengine::FeedbackRules& currentRules, const wchar_t* pszSrcPath, const wchar_t* pszDstPath, chengine::EFileError eOperationType, unsigned long ulSysError, CWnd* pParent = nullptr); // standard constructor virtual ~CFeedbackFileErrorDlg(); - bool IsApplyToAllItemsChecked() const; - const chengine::FeedbackRules& GetRules() const; protected: - void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + void DoDataExchange(CDataExchange* pDX) override; void OnCancel() override; BOOL OnInitDialog() override; - afx_msg void OnBnClickedRetryButton(); - afx_msg void OnBnClickedSkipButton(); - afx_msg void OnBnClickedPauseButton(); - afx_msg void OnBnClickedCancel(); + afx_msg void OnBnRetry(); + afx_msg void OnBnSkip(); + afx_msg void OnBnPause(); + afx_msg void OnBnCustomRules(); DECLARE_MESSAGE_MAP() private: - BOOL m_bAllItems = FALSE; - CStatic m_ctlErrorInfo; + CEdit m_ctlFirstName; + CEdit m_ctlSecondName; + CEdit m_ctlOperationType; + CEdit m_ctlSystemError; + + CMFCMenuButton m_btnRetry; + CMFCMenuButton m_btnSkip; + CMFCButton m_btnCustomRules; + CMFCButton m_btnPause; + CMFCButton m_btnCancel; + + CMenu m_menuMassRetry; + CMenu m_menuMassSkip; + CString m_strSrcPath; CString m_strDstPath; + chengine::EFileError m_eOperationType = chengine::eCheckForFreeSpace; unsigned long m_ulSysError = 0; chengine::FeedbackRules& m_rules; }; - -#endif